removed publicName-properties in various classes and plugin-descriptor and use model::displayName instead

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

include/controller.h

@@ -55,7 +55,8 @@ public:
 		NumControllerTypes
 	} ;
 
-	controller( ControllerTypes _type, model * _parent );
+	controller( ControllerTypes _type, model * _parent,
+						const QString & _display_name );
 
 	virtual ~controller();
 
@@ -73,11 +74,6 @@ public:
 		m_sampleExact = _exact;
 	}
 
-	virtual QString publicName() const
-	{
-		return "Dummy Controller";
-	}
-
 	ControllerTypes type( void ) const
 	{
 		return( m_type );
@@ -109,6 +105,7 @@ public:
 	static void triggerFrameCounter( void );
 	static void resetFrameCounter( void );
 
+
 public slots:
 	virtual controllerDialog * createDialog( QWidget * _parent );
 
@@ -117,8 +114,8 @@ public slots:
 		m_name = _new_name;
 	}
 
-protected:
 
+protected:
 	// The internal per-controller get-value function
 	virtual float value( int _offset );
 
@@ -132,11 +129,6 @@ protected:
 
 	static unsigned int s_frames;
 
-	/*
-slots:
-	void trigger();
-
-	*/
 
 signals:
 	// The value changed while the mixer isn't running (i.e: MIDI CC)
@@ -146,7 +138,8 @@ signals:
 	void destroying( void );
 
 	friend class controllerDialog;
-};
+
+} ;
 
 #endif
 

include/lfo_controller.h

@@ -50,29 +50,19 @@ public:
 
 	virtual ~lfoController();
 
-	virtual QString publicName() const
-	{
-		return "LFO Controller";
-	}
-
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
 	virtual void loadSettings( const QDomElement & _this );
 	virtual QString nodeName( void ) const;
 
+
 public slots:
 	virtual controllerDialog * createDialog( QWidget * _parent );
 
-protected:
 
+protected:
 	// The internal per-controller get-value function
 	virtual float value( int _offset );
 
-	/*
-slots:
-	void trigger();
-
-	*/
-
 	floatModel m_baseModel;
 	tempoSyncKnobModel m_speedModel;
 	floatModel m_amountModel;
@@ -86,11 +76,12 @@ slots:
 	
 	sample_t (*m_sampleFunction)( const float );
 
+
 protected slots:
 	void updateSampleFunction( void );
 
 	friend class lfoControllerDialog;
-};
+} ;
 
 
 
@@ -101,19 +92,9 @@ public:
 	lfoControllerDialog( controller * _controller, QWidget * _parent );
 	virtual ~lfoControllerDialog();
 
-public slots:
-	//void editControls( void );
-	//void deletePlugin( void );
-	//void displayHelp( void );
-	//void closeEffects( void );
-
-	
-signals:
-
 
 protected:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
-	//virtual void paintEvent( QPaintEvent * _pe );
 	virtual void modelChanged( void );
 
 	lfoController * m_lfo;

include/midi_controller.h

@@ -43,13 +43,6 @@ public:
 	midiController( model * _parent );
 	virtual ~midiController();
 
-	#warning TODO: use displayName-property!
-	virtual QString publicName() const
-	{
-		return "MIDI Controller";
-	}
-
-
 	virtual void processInEvent( const midiEvent & _me,
 					const midiTime & _time );
 

include/peak_controller.h

@@ -49,11 +49,6 @@ public:
 
 	virtual ~peakController();
 
-	virtual QString publicName() const
-	{
-		return "Peak Controller";
-	}
-
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
 	virtual void loadSettings( const QDomElement & _this );
 	virtual QString nodeName( void ) const;
@@ -61,26 +56,19 @@ public:
 	static peakControllerEffectVector s_effects;
 	static int s_lastEffectId;
 
+
 public slots:
 	virtual controllerDialog * createDialog( QWidget * _parent );
 
-protected:
 
+protected:
 	// The internal per-controller get-value function
 	virtual float value( int _offset );
 
-	/*
-slots:
-	void trigger();
-
-	*/
-
 	peakControllerEffect * m_peakEffect;
 
-protected slots:
-
 	friend class peakControllerDialog;
-};
+} ;
 
 
 
@@ -91,16 +79,6 @@ public:
 	peakControllerDialog( controller * _controller, QWidget * _parent );
 	virtual ~peakControllerDialog();
 
-public slots:
-	//void editControls( void );
-	//void deletePlugin( void );
-	//void displayHelp( void );
-	//void closeEffects( void );
-
-	
-signals:
-
-
 protected:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
 	virtual void paintEvent( QPaintEvent * _pe );

include/plugin.h

@@ -65,7 +65,7 @@ public:
 	struct descriptor
 	{
 		const char * name;
-		const char * publicName;
+		const char * displayName;
 		const char * description;
 		const char * author;
 		int version;
@@ -163,16 +163,12 @@ public:
 	plugin( const descriptor * _descriptor, model * _parent );
 	virtual ~plugin();
 
-	// returns public-name out of descriptor
-	virtual inline QString publicName( void ) const
+	// returns display-name out of descriptor
+	virtual QString displayName( void ) const
 	{
-		return( m_publicName != QString::null ?
-				m_publicName : m_descriptor->publicName );
-	}
-
-	virtual void setPublicName( const QString & _public_name )
-	{
-		m_publicName = _public_name;
+		return( model::displayName() != QString::null ?
+					model::displayName() :
+						m_descriptor->displayName );
 	}
 
 	// return plugin-type
@@ -231,7 +227,6 @@ protected:
 
 private:
 	const descriptor * m_descriptor;
-	QString m_publicName;
 
 	// pointer to instantiation-function in plugin
 	typedef plugin * ( * instantiationHook )( model *, void * );