splitted source-files for FX-mixer and its view, create FX-mixer after song, improved layouting of FX-mixer and made FX-lines being organized in 4 banks instead of one big scrollarea

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

include/fx_mixer.h

@@ -30,21 +30,34 @@
 #include <config.h>
 #endif
 
-#include <QtGui/QWidget>
-
-#include "types.h"
 #include "mv_base.h"
 #include "mixer.h"
+#include "effect_chain.h"
 #include "journalling_object.h"
 
 
 const int NumFxChannels = 64;
 
-class fader;
-class fxLine;
-class effectRackView;
-class pixmapButton;
-struct fxChannel;
+
+struct fxChannel
+{
+	fxChannel( model * _parent );
+	~fxChannel();
+
+	effectChain m_fxChain;
+	bool m_used;
+	bool m_stillRunning;
+	float m_peakLeft;
+	float m_peakRight;
+	sampleFrame * m_buffer;
+	boolModel m_muteModel;
+	boolModel m_soloModel;
+	floatModel m_volumeModel;
+	QString m_name;
+	QMutex m_lock;
+
+} ;
+
 
 
 class fxMixer : public journallingObject, public model
@@ -82,41 +95,4 @@ private:
 } ;
 
 
-class fxMixerView : public QWidget, public modelView
-{
-	Q_OBJECT
-public:
-	fxMixerView();
-	virtual ~fxMixerView();
-
-	fxLine * currentFxLine( void )
-	{
-		return( m_currentFxLine );
-	}
-	void setCurrentFxLine( fxLine * _line );
-
-	void clear( void );
-
-
-private slots:
-	void updateFaders( void );
-
-
-private:
-	struct fxChannelView
-	{
-		fxLine * m_fxLine;
-		effectRackView * m_rackView;
-		pixmapButton * m_muteButton;
-		pixmapButton * m_soloButton;
-		fader * m_fader;
-	} ;
-
-	fxChannelView m_fxChannelViews[NumFxChannels+1];
-
-	QWidget * m_fxRackArea;
-	fxLine * m_currentFxLine;
-
-} ;
-
 #endif

include/fx_mixer_view.h

@@ -0,0 +1,80 @@
+/*
+ * fx_mixer_view.h - effect-mixer-view for LMMS
+ *
+ * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * 
+ * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+#ifndef _FX_MIXER_VIEW_H
+#define _FX_MIXER_VIEW_H
+
+#include <QtGui/QWidget>
+
+#include "fx_mixer.h"
+
+
+class QStackedLayout;
+class fader;
+class fxLine;
+class effectRackView;
+class pixmapButton;
+
+
+
+class fxMixerView : public QWidget, public modelView
+{
+	Q_OBJECT
+public:
+	fxMixerView();
+	virtual ~fxMixerView();
+
+	fxLine * currentFxLine( void )
+	{
+		return( m_currentFxLine );
+	}
+	void setCurrentFxLine( fxLine * _line );
+
+	void clear( void );
+
+
+private slots:
+	void updateFaders( void );
+
+
+private:
+	struct fxChannelView
+	{
+		fxLine * m_fxLine;
+		effectRackView * m_rackView;
+		pixmapButton * m_muteButton;
+		pixmapButton * m_soloButton;
+		fader * m_fader;
+	} ;
+
+	fxChannelView m_fxChannelViews[NumFxChannels+1];
+
+	QStackedLayout * m_fxRacksLayout;
+	QStackedLayout * m_fxLineBanks;
+	fxLine * m_currentFxLine;
+
+} ;
+
+#endif