made MIDI- and FLP-import-filter work

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

include/envelope_and_lfo_parameters.h

@@ -151,7 +151,7 @@ private:
 
 
 	friend class envelopeAndLFOView;
-//	friend class flpImport;
+	friend class flpImport;
 
 } ;
 

include/instrument_functions.h

@@ -131,7 +131,7 @@ private:
 	comboBoxModel m_arpModeModel;
 
 
-//	friend class flpImport;
+	friend class flpImport;
 	friend class instrumentTrack;
 	friend class arpeggiatorView;
 

include/instrument_sound_shaping.h

@@ -78,6 +78,7 @@ private:
 
 
 	friend class instrumentSoundShapingView;
+	friend class flpImport;
 
 } ;
 

include/song.h

@@ -45,6 +45,7 @@ const Uint16 MAX_SONG_LENGTH = 9999;
 class song : public trackContainer
 {
 	Q_OBJECT
+	mapPropertyFromModel(int,getTempo,setTempo,m_tempoModel);
 	mapPropertyFromModel(int,masterPitch,setMasterPitch,m_masterPitchModel);
 	mapPropertyFromModel(int,masterVolume,setMasterVolume,
 							m_masterVolumeModel);