finally resurrected sample-tracks

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

include/sample_track.h

@@ -32,13 +32,10 @@
 #include "audio_port.h"
 #include "track.h"
 
-class QLabel;
 class effectLabel;
 class sampleBuffer;
 class knob;
 
-//class sampleTCOSettingsDialog;
-
 
 class sampleTCO : public trackContentObject
 {
@@ -50,8 +47,7 @@ public:
 	virtual void changeLength( const midiTime & _length );
 	const QString & sampleFile( void ) const;
 
-	virtual void saveSettings( QDomDocument & _doc,
-							QDomElement & _parent );
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	virtual void loadSettings( const QDomElement & _this );
 	inline virtual QString nodeName( void ) const
 	{
@@ -63,52 +59,56 @@ public:
 		return( m_sampleBuffer );
 	}
 
+	midiTime sampleLength( void ) const;
+
+	virtual trackContentObjectView * createView( trackView * _tv );
+
 
 public slots:
 	void setSampleFile( const QString & _sf );
 	void updateLength( bpm_t = 0 );
 
+
+private:
+	sampleBuffer * m_sampleBuffer;
+
+
+	friend class sampleTCOView;
+
+
+signals:
+	void sampleChanged( void );
+
+} ;
+
+
+
+class sampleTCOView : public trackContentObjectView
+{
+	Q_OBJECT
+public:
+	sampleTCOView( sampleTCO * _tco, trackView * _tv );
+	virtual ~sampleTCOView();
+
+
+public slots:
+	void updateSample( void );
+
+
 protected:
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );
 	virtual void mouseDoubleClickEvent( QMouseEvent * );
 	virtual void paintEvent( QPaintEvent * );
 
-	midiTime getSampleLength( void ) const;
-
 
 private:
-	sampleBuffer * m_sampleBuffer;
-
-
-	//friend class sampleTCOSettingsDialog;
+	sampleTCO * m_tco;
 
 } ;
 
 
 
-/*
-class sampleTCOSettingsDialog : public QDialog
-{
-	Q_OBJECT
-public:
-	sampleTCOSettingsDialog( sampleTCO * _stco );
-	~sampleTCOSettingsDialog();
-
-
-protected slots:
-	void openSampleFile( void );
-	void setSampleFile( const QString & _f );
-
-
-private:
-	sampleTCO * m_sampleTCO;
-	QLabel * m_fileLbl;
-
-} ;
-*/
-
-
 
 class sampleTrack : public track
 {
@@ -150,7 +150,7 @@ private:
 
 
 
-class sampleTrackView : public track
+class sampleTrackView : public trackView
 {
 public:
 	sampleTrackView( sampleTrack * _track, trackContainerView * _tcv );
@@ -165,5 +165,4 @@ private:
 } ;
 
 
-
 #endif

include/track.h

@@ -64,6 +64,7 @@ const int TCO_BORDER_WIDTH = 1;
 class trackContentObject : public model, public journallingObject
 {
 	Q_OBJECT
+	mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
 public:
 	trackContentObject( track * _track );
 	virtual ~trackContentObject();
@@ -100,11 +101,6 @@ public:
 		return( m_length );
 	}
 
-	bool isMuted( void ) const
-	{
-		return( m_mutedModel.value() );
-	}
-
 	virtual void movePosition( const midiTime & _pos );
 	virtual void changeLength( const midiTime & _length );