several fixes regarding effects and their integration into M/V-architecture

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

include/automatable_model_templates.h

@@ -1,7 +1,7 @@
 /*
  * automatable_model_templates.h - definition of automatableModel templates
  *
- * Copyright (c) 2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2007-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *

include/effect.h

@@ -54,7 +54,7 @@ public:
 	virtual bool FASTCALL processAudioBuffer( 
 			surroundSampleFrame * _buf, const fpp_t _frames );
 	
-	inline ch_cnt_t getProcessorCount( void )
+	inline ch_cnt_t getProcessorCount( void ) const
 	{
 		return( m_processors );
 	}
@@ -64,7 +64,7 @@ public:
 		m_processors = _processors;
 	}
 	
-	inline bool isOkay( void )
+	inline bool isOkay( void ) const
 	{
 		return( m_okay );
 	}
@@ -75,7 +75,7 @@ public:
 	}
 	
 	
-	inline bool isRunning( void )
+	inline bool isRunning( void ) const
 	{
 		return( m_running );
 	}
@@ -91,12 +91,12 @@ public:
 		m_running = FALSE;
 	}
 	
-	inline bool enabled( void )
+	inline bool isEnabled( void ) const
 	{
 		return( m_enabledModel.value() );
 	}
 	
-	inline Uint32 getTimeout( void )
+	inline Uint32 getTimeout( void ) const
 	{
 		return( m_silenceTimeout );
 	}
@@ -106,24 +106,24 @@ public:
 		m_silenceTimeout = _time_out;
 	}
 	
-	inline float getWetLevel( void )
+	inline float getWetLevel( void ) const
 	{
 		return( m_wetDryModel.value() );
 	}
 	
-	inline float getDryLevel( void )
+	inline float getDryLevel( void ) const
 	{
 		return( 1.0f - m_wetDryModel.value() );
 	}
 	
-	inline float getGate( void )
+	inline float getGate( void ) const
 	{
 		const float level = m_gateModel.value();
 		return( level*level * m_processors *
 				engine::getMixer()->framesPerPeriod()  );
 	}
 
-	inline Uint32 getBufferCount( void )
+	inline Uint32 getBufferCount( void ) const
 	{
 		return( m_bufferCount );
 	}
@@ -138,7 +138,7 @@ public:
 		m_bufferCount++;
 	}
 
-	inline bool dontRun( void )
+	inline bool dontRun( void ) const
 	{
 		return( m_noRun );
 	}
@@ -148,7 +148,7 @@ public:
 		m_noRun = _state;
 	}
 
-	inline const descriptor::subPluginFeatures::key & getKey( void )
+	inline const descriptor::subPluginFeatures::key & getKey( void ) const
 	{
 		return( m_key );
 	}

include/effect_chain.h

@@ -1,7 +1,7 @@
 /*
  * effect_chain.h - class for processing and effects chain
  *
- * Copyright (c) 2006-2007 Danny McRae <khjklujn/at/users.sourceforge.net>
+ * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -27,8 +27,10 @@
 
 #include "effect.h"
 
+
 typedef QVector<effect *> effect_list_t;
 
+
 class effectChain
 {
 public:
@@ -43,21 +45,20 @@ public:
 							const fpp_t _frames );
 	void startRunning( void );
 	bool isRunning( void );
-	
-	inline void setBypass( bool _mode )
-	{
-		m_bypassed = _mode;
-	}
-	
+
 	inline const effect_list_t & getEffects( void )
 	{
 		return( m_effects );
 	}
-	
+
+
 private:
 	effect_list_t m_effects;
-	
-	bool m_bypassed;
+
+	boolModel m_enabledModel;
+
+
+	friend class effectTabWidget;
 
 } ;
 

include/effect_tab_widget.h

@@ -2,7 +2,7 @@
  * effect_tab_widget.h - tab-widget in channel-track-window for setting up
  *                       effects
  *
- * Copyright (c) 2006-2007 Danny McRae <khjklujn/at/users.sourceforge.net>
+ * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -70,7 +70,6 @@ public:
 
 private slots:
 	void addEffect( void );
-	void setBypass( bool _state );
 
 
 private:

include/engine.h

@@ -1,7 +1,7 @@
 /*
  * engine.h - engine-system of LMMS
  *
- * Copyright (c) 2006-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *

include/plugin.h

@@ -1,7 +1,7 @@
 /*
  * plugin.h - class plugin, the base-class and generic interface for all plugins
  *
- * Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *