diff --git a/ChangeLog b/ChangeLog index 58dad6cc6..3bc65e758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-07-22 Tobias Doerffel + * src/core/mmp.cpp: + * plugins/lb302/lb302.h + * plugins/CMakeLists.txt: + switched back to LB302 as Paul wants LB303 for 0.4.1 + * cmake/modules/FindAlsa.cmake: * cmake/modules/FindOggVorbis.cmake: * cmake/modules/FindSTK.cmake: diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 04e7c5c35..3e7d9f916 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_SUBDIRECTORY(kicker) ADD_SUBDIRECTORY(ladspa_browser) ADD_SUBDIRECTORY(ladspa_effect) ADD_SUBDIRECTORY(lb302) -ADD_SUBDIRECTORY(lb303) +#ADD_SUBDIRECTORY(lb303) ADD_SUBDIRECTORY(live_tool) ADD_SUBDIRECTORY(midi_import) ADD_SUBDIRECTORY(organic) diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h index c36294aaf..f17377392 100644 --- a/plugins/lb302/lb302.h +++ b/plugins/lb302/lb302.h @@ -188,7 +188,6 @@ private: public slots: void filterChanged( void ); - void detuneChanged( void ); void db24Toggled( void ); private: diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp index 4a171c289..770ae497d 100644 --- a/src/core/mmp.cpp +++ b/src/core/mmp.cpp @@ -530,11 +530,11 @@ void multimediaProject::upgrade( void ) el.setAttribute( "active0", 1 ); } -/* while( !( list = elementsByTagName( "lb303" ) ).isEmpty() ) + while( !( list = elementsByTagName( "lb303" ) ).isEmpty() ) { QDomElement el = list.item( 0 ).toElement(); el.setTagName( "lb302" ); - }*/ + } while( !( list = elementsByTagName( "channelsettings" ) ). isEmpty() ) @@ -650,7 +650,7 @@ void multimediaProject::upgrade( void ) } } - if( version < "0.4.0-beta" ) +/* if( version < "0.4.0-beta" ) { QDomNodeList list; while( !( list = elementsByTagName( "lb302" ) ).isEmpty() ) @@ -658,7 +658,7 @@ void multimediaProject::upgrade( void ) QDomElement el = list.item( 0 ).toElement(); el.setTagName( "lb303" ); } - } + }*/ // Time-signature if ( !m_head.hasAttribute( "timesig_numerator" ) )