Merge pull request #1026 from LMMS/stable-1.1

sync

include/bb_editor.h

@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _BB_EDITOR_H
-#define _BB_EDITOR_H
+#ifndef BB_EDITOR_H
+#define BB_EDITOR_H
 
 #include "TrackContainerView.h"
 
@@ -45,6 +45,8 @@ public:
 	{
 		return( true );
 	}
+	
+	virtual void dropEvent( QDropEvent * _de );
 
 	void removeBBView( int _bb );
 

include/track.h

@@ -379,6 +379,7 @@ private slots:
 	void updateMenu();
 	void recordingOn();
 	void recordingOff();
+	void clearTrack();
 
 private:
 	static QPixmap * s_grip;
@@ -461,6 +462,7 @@ public:
 	trackContentObject * addTCO( trackContentObject * _tco );
 	void removeTCO( trackContentObject * _tco );
 	// -------------------------------------------------------
+	void deleteTCOs();
 
 	int numOfTCOs();
 	trackContentObject * getTCO( int _tco_num );