From 42d49faf53b29866b902abd7dbf5ad07e3842102 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 10 Jun 2008 09:17:23 +0000 Subject: [PATCH] removed obsolete instrumentTrackView::updateName() and made track-button update on name-changes git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1120 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 14 ++++++++++++++ include/instrument_track.h | 2 -- src/tracks/instrument_track.cpp | 13 ++----------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 877d41aea..6ab9eef7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-06-10 Tobias Doerffel + + * plugins/sf2_player/sf2_player.cpp: + enabled LCD-Spinboxes for easily switching banks/patches - I know that + this way you can select banks/patches that do not exist but opening + patch-dialog each time is much more inconvenient - maybe we can + subclass lcdSpinBox one day so that it automatically "skips" wholes + when scrolling + + * include/instrument_track.h: + * src/tracks/instrument_track.cpp: + removed obsolete instrumentTrackView::updateName() and made + track-button update on name-changes + 2008-06-10 Paul Giblock * plugins/sf2_player/artwork.png: diff --git a/include/instrument_track.h b/include/instrument_track.h index 79d5c73a6..33a65e989 100644 --- a/include/instrument_track.h +++ b/include/instrument_track.h @@ -231,8 +231,6 @@ private slots: void activityIndicatorPressed( void ); void activityIndicatorReleased( void ); - void updateName( void ); - void midiInSelected( void ); void midiOutSelected( void ); void midiConfigChanged( void ); diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 532d3cea5..f3842d9ba 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -903,6 +903,8 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it, connect( m_tswInstrumentTrackButton, SIGNAL( toggled( bool ) ), this, SLOT( toggledInstrumentTrackButton( bool ) ) ); + connect( _it, SIGNAL( nameChanged() ), + m_tswInstrumentTrackButton, SLOT( update() ) ); } @@ -1011,17 +1013,6 @@ void instrumentTrackView::activityIndicatorReleased( void ) -void instrumentTrackView::updateName( void ) -{ -#ifdef LMMS_DEBUG - assert( m_tswInstrumentTrackButton != NULL ); -#endif - m_tswInstrumentTrackButton->setText( model()->name() ); -} - - - - void instrumentTrackView::midiInSelected( void ) { if( model() )