Rename FxMixer to Mixer (#6239)

... as decided in #6089 and #5592.

This PR replaces every occurrence of "FX" where "Mixer Channel" is meant.

include/AudioPort.h

@@ -71,11 +71,11 @@ public:
 	void setExtOutputEnabled( bool _enabled );
 
 
-	// next effect-channel after this audio-port
+	// next mixer-channel after this audio-port
 	// (-1 = none  0 = master)
-	inline fx_ch_t nextFxChannel() const
+	inline mix_ch_t nextMixerChannel() const
 	{
-		return m_nextFxChannel;
+		return m_nextMixerChannel;
 	}
 
 	inline EffectChain * effects()
@@ -83,9 +83,9 @@ public:
 		return m_effects.get();
 	}
 
-	void setNextFxChannel( const fx_ch_t _chnl )
+	void setNextMixerChannel( const mix_ch_t _chnl )
 	{
-		m_nextFxChannel = _chnl;
+		m_nextMixerChannel = _chnl;
 	}
 
 
@@ -116,7 +116,7 @@ private:
 	QMutex m_portBufferLock;
 
 	bool m_extOutputEnabled;
-	fx_ch_t m_nextFxChannel;
+	mix_ch_t m_nextMixerChannel;
 
 	QString m_name;
 

include/DataFile.h

@@ -122,6 +122,7 @@ private:
 	void upgrade_automationNodes();
 	void upgrade_extendedNoteRange();
 	void upgrade_defaultTripleOscillatorHQ();
+	void upgrade_mixerRename();
 
 	// List of all upgrade methods
 	static const std::vector<UpgradeMethod> UPGRADE_METHODS;

include/Engine.h

@@ -36,7 +36,7 @@
 
 class AudioEngine;
 class BBTrackContainer;
-class FxMixer;
+class Mixer;
 class ProjectJournal;
 class Song;
 class Ladspa2LMMS;
@@ -67,9 +67,9 @@ public:
 		return s_audioEngine;
 	}
 
-	static FxMixer * fxMixer()
+	static Mixer * mixer()
 	{
-		return s_fxMixer;
+		return s_mixer;
 	}
 
 	static Song * getSong()
@@ -141,7 +141,7 @@ private:
 
 	// core
 	static AudioEngine *s_audioEngine;
-	static FxMixer * s_fxMixer;
+	static Mixer * s_mixer;
 	static Song * s_song;
 	static BBTrackContainer * s_bbTrackContainer;
 	static ProjectJournal * s_projectJournal;

include/Fader.h

