Performance improvements to controller-base

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

include/combobox.h

@@ -97,25 +97,25 @@ public:
 	comboBox( QWidget * _parent, const QString & _name = QString::null );
 	virtual ~comboBox();
 
-        comboBoxModel * model( void )
-        {
-                return( castModel<comboBoxModel>() );
-        }
+	comboBoxModel * model( void )
+	{
+		return( castModel<comboBoxModel>() );
+	}
 
-        const comboBoxModel * model( void ) const
-        {
-                return( castModel<comboBoxModel>() );
-        }
+	const comboBoxModel * model( void ) const
+	{
+		return( castModel<comboBoxModel>() );
+	}
 
 
-        virtual void modelChanged( void )
-        {
-                if( model() != NULL )
-                {
-                        connect( model(), SIGNAL( itemPixmapRemoved( QPixmap * ) ),
-                                        this, SLOT( deletePixmap( QPixmap * ) ) );
-                }                       
-        }
+	virtual void modelChanged( void )
+	{
+		if( model() != NULL )
+		{
+			QWidget::connect( model(), SIGNAL( itemPixmapRemoved( QPixmap * ) ),
+					this, SLOT( deletePixmap( QPixmap * ) ) );
+		}                       
+	}
 
 
 protected:

include/knob.h

@@ -70,6 +70,7 @@ public slots:
 	void connectToMidiDevice( void );
 	void connectToController( void );
 	void displayHelp( void );
+	void friendlyUpdate( void );
 
 
 signals:
@@ -114,6 +115,10 @@ private:
 							model()->step() ) );
 	}
 
+	virtual void doConnections( void );
+
+
+
 	void valueChange( void );
 	void buttonReleased( void );
 

include/mv_base.h

@@ -71,6 +71,7 @@ signals:
 
 class modelView
 {
+
 public:
 	modelView( model * _model );
 	virtual ~modelView()
@@ -98,7 +99,7 @@ protected:
 	{
 	}
 
-	void doConnections( void );
+	virtual void doConnections( void );
 
 
 private:

include/song_editor.h

@@ -96,6 +96,7 @@ private:
 
 	toolButton * m_addBBTrackButton;
 	toolButton * m_addSampleTrackButton;
+	toolButton * m_addControllerButton;
 
 	toolButton * m_drawModeButton;
 	toolButton * m_editModeButton;