hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

added panning-knob to track-settings-widget

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1182 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-27 15:02:38 +00:00
parent 620b4d8a58
commit 854e8ceeb5
4 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@@ -1,3 +1,27 @@
2008-06-27 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/instrument_track.h:
* src/tracks/instrument_track.cpp:
added panning-knob to track-settings-widget
* include/fx_mixer.h:
* include/fx_mixer_view.h:
* src/core/fx_mixer.cpp:
* src/gui/fx_mixer_view.cpp:
added mute-button for each FX-line
* include/led_checkbox.h:
* src/gui/peak_controller_dialog.cpp:
* src/gui/widgets/instrument_function_views.cpp:
* src/gui/widgets/ladspa_control_view.cpp:
* src/gui/widgets/led_checkbox.cpp:
made enumeration match current coding style
* src/core/track.cpp:
* src/core/plugin.cpp:
* Makefile.am:
cleanups
2008-06-25 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/tracks/instrument_track.cpp:

4
configure.in
View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.4.0-svn20080624, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080624)
AC_INIT(lmms, 0.4.0-svn20080627, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080627)
AX_PREFIX_CONFIG_H([include/lmmsconfig.h])
AM_CONFIG_HEADER(config.h)

1
include/instrument_track.h
View File

@@ -241,6 +241,7 @@ private:
// widgets in track-settings-widget
knob * m_tswVolumeKnob;
knob * m_tswPanningKnob;
fadeButton * m_tswActivityIndicator;
instrumentTrackButton * m_tswInstrumentTrackButton;

32
src/tracks/instrument_track.cpp
View File

@@ -834,7 +834,8 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
setFixedHeight( 32 );
// creation of widgets for track-settings-widget
m_tswVolumeKnob = new knob( knobSmall_17, getTrackSettingsWidget() );
m_tswVolumeKnob = new knob( knobSmall_17, getTrackSettingsWidget(),
tr( "Volume" ) );
m_tswVolumeKnob->setVolumeKnob( TRUE );
m_tswVolumeKnob->setModel( &_it->m_volumeModel );
m_tswVolumeKnob->setHintText( tr( "Volume:" ) + " ", "%" );
@@ -843,10 +844,19 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
m_tswVolumeKnob->show();
m_tswVolumeKnob->setWhatsThis( tr( volume_help ) );
m_tswPanningKnob = new knob( knobSmall_17, getTrackSettingsWidget(),
tr( "Panning" ) );
m_tswPanningKnob->setModel( &_it->m_panningModel );
m_tswPanningKnob->setHintText( tr( "Panning:" ) + " ", "%" );
m_tswPanningKnob->move( 24, 4 );
m_tswPanningKnob->setLabel( tr( "PAN" ) );
m_tswPanningKnob->show();
QPushButton * tsw_midi = new QPushButton(
embed::getIconPixmap( "piano" ), QString::null,
getTrackSettingsWidget() );
tsw_midi->setGeometry( 32, 2, 28, 28 );
tsw_midi->setGeometry( 50, 2, 28, 28 );
tsw_midi->show();
toolTip::add( tsw_midi, tr( "MIDI input/output" ) );
m_tswMidiMenu = new QMenu( tsw_midi );
@@ -855,14 +865,18 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
// sequenced MIDI?
if( !engine::getMixer()->getMIDIClient()->isRaw() )
{
_it->m_midiPort.m_readablePortsMenu = new midiPortMenu( midiPort::Input );
_it->m_midiPort.m_writablePortsMenu = new midiPortMenu( midiPort::Output );
_it->m_midiPort.m_readablePortsMenu->setModel( &_it->m_midiPort );
_it->m_midiPort.m_writablePortsMenu->setModel( &_it->m_midiPort );
_it->m_midiPort.m_readablePortsMenu = new midiPortMenu(
midiPort::Input );
_it->m_midiPort.m_writablePortsMenu = new midiPortMenu(
midiPort::Output );
_it->m_midiPort.m_readablePortsMenu->setModel(
&_it->m_midiPort );
_it->m_midiPort.m_writablePortsMenu->setModel(
&_it->m_midiPort );
m_midiInputAction = m_tswMidiMenu->addMenu(
_it->m_midiPort.m_readablePortsMenu );
_it->m_midiPort.m_readablePortsMenu );
m_midiOutputAction = m_tswMidiMenu->addMenu(
_it->m_midiPort.m_writablePortsMenu );
_it->m_midiPort.m_writablePortsMenu );
}
else
{
@@ -896,7 +910,7 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
m_tswInstrumentTrackButton = new instrumentTrackButton( this );
m_tswInstrumentTrackButton->setCheckable( TRUE );
m_tswInstrumentTrackButton->setGeometry( 64, 2, 144, 28 );
m_tswInstrumentTrackButton->setGeometry( 82, 2, 126, 28 );
m_tswInstrumentTrackButton->show();
setModel( _it );