Add Portsmf MIDI importing to trunk

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

include/config_mgr.h

@@ -146,6 +146,13 @@ public:
 	}
 #endif
 
+#ifdef LMMS_HAVE_FLUIDSYNTH
+	const QString & defaultSoundfont( void ) const
+	{
+		return( m_defaultSoundfont );
+	}
+#endif
+
 	inline const QStringList & recentlyOpenedProjects( void ) const
 	{
 		return( m_recentlyOpenedProjects );
@@ -168,6 +175,7 @@ public:
 	void setFLDir( const QString & _fd );
 	void setLADSPADir( const QString & _fd );
 	void setSTKDir( const QString & _fd );
+	void setDefaultSoundfont( const QString & _sf );
 
 
 private:
@@ -188,6 +196,9 @@ private:
 	QString m_ladDir;
 #ifdef LMMS_HAVE_STK
 	QString m_stkDir;
+#endif
+#ifdef LMMS_HAVE_FLUIDSYNTH
+	QString m_defaultSoundfont;
 #endif
 	QStringList m_recentlyOpenedProjects;
 

include/instrument_track.h

@@ -164,6 +164,20 @@ public:
 	// simple helper for removing midiport-XML-node when loading presets
 	static void removeMidiPortNode( multimediaProject & _mmp );
 
+	floatModel & pitchModel() 
+	{
+		return m_pitchModel;
+	}
+
+	floatModel & volumeModel() 
+	{
+		return m_volumeModel;
+	}
+
+	floatModel & panningModel() 
+	{
+		return m_panningModel;
+	}
 
 signals:
 	void instrumentChanged( void );

include/meter_model.h

@@ -44,6 +44,18 @@ public:
 
 	void reset( void );
 
+	// Must have the sub-models exposed to programatically connect
+	// to automation or controllers
+	intModel & numeratorModel( void )
+	{
+		return m_numeratorModel;
+	}
+
+	intModel & denominatorModel( void )
+	{
+		return m_denominatorModel;
+	}
+
 
 private:
 	intModel m_numeratorModel;

include/plugin.h

@@ -42,6 +42,7 @@ class QWidget;
 
 class pixmapLoader;
 class pluginView;
+class automatableModel;
 
 
 class EXPORT plugin : public journallingObject, public model
@@ -171,10 +172,9 @@ public:
 	// loaded/processed with the help of this plugin
 	virtual void loadFile( const QString & _file );
 
-	// plugins can overload this for making other classes able to query
-	// settings of the plugin without knowing the actual class
-	virtual QString getParameter( const QString & _param );
-
+	// Called if external source needs to change something but we cannot
+	// reference the class header.  Should return null if not key not found.
+	virtual automatableModel * getChildModel( const QString & _modelName );
 
 	// returns an instance of a plugin whose name matches to given one
 	// if specified plugin couldn't be loaded, it creates a dummy-plugin

include/setup_dialog.h

@@ -49,7 +49,7 @@ public:
 	enum ConfigTabs
 	{
 		GeneralSettings,
-		DirectorySettings,
+		PathSettings,
 		PerformanceSettings,
 		AudioSettings,
 		MidiSettings
@@ -69,13 +69,14 @@ private slots:
 	void resetBufSize( void );
 	void displayBufSizeHelp( void );
 
-	// directory settings widget
+	// path settings widget
 	void setWorkingDir( const QString & _wd );
 	void setVSTDir( const QString & _vd );
 	void setArtworkDir( const QString & _ad );
 	void setFLDir( const QString & _fd );
 	void setLADSPADir( const QString & _fd );
 	void setSTKDir( const QString & _fd );
+	void setDefaultSoundfont( const QString & _fd );
 	
 	// audio settings widget
 	void audioInterfaceChanged( const QString & _driver );
@@ -98,6 +99,7 @@ private slots:
 	void openFLDir( void );
 	void openLADSPADir( void );
 	void openSTKDir( void );
+	void openDefaultSoundfont( void );
 
 	void toggleDisableChActInd( bool _disabled );
 	void toggleManualChPiano( bool _enabled );
@@ -122,6 +124,9 @@ private:
 	QLineEdit * m_adLineEdit;
 	QLineEdit * m_fdLineEdit;
 	QLineEdit * m_ladLineEdit;
+#ifdef LMMS_HAVE_FLUIDSYNTH
+	QLineEdit * m_sfLineEdit;
+#endif
 #ifdef LMMS_HAVE_STK
 	QLineEdit * m_stkLineEdit;
 #endif
@@ -131,6 +136,9 @@ private:
 	QString m_artworkDir;
 	QString m_flDir;
 	QString m_ladDir;
+#ifdef LMMS_HAVE_FLUIDSYNTH
+	QString m_defaultSoundfont;
+#endif
 #ifdef LMMS_HAVE_STK
 	QString m_stkDir;
 #endif