improved FLP-filter a lot

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

include/arp_and_chords_tab_widget.h

@@ -51,6 +51,7 @@
 class QPixmap;
 
 class automatableButtonGroup;
+class flpImport;
 class instrumentTrack;
 class comboBox;
 class groupBox;
@@ -131,6 +132,8 @@ private:
 
 	comboBox * m_arpModeComboBox;
 
+	friend class flpImport;
+
 } ;
 
 

include/config_mgr.h

@@ -132,6 +132,11 @@ public:
 		return( m_vstDir );
 	}
 
+	const QString & flDir( void ) const
+	{
+		return( m_flDir );
+	}
+
 	const QString & value( const QString & _class,
 					const QString & _attribute ) const;
 	void setValue( const QString & _class, const QString & _attribute,
@@ -145,6 +150,7 @@ public slots:
 	void setWorkingDir( const QString & _wd );
 	void setVSTDir( const QString & _vd );
 	void setArtworkDir( const QString & _ad );
+	void setFLDir( const QString & _fd );
 
 
 protected slots:
@@ -182,6 +188,7 @@ private:
 	QString m_artworkDir;
 	QString m_pluginDir;
 	QString m_vstDir;
+	QString m_flDir;
 
 	typedef vvector<QPair<QString, QString> > stringPairVector;
 	typedef QMap<QString, stringPairVector> settingsMap;

include/debug.h

@@ -33,10 +33,10 @@
 // set whether debug-stuff (like messages on the console, asserts and other
 // additional range-checkings) should be compiled
 
-#ifdef LMMS_DEBUG
+/*#ifdef LMMS_DEBUG*/
 #include <assert.h>
 #include <cstdio>
-#endif
+/*#endif*/
 
 
 #endif

include/envelope_and_lfo_widget.h

@@ -66,6 +66,8 @@ class pixmapButton;
 class tempoSyncKnob;
 
 
+class flpImport;
+
 
 class envelopeAndLFOWidget : public QWidget, public journallingObject,
 				public specialBgHandlingWidget
@@ -185,6 +187,7 @@ private:
 
 
 	friend class envelopeTabWidget;
+	friend class flpImport;
 
 } ;
 

include/envelope_tab_widget.h

@@ -55,6 +55,8 @@ class notePlayHandle;
 class pixmapButton;
 class tabWidget;
 
+class flpImport;
+
 
 class envelopeTabWidget : public QWidget, public journallingObject
 {
@@ -77,8 +79,8 @@ public:
 		TARGET_COUNT
 	} ;
 
-	f_cnt_t envFrames( void );
-	f_cnt_t releaseFrames( void );
+	f_cnt_t envFrames( const bool _only_vol = FALSE );
+	f_cnt_t releaseFrames( const bool _only_vol = FALSE );
 
 	float FASTCALL volumeLevel( notePlayHandle * _n, const f_cnt_t _frame );
 
@@ -102,6 +104,8 @@ private:
 	knob * m_filterCutKnob;
 	knob * m_filterResKnob;
 
+	friend class flpImport;
+
 } ;
 
 #endif

include/instrument_track.h

@@ -69,6 +69,8 @@ class pianoWidget;
 class presetPreviewPlayHandle;
 class surroundArea;
 
+class flpImport;
+
 
 
 class instrumentTrack : public QWidget, public track, public midiEventProcessor
@@ -255,6 +257,7 @@ private:
 	friend class instrumentTrackButton;
 	friend class notePlayHandle;
 	friend class presetPreviewPlayHandle;
+	friend class flpImport;
 
 
 signals:

include/setup_dialog.h

@@ -82,6 +82,7 @@ private slots:
 	void setWorkingDir( const QString & _wd );
 	void setVSTDir( const QString & _vd );
 	void setArtworkDir( const QString & _ad );
+	void setFLDir( const QString & _fd );
 
 	// audio settings widget
 	void audioInterfaceChanged( const QString & _driver );
@@ -102,6 +103,7 @@ private slots:
 	void openWorkingDir( void );
 	void openVSTDir( void );
 	void openArtworkDir( void );
+	void openFLDir( void );
 
 
 	void toggleDisableChActInd( bool _disabled );
@@ -125,10 +127,12 @@ private:
 	QLineEdit * m_wdLineEdit;
 	QLineEdit * m_vdLineEdit;
 	QLineEdit * m_adLineEdit;
+	QLineEdit * m_fdLineEdit;
 
 	QString m_workingDir;
 	QString m_vstDir;
 	QString m_artworkDir;
+	QString m_flDir;
 
 
 	bool m_disableChActInd;