From 08c166b4d9bde04c19795d4c13871c0252259d7e Mon Sep 17 00:00:00 2001 From: Danny McRae Date: Tue, 8 Aug 2006 01:58:11 +0000 Subject: [PATCH] cleaned up some problems that prevented the previous checkin from building: lmms_single_source.cpp group_box.h group_box.cpp rack_plugin.h git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@295 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 1 + include/group_box.h | 3 --- include/rack_plugin.h | 1 - src/lmms_single_source.cpp | 2 -- src/widgets/group_box.cpp | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 460544ac5..bc6d089c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ clean up some things that were preventing the getNextSample methods from being inlined + * configure * configure.in: -made ladspa support default off -must pass --with-ladspa to get it to build diff --git a/include/group_box.h b/include/group_box.h index d53816383..12a7666a6 100644 --- a/include/group_box.h +++ b/include/group_box.h @@ -39,7 +39,6 @@ #endif #include "pixmap_button.h" -#include "ladspa_manager.h" class QPixmap; @@ -63,10 +62,8 @@ public slots: void setState( bool _on, bool _anim = FALSE ); void animate( void ); -#ifdef LADSPA_SUPPORT signals: void toggled( bool _state ); -#endif protected: virtual void resizeEvent( QResizeEvent * _re ); diff --git a/include/rack_plugin.h b/include/rack_plugin.h index 244cf6b48..e0c631573 100644 --- a/include/rack_plugin.h +++ b/include/rack_plugin.h @@ -36,7 +36,6 @@ #include "journalling_object.h" #include "led_checkbox.h" #include "instrument_track.h" -#include "embossed_font_label.h" #include "effect.h" #include "ladspa_control_dialog.h" diff --git a/src/lmms_single_source.cpp b/src/lmms_single_source.cpp index 1dee75d45..de366d6ae 100644 --- a/src/lmms_single_source.cpp +++ b/src/lmms_single_source.cpp @@ -77,7 +77,6 @@ #include "src/widgets/project_notes.cpp" #include "src/widgets/led_checkbox.cpp" #include "src/widgets/knob.cpp" -#include "src/widgets/labeled_knob.cpp" #include "src/widgets/pixmap_button.cpp" #include "src/widgets/qxembed.cpp" #include "src/widgets/group_box.cpp" @@ -102,6 +101,5 @@ #include "src/widgets/volume_knob.cpp" #include "src/widgets/rack_plugin.cpp" #include "src/widgets/rack_view.cpp" -#include "src/widgets/labeled_knob.cpp" #include "src/widgets/ladspa_control.cpp" #endif diff --git a/src/widgets/group_box.cpp b/src/widgets/group_box.cpp index 669b29543..a42558244 100644 --- a/src/widgets/group_box.cpp +++ b/src/widgets/group_box.cpp @@ -129,9 +129,7 @@ void groupBox::setState( bool _on, bool _anim ) m_animating = TRUE; animate(); } -#ifdef LADSPA_SUPPORT emit( toggled( _on ) ); -#endif }