* removed volumeKnob-class and added volumeKnob-property to knob-class instead

* reduced header-dependencies and various cleanups
* removed obsolete settings



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1158 0778d3d1-df1d-0410-868b-ea421aaaa00d

plugins/audio_file_processor/audio_file_processor.cpp

@@ -404,7 +404,8 @@ audioFileProcessorView::audioFileProcessorView( instrument * _instrument,
 			"This is useful for things like string- and choir-"
 			"samples." ) );
 
-	m_ampKnob = new volumeKnob( knobStyled, this );
+	m_ampKnob = new knob( knobStyled, this );
+	m_ampKnob->setVolumeKnob( TRUE );
 	m_ampKnob->move( 17, 108 );
 	m_ampKnob->setFixedSize( 37, 47 );
 	m_ampKnob->setHintText( tr( "Amplify:" )+" ", "%" );

plugins/audio_file_processor/audio_file_processor.h

@@ -32,7 +32,7 @@
 #include "instrument.h"
 #include "instrument_view.h"
 #include "sample_buffer.h"
-#include "volume_knob.h"
+#include "knob.h"
 #include "pixmap_button.h"
 
 
@@ -131,7 +131,7 @@ private:
 	static QPixmap * s_artwork;
 
 	QPixmap m_graph;
-	volumeKnob * m_ampKnob;
+	knob * m_ampKnob;
 	knob * m_startKnob;
 	knob * m_endKnob;
 	pixmapButton * m_openAudioFileButton;

plugins/flp_import/flp_import.cpp

@@ -30,6 +30,7 @@
 #include <QtCore/QBuffer>
 
 #include "flp_import.h"
+#include "note_play_handle.h"
 #include "basic_filters.h"
 #include "bb_track.h"
 #include "bb_track_container.h"

plugins/organic/organic.cpp

@@ -38,7 +38,6 @@
 #include "pixmap_button.h"
 #include "templates.h"
 #include "tooltip.h"
-#include "volume_knob.h"
 
 #undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"
@@ -401,6 +400,7 @@ organicInstrumentView::organicInstrumentView( instrument * _instrument,
 
 	// setup volume-knob
 	m_volKnob = new organicKnob( this );
+	m_volKnob->setVolumeKnob( TRUE );
 	m_volKnob->move( 60, 201 );
 	m_volKnob->setFixedSize( 37, 47 );
 	m_volKnob->setHintText( tr( "Volume:" ).arg( 1 ) + " ", "%" );
@@ -460,7 +460,8 @@ void organicInstrumentView::modelChanged( void )
 					i + 1 ) + " ", "%" );
 										
 		// setup volume-knob
-		volumeKnob * volKnob = new volumeKnob( knobStyled, this );
+		knob * volKnob = new knob( knobStyled, this );
+		volKnob->setVolumeKnob( TRUE );
 		volKnob->move( x + i * colWidth, y + rowHeight*1 );
 		volKnob->setFixedSize( 21, 21 );
 		volKnob->setHintText( tr( "Osc %1 volume:" ).arg(

plugins/organic/organic.h

@@ -37,7 +37,6 @@ class QPixmap;
 class knob;
 class notePlayHandle;
 class pixmapButton;
-class volumeKnob;
 
 
 class oscillatorObject : public model
@@ -146,7 +145,7 @@ private:
 
 	struct oscillatorKnobs
 	{
-		oscillatorKnobs( volumeKnob * v,
+		oscillatorKnobs( knob * v,
 					knob * o,
 					knob * p,
 					knob * dt ) :
@@ -160,7 +159,7 @@ private:
 		{
 		}
 		
-		volumeKnob * m_volKnob;
+		knob * m_volKnob;
 		knob * m_oscKnob;
 		knob * m_panKnob;
 		knob * m_detuneKnob;

plugins/triple_oscillator/triple_oscillator.cpp

@@ -38,7 +38,6 @@
 #include "sample_buffer.h"
 #include "song_editor.h"
 #include "tooltip.h"
-#include "volume_knob.h"
 
 
 #undef SINGLE_SOURCE_COMPILE
@@ -578,7 +577,8 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument,
 		int knob_y = osc_y + i * osc_h;
 
 		// setup volume-knob
-		volumeKnob * vk = new volumeKnob( knobStyled, this );
+		knob * vk = new knob( knobStyled, this );
+		vk->setVolumeKnob( TRUE );
 		vk->setFixedSize( 28, 35 );
 		vk->move( 6, knob_y );
 		vk->setHintText( tr( "Osc %1 volume:" ).arg(

plugins/triple_oscillator/triple_oscillator.h

@@ -38,7 +38,6 @@ class knob;
 class notePlayHandle;
 class pixmapButton;
 class sampleBuffer;
-class volumeKnob;
 
 const int NUM_OF_OSCILLATORS = 3;
 
@@ -157,7 +156,7 @@ private:
 
 	struct oscillatorKnobs
 	{
-		oscillatorKnobs( volumeKnob * v,
+		oscillatorKnobs( knob * v,
 					knob * p,
 					knob * c,
 					knob * fl,
@@ -180,7 +179,7 @@ private:
 		oscillatorKnobs()
 		{
 		}
-		volumeKnob * m_volKnob;
+		knob * m_volKnob;
 		knob * m_panKnob;
 		knob * m_coarseKnob;
 		knob * m_fineLeftKnob;

plugins/vibed/vibed.cpp

@@ -38,7 +38,6 @@
 #include "string_container.h"
 #include "templates.h"
 #include "volume.h"
-#include "volume_knob.h"
 #include "song.h"
 
 #undef SINGLE_SOURCE_COMPILE
@@ -362,7 +361,8 @@ vibedView::vibedView( instrument * _instrument,
 			"artwork" ) );
 	setPalette( pal );
 	
-	m_volumeKnob = new volumeKnob( knobBright_26, this );
+	m_volumeKnob = new knob( knobBright_26, this );
+	m_volumeKnob->setVolumeKnob( TRUE );
 	m_volumeKnob->move( 103, 142 );
 	m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "" );
 	m_volumeKnob->setWhatsThis( tr( "The 'V' knob sets the volume "

plugins/vibed/vibed.h

@@ -31,7 +31,6 @@
 #include "knob.h"
 #include "pixmap_button.h"
 #include "led_checkbox.h"
-#include "volume_knob.h"
 #include "nine_button_selector.h"
 
 class vibedView;
@@ -110,7 +109,7 @@ private:
 	knob * m_pickKnob;
 	knob * m_pickupKnob;
 	knob * m_stiffnessKnob;
-	volumeKnob * m_volumeKnob;
+	knob * m_volumeKnob;
 	knob * m_panKnob;
 	knob * m_detuneKnob;
 	knob * m_randomKnob;