bugfixes, new plugin "Vibed" and more

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

include/instrument_track.h

@@ -155,6 +155,9 @@ public:
 	virtual void FASTCALL loadTrackSpecificSettings( const QDomElement &
 									_this );
 
+	using track::setJournalling;
+
+
 	// load instrument whose name matches given one
 	instrument * FASTCALL loadInstrument( const QString &
 							_instrument_name );

include/note_play_handle.h

@@ -160,7 +160,7 @@ public:
 	int index( void ) const;
 
 	// note-play-handles belonging to given channel
-	static constNotePlayHandleVector nphsOfChannelTrack(
+	static constNotePlayHandleVector nphsOfInstrumentTrack(
 						const instrumentTrack * _ct );
 
 	// return whether given note-play-handle is equal to *this

include/preset_preview_play_handle.h

@@ -60,7 +60,7 @@ public:
 	virtual bool done( void ) const;
 
 	static void cleanUp( engine * _engine );
-	static constNotePlayHandleVector nphsOfChannelTrack(
+	static constNotePlayHandleVector nphsOfInstrumentTrack(
 						const instrumentTrack * _ct );
 
 private:

include/project_journal.h

@@ -90,7 +90,13 @@ public:
 	// journalling information about the ID get's lost
 	void forgetAboutID( const jo_id_t _id );
 
-	void clear( void );
+	void clearJournal( void )
+	{
+		m_journalEntries.clear();
+		m_currentJournalEntry = m_journalEntries.end();
+	}
+
+	void clearInvalidJournallingObjects( void );
 
 	journallingObject * getJournallingObject( const jo_id_t _id )
 	{

include/track.h

@@ -129,8 +129,8 @@ protected:
 	void setAutoResizeEnabled( bool _e = FALSE );
 	float pixelsPerTact( void );
 
-	virtual void undoStep( journalEntry & _edit_step );
-	virtual void redoStep( journalEntry & _edit_step );
+	virtual void undoStep( journalEntry & _je );
+	virtual void redoStep( journalEntry & _je );
 
 
 protected slots:
@@ -210,8 +210,8 @@ protected:
 		return( "trackcontentwidget" );
 	}
 
-	virtual void undoStep( journalEntry & _edit_step );
-	virtual void redoStep( journalEntry & _edit_step );
+	virtual void undoStep( journalEntry & _je );
+	virtual void redoStep( journalEntry & _je );
 
 
 private:
@@ -277,7 +277,7 @@ private:
 
 
 // actual widget shown in trackContainer
-class trackWidget : public QWidget
+class trackWidget : public QWidget, public journallingObject
 {
 	Q_OBJECT
 public:
@@ -338,6 +338,15 @@ public slots:
 
 
 protected:
+	virtual void undoStep( journalEntry & _je );
+	virtual void redoStep( journalEntry & _je );
+
+	virtual QString nodeName( void ) const
+	{
+		return( "trackwidget" );
+	}
+
+
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );
 	virtual void mousePressEvent( QMouseEvent * _me );

include/track_container.h

@@ -129,6 +129,9 @@ public:
 
 
 protected:
+	virtual void undoStep( journalEntry & _je );
+	virtual void redoStep( journalEntry & _je );
+
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );
 	virtual void mousePressEvent( QMouseEvent * _me );
@@ -152,6 +155,10 @@ protected slots:
 
 
 private:
+	enum actions
+	{
+		ADD_TRACK, REMOVE_TRACK
+	} ;
 
 	class scrollArea : public QScrollArea
 	{