@@ -1,5 +1,5 @@
 /*
- * Fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen
+ * Fader.h - fader-widget used in Mixer - partly taken from Hydrogen
  *
  * Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 

include/GuiApplication.h

@@ -35,7 +35,7 @@ class QLabel;
 class AutomationEditorWindow;
 class BBEditor;
 class ControllerRackView;
-class FxMixerView;
+class MixerView;
 class MainWindow;
 class MicrotunerConfig;
 class PianoRollWindow;
@@ -55,7 +55,7 @@ public:
 #endif
 
 	MainWindow* mainWindow() { return m_mainWindow; }
-	FxMixerView* fxMixerView() { return m_fxMixerView; }
+	MixerView* mixerView() { return m_mixerView; }
 	SongEditorWindow* songEditor() { return m_songEditor; }
 	BBEditor* getBBEditor() { return m_bbEditor; }
 	PianoRollWindow* pianoRoll() { return m_pianoRoll; }
@@ -74,7 +74,7 @@ private:
 	static GuiApplication* s_instance;
 
 	MainWindow* m_mainWindow;
-	FxMixerView* m_fxMixerView;
+	MixerView* m_mixerView;
 	SongEditorWindow* m_songEditor;
 	AutomationEditorWindow* m_automationEditor;
 	BBEditor* m_bbEditor;

include/InstrumentTrack.h

@@ -207,9 +207,9 @@ public:
 		return &m_pitchRangeModel;
 	}
 
-	IntModel * effectChannelModel()
+	IntModel * mixerChannelModel()
 	{
-		return &m_effectChannelModel;
+		return &m_mixerChannelModel;
 	}
 
 	void setPreviewMode( const bool );
@@ -245,7 +245,7 @@ protected slots:
 	void updateBaseNote();
 	void updatePitch();
 	void updatePitchRange();
-	void updateEffectChannel();
+	void updateMixerChannel();
 
 
 private:
@@ -281,7 +281,7 @@ private:
 
 	FloatModel m_pitchModel;
 	IntModel m_pitchRangeModel;
-	IntModel m_effectChannelModel;
+	IntModel m_mixerChannelModel;
 	BoolModel m_useMasterPitchModel;
 
 	Instrument * m_instrument;

include/InstrumentTrackView.h

@@ -64,7 +64,7 @@ public:
 	}
 
 	// Create a menu for assigning/creating channels for this track
-	QMenu * createFxMenu( QString title, QString newFxLabel ) override;
+	QMenu * createMixerMenu( QString title, QString newMixerLabel ) override;
 
 
 protected:
@@ -82,8 +82,8 @@ private slots:
 	void midiOutSelected();
 	void midiConfigChanged();
 
-	void assignFxLine( int channelIndex );
-	void createFxLine();
+	void assignMixerLine( int channelIndex );
+	void createMixerLine();
 
 	void handleConfigChange(QString cls, QString attr, QString value);
 

include/InstrumentTrackWindow.h

@@ -32,7 +32,7 @@
 
 
 class EffectRackView;
-class FxLineLcdSpinBox;
+class MixerLineLcdSpinBox;
 class InstrumentFunctionArpeggioView;
 class InstrumentFunctionNoteStackingView;
 class InstrumentMidiIOView;
@@ -135,7 +135,7 @@ private:
 	QLabel * m_pitchLabel;
 	LcdSpinBox* m_pitchRangeSpinBox;
 	QLabel * m_pitchRangeLabel;
-	FxLineLcdSpinBox * m_effectChannelNumber;
+	MixerLineLcdSpinBox * m_mixerChannelNumber;
 
 
 

include/MainWindow.h

@@ -153,7 +153,7 @@ public slots:
 	void toggleSongEditorWin();
 	void toggleProjectNotesWin();
 	void toggleMicrotunerWin();
-	void toggleFxMixerWin();
+	void toggleMixerWin();
 	void togglePianoRollWin();
 	void toggleControllerRack();
 	void toggleFullscreen();

include/Mixer.h

@@ -1,5 +1,5 @@
 /*
- * FxMixer.h - effect-mixer for LMMS
+ * Mixer.h - effect-mixer for LMMS
  *
  * Copyright (c) 2008-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef FX_MIXER_H
-#define FX_MIXER_H
+#ifndef MIXER_H
+#define MIXER_H
 
 #include "Model.h"
 #include "EffectChain.h"
@@ -34,14 +34,14 @@
 
 #include <QColor>
 
-class FxRoute;
-typedef QVector<FxRoute *> FxRouteVector;
+class MixerRoute;
+typedef QVector<MixerRoute *> MixerRouteVector;
 
-class FxChannel : public ThreadableJob
+class MixerChannel : public ThreadableJob
 {
 	public:
-		FxChannel( int idx, Model * _parent );
-		virtual ~FxChannel();
+		MixerChannel( int idx, Model * _parent );
+		virtual ~MixerChannel();
 
 		EffectChain m_fxChain;
 
@@ -64,10 +64,10 @@ class FxChannel : public ThreadableJob
 		bool m_muted; // are we muted? updated per period so we don't have to call m_muteModel.value() twice
 
 		// pointers to other channels that this one sends to
-		FxRouteVector m_sends;
+		MixerRouteVector m_sends;
 
 		// pointers to other channels that send to this one
-		FxRouteVector m_receives;
+		MixerRouteVector m_receives;
 
 		bool requiresProcessing() const override { return true; }
 		void unmuteForSolo();
@@ -93,19 +93,19 @@ class FxChannel : public ThreadableJob
 };
 
 
-class FxRoute : public QObject
+class MixerRoute : public QObject
 {
 	Q_OBJECT
 	public:		
-		FxRoute( FxChannel * from, FxChannel * to, float amount );
-		virtual ~FxRoute();
+		MixerRoute( MixerChannel * from, MixerChannel * to, float amount );
+		virtual ~MixerRoute();
 		
-	fx_ch_t senderIndex() const
+	mix_ch_t senderIndex() const
 	{
 		return m_from->m_channelIndex;
 	}
 	
-	fx_ch_t receiverIndex() const
+	mix_ch_t receiverIndex() const
 	{
 		return m_to->m_channelIndex;
 	}
@@ -115,12 +115,12 @@ class FxRoute : public QObject
 		return &m_amount;
 	}
 	
-	FxChannel * sender() const
+	MixerChannel * sender() const
 	{
 		return m_from;
 	}
 	
-	FxChannel * receiver() const
+	MixerChannel * receiver() const
 	{
 		return m_to;
 	}
@@ -128,20 +128,20 @@ class FxRoute : public QObject
 	void updateName();
 		
 	private:
-		FxChannel * m_from;
-		FxChannel * m_to;
+		MixerChannel * m_from;
+		MixerChannel * m_to;
 		FloatModel m_amount;
 };
 
 
-class LMMS_EXPORT FxMixer : public Model, public JournallingObject
+class LMMS_EXPORT Mixer : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:
-	FxMixer();
-	virtual ~FxMixer();
+	Mixer();
+	virtual ~Mixer();
 
-	void mixToChannel( const sampleFrame * _buf, fx_ch_t _ch );
+	void mixToChannel( const sampleFrame * _buf, mix_ch_t _ch );
 
 	void prepareMasterMix();
 	void masterMix( sampleFrame * _buf );
@@ -151,38 +151,38 @@ public:
 
 	QString nodeName() const override
 	{
-		return "fxmixer";
+		return "mixer";
 	}
 
-	FxChannel * effectChannel( int _ch )
+	MixerChannel * mixerChannel( int _ch )
 	{
-		return m_fxChannels[_ch];
+		return m_mixerChannels[_ch];
 	}
 
 	// make the output of channel fromChannel go to the input of channel toChannel
 	// it is safe to call even if the send already exists
-	FxRoute * createChannelSend(fx_ch_t fromChannel, fx_ch_t toChannel,
+	MixerRoute * createChannelSend(mix_ch_t fromChannel, mix_ch_t toChannel,
 						   float amount = 1.0f);
-	FxRoute * createRoute( FxChannel * from, FxChannel * to, float amount );
+	MixerRoute * createRoute( MixerChannel * from, MixerChannel * to, float amount );
 
 	// delete the connection made by createChannelSend
-	void deleteChannelSend(fx_ch_t fromChannel, fx_ch_t toChannel);
-	void deleteChannelSend( FxRoute * route );
+	void deleteChannelSend(mix_ch_t fromChannel, mix_ch_t toChannel);
+	void deleteChannelSend( MixerRoute * route );
 
 	// determine if adding a send from sendFrom to
 	// sendTo would result in an infinite mixer loop.
-	bool isInfiniteLoop(fx_ch_t fromChannel, fx_ch_t toChannel);
-	bool checkInfiniteLoop( FxChannel * from, FxChannel * to );
+	bool isInfiniteLoop(mix_ch_t fromChannel, mix_ch_t toChannel);
+	bool checkInfiniteLoop( MixerChannel * from, MixerChannel * to );
 
 	// return the FloatModel of fromChannel sending its output to the input of
 	// toChannel. NULL if there is no send.
-	FloatModel * channelSendModel(fx_ch_t fromChannel, fx_ch_t toChannel);
+	FloatModel * channelSendModel(mix_ch_t fromChannel, mix_ch_t toChannel);
 
-	// add a new channel to the Fx Mixer.
+	// add a new channel to the mixer.
 	// returns the index of the channel that was just added
 	int createChannel();
 
-	// delete a channel from the FX mixer.
+	// delete a channel from the mixer.
 	void deleteChannel(int index);
 
 	// delete all the mixer channels except master and remove all effects
@@ -193,7 +193,7 @@ public:
 	void moveChannelRight(int index);
 
 	// reset a channel's name, fx, sends, etc
-	void clearChannel(fx_ch_t channelIndex);
+	void clearChannel(mix_ch_t channelIndex);
 
 	// rename channels when moving etc. if they still have their original name
 	void validateChannelName( int index, int oldIndex );
@@ -202,22 +202,21 @@ public:
 	void activateSolo();
 	void deactivateSolo();
 
-	inline fx_ch_t numChannels() const
+	inline mix_ch_t numChannels() const
 	{
-		return m_fxChannels.size();
+		return m_mixerChannels.size();
 	}
 
-	FxRouteVector m_fxRoutes;
+	MixerRouteVector m_mixerRoutes;
 
 private:
-	// the fx channels in the mixer. index 0 is always master.
-	QVector<FxChannel *> m_fxChannels;
+	// the mixer channels in the mixer. index 0 is always master.
+	QVector<MixerChannel *> m_mixerChannels;
 
 	// make sure we have at least num channels
 	void allocateChannelsTo(int num);
 
 	int m_lastSoloed;
-
 } ;
 
 

include/MixerLine.h

@@ -1,5 +1,5 @@
 /*
- * FxLine.h - FX line widget
+ * MixerLine.h - Mixer line widget
  *
  * Copyright (c) 2009 Andrew Kelley <superjoe30/at/gmail/dot/com>
  * Copyright (c) 2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef FX_LINE_H
-#define FX_LINE_H
+#ifndef MIXER_LINE_H
+#define MIXER_LINE_H
 
 #include <QColorDialog>
 #include <QGraphicsView>
@@ -38,10 +38,10 @@
 
 
 
-class FxMixerView;
+class MixerView;
 class SendButtonIndicator;
 
-class FxLine : public QWidget
+class MixerLine : public QWidget
 {
 	Q_OBJECT
 public:
@@ -50,8 +50,8 @@ public:
 	Q_PROPERTY( QColor strokeOuterInactive READ strokeOuterInactive WRITE setStrokeOuterInactive )
 	Q_PROPERTY( QColor strokeInnerActive READ strokeInnerActive WRITE setStrokeInnerActive )
 	Q_PROPERTY( QColor strokeInnerInactive READ strokeInnerInactive WRITE setStrokeInnerInactive )
-	FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex);
-	~FxLine();
+	MixerLine( QWidget * _parent, MixerView * _mv, int _channelIndex);
+	~MixerLine();
 
 	void paintEvent( QPaintEvent * ) override;
 	void mousePressEvent( QMouseEvent * ) override;
@@ -79,15 +79,15 @@ public:
 	QColor strokeInnerInactive() const;
 	void setStrokeInnerInactive( const QColor & c );
 
-	static const int FxLineHeight;
+	static const int MixerLineHeight;
 
 	bool eventFilter (QObject *dist, QEvent *event) override;
 
 private:
-	void drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool sendToThis, bool receiveFromThis );
+	void drawMixerLine( QPainter* p, const MixerLine *mixerLine, bool isActive, bool sendToThis, bool receiveFromThis );
 	QString elideName( const QString & name );
 
-	FxMixerView * m_mv;
+	MixerView * m_mv;
 	LcdWidget* m_lcd;
 	int m_channelIndex;
 	QBrush m_backgroundActive;
@@ -116,4 +116,4 @@ private slots:
 };
 
 
-#endif // FXLINE_H
+#endif // MIXERLINE_H

include/MixerLineLcdSpinBox.h

@@ -1,5 +1,5 @@
 /*
- * FxLineLcdSpinBox.h - a specialization of LcdSpnBox for setting FX channels
+ * MixerLineLcdSpinBox.h - a specialization of LcdSpnBox for setting mixer channels
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -22,22 +22,22 @@
  *
  */
 
