From 854e8ceeb5c39ceefc2f948eadeb03179cf17565 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 27 Jun 2008 15:02:38 +0000 Subject: [PATCH] added panning-knob to track-settings-widget git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1182 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 24 ++++++++++++++++++++++++ configure.in | 4 ++-- include/instrument_track.h | 1 + src/tracks/instrument_track.cpp | 32 +++++++++++++++++++++++--------- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3fe14197..40bb5ad9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2008-06-27 Tobias Doerffel + + * 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 * src/tracks/instrument_track.cpp: diff --git a/configure.in b/configure.in index 3d972204d..40d0bc0e6 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/include/instrument_track.h b/include/instrument_track.h index fdfeac276..e905438af 100644 --- a/include/instrument_track.h +++ b/include/instrument_track.h @@ -241,6 +241,7 @@ private: // widgets in track-settings-widget knob * m_tswVolumeKnob; + knob * m_tswPanningKnob; fadeButton * m_tswActivityIndicator; instrumentTrackButton * m_tswInstrumentTrackButton; diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index f076e5f75..1ccb2be3b 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -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 );