Merge branch 'master' into ed_refac

Conflicts:
	src/gui/editors/PianoRoll.cpp

include/FileBrowser.h

@@ -161,6 +161,8 @@ private:
 	QStringList m_directories;
 	QString m_filter;
 
+	int m_dirCount;
+
 } ;
 
 

include/MainWindow.h

@@ -30,6 +30,8 @@
 #include <QtCore/QList>
 #include <QMainWindow>
 
+#include "export.h"
+
 class QAction;
 class QDomElement;
 class QGridLayout;
@@ -40,7 +42,7 @@ class PluginView;
 class ToolButton;
 
 
-class MainWindow : public QMainWindow
+class EXPORT MainWindow : public QMainWindow
 {
 	Q_OBJECT
 public:
@@ -96,9 +98,9 @@ public:
 	static void restoreWidgetState( QWidget * _w, const QDomElement & _de );
 
 	void collectErrors( const QList<QString>* errors );
-	void collectError( const QString error );
+	void collectError( const QString & error );
 	void clearErrors();
-	void showErrors( const QString reason );
+	void showErrors( const QString & reason );
 
 
 public slots:

include/MidiTime.h

@@ -137,7 +137,8 @@ public:
 
 	static int stepsPerTact()
 	{
-		return qMax( 1, ticksPerTact() / DefaultBeatsPerTact );
+		int steps = ticksPerTact() / DefaultBeatsPerTact;
+		return qMax( 1, steps );
 	}
 
 	static void setTicksPerTact( tick_t _tpt )

include/Note.h

@@ -91,9 +91,9 @@ public:
 	virtual ~Note();
 
 	// used by GUI
-	inline void setSelected( const bool _selected ){ m_selected = _selected; }
-	inline void setOldKey( const int _oldKey ){ m_oldKey = _oldKey; }
-	inline void setOldPos( const MidiTime & _oldPos ){ m_oldPos = _oldPos; }
+	inline void setSelected( const bool _selected ) { m_selected = _selected; }
+	inline void setOldKey( const int _oldKey ) { m_oldKey = _oldKey; }
+	inline void setOldPos( const MidiTime & _oldPos ) { m_oldPos = _oldPos; }
 	inline void setOldLength( const MidiTime & _oldLength )
 	{
 		m_oldLength = _oldLength;

include/PianoRoll.h

@@ -304,7 +304,7 @@ private:
 	volume_t m_lastNoteVolume;
 	panning_t m_lastNotePanning;
 
-	int m_startKey;			// first key when drawing
+	int m_startKey; // first key when drawing
 	int m_lastKey;
 
 	EditModes m_editMode;

include/PlayHandle.h

@@ -55,6 +55,8 @@ public:
 		m_type = p.m_type;
 		m_offset = p.m_offset;
 		m_affinity = p.m_affinity;
+		m_usesBuffer = p.m_usesBuffer;
+		m_audioPort = p.m_audioPort;
 		return *this;
 	}
 

include/Track.h

@@ -121,6 +121,16 @@ public:
 		return m_length;
 	}
 
+	inline void setAutoResize( const bool _r )
+	{
+		m_autoResize = _r;
+	}
+
+	inline const bool getAutoResize() const
+	{
+		return m_autoResize;
+	}
+
 	virtual void movePosition( const MidiTime & _pos );
 	virtual void changeLength( const MidiTime & _length );
 
@@ -165,6 +175,7 @@ private:
 
 	BoolModel m_mutedModel;
 	BoolModel m_soloModel;
+	bool m_autoResize;
 
 	bool m_selectViewOnCreate;
 
@@ -216,7 +227,6 @@ protected:
 	virtual void mouseMoveEvent( QMouseEvent * _me );
 	virtual void mouseReleaseEvent( QMouseEvent * _me );
 
-	void setAutoResizeEnabled( bool _e = false );
 	float pixelsPerTact();
 
 	inline TrackView * getTrackView()
@@ -248,7 +258,6 @@ private:
 	TrackContentObject * m_tco;
 	TrackView * m_trackView;
 	Actions m_action;
-	bool m_autoResize;
 	QPoint m_initialMousePos;
 	QPoint m_initialMouseGlobalPos;
 

include/TrackContainer.h

@@ -42,6 +42,11 @@ class EXPORT TrackContainer : public Model, public JournallingObject
 	Q_OBJECT
 public:
 	typedef QVector<Track *> TrackList;
+	enum TrackContainerTypes
+	{
+		BBContainer,
+		SongContainer
+	} ;
 
 	TrackContainer();
 	virtual ~TrackContainer();
@@ -78,6 +83,16 @@ public:
 		return "trackcontainer";
 	}
 
+	inline void setType( TrackContainerTypes newType )
+	{
+		m_TrackContainerType = newType;
+	}
+
+	inline TrackContainerTypes type() const
+	{
+		return m_TrackContainerType;
+	}
+
 
 signals:
 	void trackAdded( Track * _track );
@@ -88,6 +103,8 @@ protected:
 private:
 	TrackList m_tracks;
 
+	TrackContainerTypes m_TrackContainerType;
+
 
 	friend class TrackContainerView;
 	friend class Track;

include/TrackContainerView.h

@@ -33,6 +33,7 @@
 
 #include "Track.h"
 #include "JournallingObject.h"
+#include "InstrumentTrack.h"
 
 
 class QVBoxLayout;
@@ -182,6 +183,19 @@ signals:
 
 } ;
 
+class InstrumentLoaderThread : public QThread
+{
+	Q_OBJECT
+public:
+	InstrumentLoaderThread( QObject *parent = 0, InstrumentTrack *it = 0,
+							QString name = "" );
 
+	void run();
+
+private:
+	InstrumentTrack *m_it;
+	QString m_name;
+	QThread *m_containerThread;
+};
 
 #endif