Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer

include/AutomatableModel.h

@@ -180,6 +180,8 @@ public:
 	static void unlinkModels( AutomatableModel * _m1,
 						AutomatableModel * _m2 );
 
+	void unlinkAllModels();
+
 	virtual void saveSettings( QDomDocument & _doc,
 					QDomElement & _this,
 				const QString & _name = QString( "value" ) );
@@ -208,6 +210,11 @@ public:
 		return "0";
 	}
 
+	bool hasLinkedModels() const
+	{
+		return m_hasLinkedModels;
+	}
+
 
 public slots:
 	virtual void reset();

include/AutomatableModelView.h

@@ -34,43 +34,43 @@ class QMenu;
 class EXPORT AutomatableModelView : public ModelView
 {
 public:
-	AutomatableModelView( Model * _model, QWidget * _this );
+	AutomatableModelView( Model* model, QWidget* _this );
 	virtual ~AutomatableModelView();
 
 	// some basic functions for convenience
-	AutomatableModel * modelUntyped()
+	AutomatableModel* modelUntyped()
 	{
-		return( castModel<AutomatableModel>() );
+		return castModel<AutomatableModel>();
 	}
 
-	const AutomatableModel * modelUntyped() const
+	const AutomatableModel* modelUntyped() const
 	{
-		return( castModel<AutomatableModel>() );
+		return castModel<AutomatableModel>();
 	}
 
-	virtual void setModel( Model * _model, bool _old_model_valid = true );
+	virtual void setModel( Model* model, bool isOldModelValid = true );
 
 	template<typename T>
 	inline T value() const
 	{
-		return( modelUntyped() ? modelUntyped()->value<T>() : 0 );
+		return modelUntyped() ? modelUntyped()->value<T>() : 0;
 	}
 
-	inline void setDescription( const QString & _desc )
+	inline void setDescription( const QString& desc )
 	{
-		m_description = _desc;
+		m_description = desc;
 	}
 
-	inline void setUnit( const QString & _unit )
+	inline void setUnit( const QString& unit )
 	{
-		m_unit = _unit;
+		m_unit = unit;
 	}
 
-	void addDefaultActions( QMenu * _menu );
+	void addDefaultActions( QMenu* menu );
 
 
 protected:
-	virtual void mousePressEvent( QMouseEvent * _ev );
+	virtual void mousePressEvent( QMouseEvent* event );
 
 	QString m_description;
 	QString m_unit;
@@ -84,19 +84,18 @@ class AutomatableModelViewSlots : public QObject
 {
 	Q_OBJECT
 public:
-	AutomatableModelViewSlots( 
-			AutomatableModelView * _amv,
-			QObject * _parent );
+	AutomatableModelViewSlots( AutomatableModelView* amv, QObject* parent );
 
 public slots:
 	void execConnectionDialog();
 	void removeConnection();
 	void editSongGlobalAutomation();
+	void unlinkAllModels();
 	void removeSongGlobalAutomation();
 
 
 protected:
-	AutomatableModelView * amv;
+	AutomatableModelView* m_amv;
 
 } ;
 
@@ -107,19 +106,19 @@ protected:
 class EXPORT type##ModelView : public AutomatableModelView		\
 {																\
 public:															\
-	type##ModelView( Model * _model, QWidget * _this ) :		\
-		AutomatableModelView( _model, _this )					\
+	type##ModelView( Model* model, QWidget* _this ) :			\
+		AutomatableModelView( model, _this )					\
 	{															\
 	}															\
 																\
-	type##Model * model()										\
+	type##Model* model()										\
 	{															\
-		return( castModel<type##Model>() );						\
+		return castModel<type##Model>();						\
 	}															\
 																\
-	const type##Model * model() const							\
+	const type##Model* model() const							\
 	{															\
-		return( castModel<type##Model>() );						\
+		return castModel<type##Model>();						\
 	}															\
 }
 

include/export_project_dialog.h

@@ -69,6 +69,7 @@ private:
 	TrackVector m_unmutedBB;
 	ProjectRenderer::ExportFileFormats m_ft;
 	TrackVector m_tracksToRender;
+	ProjectRenderer* m_activeRenderer;
 } ;
 
 #endif

include/setup_dialog.h

@@ -111,6 +111,7 @@ private slots:
 	void toggleSyncVSTPlugins( bool _enabled );
 	void toggleAnimateAFP( bool _enabled );
 	void toggleNoteLabels( bool en );
+	void toggleDisplayWaveform( bool en );
 
 
 private:
@@ -162,6 +163,7 @@ private:
 	bool m_syncVSTPlugins;
 	bool m_animateAFP;
 	bool m_printNoteLabels;
+	bool m_displayWaveform;
 
 	typedef QMap<QString, AudioDevice::setupWidget *> AswMap;
 	typedef QMap<QString, MidiClient::setupWidget *> MswMap;