-#ifndef FX_LINE_LCD_SPIN_BOX_H
-#define FX_LINE_LCD_SPIN_BOX_H
+#ifndef MIXER_LINE_LCD_SPIN_BOX_H
+#define MIXER_LINE_LCD_SPIN_BOX_H
 
 #include "LcdSpinBox.h"
 
 class TrackView;
 
 
-class FxLineLcdSpinBox : public LcdSpinBox
+class MixerLineLcdSpinBox : public LcdSpinBox
 {
 	Q_OBJECT
 public:
-	FxLineLcdSpinBox(int numDigits, QWidget * parent, const QString& name, TrackView * tv = nullptr) :
+	MixerLineLcdSpinBox(int numDigits, QWidget * parent, const QString& name, TrackView * tv = nullptr) :
 		LcdSpinBox(numDigits, parent, name), m_tv(tv)
 	{}
-	virtual ~FxLineLcdSpinBox() {}
+	virtual ~MixerLineLcdSpinBox() {}
 
 	void setTrackView(TrackView * tv);
 
@@ -47,7 +47,6 @@ protected:
 
 private:
 	TrackView * m_tv;
-
 };
 
 #endif

include/MixerView.h

@@ -1,5 +1,5 @@
 /*
- * FxMixerView.h - effect-mixer-view for LMMS
+ * MixerView.h - effect-mixer-view for LMMS
  *
  * Copyright (c) 2008-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef FX_MIXER_VIEW_H
-#define FX_MIXER_VIEW_H
+#ifndef MIXER_VIEW_H
+#define MIXER_VIEW_H
 
 #include <QWidget>
 #include <QHBoxLayout>
@@ -39,21 +39,21 @@
 #include "EffectRackView.h"
 
 class QButtonGroup;
-class FxLine;
+class MixerLine;
 
-class LMMS_EXPORT FxMixerView : public QWidget, public ModelView,
+class LMMS_EXPORT MixerView : public QWidget, public ModelView,
 					public SerializingObjectHook
 {
 	Q_OBJECT
 public:
-	class FxChannelView
+	class MixerChannelView
 	{
 	public:
-		FxChannelView(QWidget * _parent, FxMixerView * _mv, int _chIndex );
+		MixerChannelView(QWidget * _parent, MixerView * _mv, int _chIndex );
 
 		void setChannelIndex( int index );
 
-		FxLine * m_fxLine;
+		MixerLine * m_mixerLine;
 		PixmapButton * m_muteBtn;
 		PixmapButton * m_soloBtn;
 		Fader * m_fader;
@@ -61,35 +61,35 @@ public:
 	};
 
 
-	FxMixerView();
-	virtual ~FxMixerView();
+	MixerView();
+	virtual ~MixerView();
 
 	void keyPressEvent(QKeyEvent * e) override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
 	void loadSettings( const QDomElement & _this ) override;
 
-	inline FxLine * currentFxLine()
+	inline MixerLine * currentMixerLine()
 	{
-		return m_currentFxLine;
+		return m_currentMixerLine;
 	}
 
-	inline FxChannelView * channelView(int index)
+	inline MixerChannelView * channelView(int index)
 	{
-		return m_fxChannelViews[index];
+		return m_mixerChannelViews[index];
 	}
 
 
-	void setCurrentFxLine( FxLine * _line );
-	void setCurrentFxLine( int _line );
+	void setCurrentMixerLine( MixerLine * _line );
+	void setCurrentMixerLine( int _line );
 
 	void clear();
 
 
 	// display the send button and knob correctly
-	void updateFxLine(int index);
+	void updateMixerLine(int index);
 
-	// notify the view that an fx channel was deleted
+	// notify the view that a mixer channel was deleted
 	void deleteChannel(int index);
 
 	// delete all unused channels
@@ -102,7 +102,7 @@ public:
 
 	void renameChannel(int index);
 
-	// make sure the display syncs up with the fx mixer.
+	// make sure the display syncs up with the mixer.
 	// useful for loading projects
 	void refreshDisplay();
 
@@ -117,10 +117,9 @@ private slots:
 	void toggledSolo();
 
 private:
+	QVector<MixerChannelView *> m_mixerChannelViews;
 
-	QVector<FxChannelView *> m_fxChannelViews;
-
-	FxLine * m_currentFxLine;
+	MixerLine * m_currentMixerLine;
 
 	QScrollArea * channelArea;
 	QHBoxLayout * chLayout;
@@ -130,7 +129,7 @@ private:
 
 	void updateMaxChannelSelector();
 	
-	friend class FxChannelView;
+	friend class MixerChannelView;
 } ;
 
 #endif

include/SampleTrack.h

@@ -29,7 +29,7 @@
 
 #include "AudioPort.h"
 #include "FadeButton.h"
-#include "FxMixer.h"
+#include "Mixer.h"
 #include "SampleTCO.h"
 #include "SampleTrackView.h"
 #include "Track.h"
@@ -52,9 +52,9 @@ public:
 							QDomElement & _parent ) override;
 	void loadTrackSpecificSettings( const QDomElement & _this ) override;
 
-	inline IntModel * effectChannelModel()
+	inline IntModel * mixerChannelModel()
 	{
-		return &m_effectChannelModel;
+		return &m_mixerChannelModel;
 	}
 
 	inline AudioPort * audioPort()
@@ -84,12 +84,12 @@ signals:
 public slots:
 	void updateTcos();
 	void setPlayingTcos( bool isPlaying );
-	void updateEffectChannel();
+	void updateMixerChannel();
 
 private:
 	FloatModel m_volumeModel;
 	FloatModel m_panningModel;
-	IntModel m_effectChannelModel;
+	IntModel m_mixerChannelModel;
 	AudioPort m_audioPort;
 	bool m_isPlaying;
 

include/SampleTrackView.h

@@ -58,7 +58,7 @@ public:
 	}
 
 
-	QMenu * createFxMenu( QString title, QString newFxLabel ) override;
+	QMenu * createMixerMenu( QString title, QString newMixerLabel ) override;
 
 
 public slots:
@@ -77,8 +77,8 @@ protected:
 	void dropEvent(QDropEvent *de) override;
 
 private slots:
-	void assignFxLine( int channelIndex );
-	void createFxLine();
+	void assignMixerLine( int channelIndex );
+	void createMixerLine();
 
 
 private:

include/SampleTrackWindow.h

@@ -26,7 +26,7 @@
 #ifndef SAMPLE_TRACK_WINDOW_H
 #define SAMPLE_TRACK_WINDOW_H
 
-#include "FxLineLcdSpinBox.h"
+#include "MixerLineLcdSpinBox.h"
 
 #include <QLineEdit>
 
@@ -82,7 +82,7 @@ private:
 	QLineEdit * m_nameLineEdit;
 	Knob * m_volumeKnob;
 	Knob * m_panningKnob;
-	FxLineLcdSpinBox * m_effectChannelNumber;
+	MixerLineLcdSpinBox * m_mixerChannelNumber;
 
 	EffectRackView * m_effectRack;
 } ;

include/SendButtonIndicator.h

@@ -5,25 +5,25 @@
 #include <QLabel>
 #include <QPixmap>
 
-#include "FxLine.h"
-#include "FxMixerView.h"
+#include "MixerLine.h"
+#include "MixerView.h"
 
-class FxLine;
-class FxMixerView;
+class MixerLine;
+class MixerView;
 
 class SendButtonIndicator : public QLabel 
 {
 public:
-	SendButtonIndicator( QWidget * _parent, FxLine * _owner,
-						 FxMixerView * _mv);
+	SendButtonIndicator( QWidget * _parent, MixerLine * _owner,
+						 MixerView * _mv);
 
 	void mousePressEvent( QMouseEvent * e ) override;
 	void updateLightStatus();
 
 private:
 
-	FxLine * m_parent;
-	FxMixerView * m_mv;
+	MixerLine * m_parent;
+	MixerView * m_mv;
 	static QPixmap * s_qpmOn;
 	static QPixmap * s_qpmOff;
 

include/TrackView.h

@@ -99,7 +99,7 @@ public:
 
 	// Create a menu for assigning/creating channels for this track
 	// Currently instrument track and sample track supports it
-	virtual QMenu * createFxMenu(QString title, QString newFxLabel);
+	virtual QMenu * createMixerMenu(QString title, QString newMixerLabel);
 
 
 public slots:

include/lmms_basics.h

@@ -53,7 +53,7 @@ typedef int32_t f_cnt_t;			// standard frame-count
 typedef uint8_t ch_cnt_t;			// channel-count (0-SURROUND_CHANNELS)
 typedef uint16_t bpm_t;			// tempo (MIN_BPM to MAX_BPM)
 typedef uint16_t bitrate_t;		// bitrate in kbps
-typedef uint16_t fx_ch_t;			// FX-channel (0 to MAX_EFFECT_CHANNEL)
+typedef uint16_t mix_ch_t;			// Mixer-channel (0 to MAX_CHANNEL)
 
 typedef uint32_t jo_id_t;			// (unique) ID of a journalling object