From 7e43e0fe37a0dab4d571dafcf69034e1fd9b0e19 Mon Sep 17 00:00:00 2001 From: yashraj466 Date: Thu, 23 Dec 2021 03:00:44 +0530 Subject: [PATCH 01/33] Rename FxMixer to Mixer --- README.md | 2 +- doc/lmms.1 | 2 +- include/Engine.h | 8 +- include/Fader.h | 2 +- include/FxLine.h | 6 +- include/GuiApplication.h | 6 +- include/MainWindow.h | 2 +- include/{FxMixer.h => Mixer.h} | 18 ++--- include/{FxMixerView.h => MixerView.h} | 16 ++-- include/SampleTrack.h | 2 +- include/SendButtonIndicator.h | 8 +- src/core/AudioEngine.cpp | 10 +-- src/core/CMakeLists.txt | 2 +- src/core/Engine.cpp | 8 +- src/core/{FxMixer.cpp => Mixer.cpp} | 62 +++++++-------- src/core/Song.cpp | 20 ++--- src/core/audio/AudioPort.cpp | 4 +- src/gui/CMakeLists.txt | 2 +- src/gui/GuiApplication.cpp | 12 +-- src/gui/InstrumentTrackView.cpp | 16 ++-- src/gui/InstrumentTrackWindow.cpp | 2 +- src/gui/MainWindow.cpp | 28 +++---- src/gui/{FxMixerView.cpp => MixerView.cpp} | 90 +++++++++++----------- src/gui/SampleTrackView.cpp | 14 ++-- src/gui/widgets/FxLine.cpp | 38 ++++----- src/gui/widgets/FxLineLcdSpinBox.cpp | 12 +-- src/gui/widgets/SendButtonIndicator.cpp | 10 +-- src/tracks/InstrumentTrack.cpp | 6 +- src/tracks/SampleTrack.cpp | 4 +- 29 files changed, 206 insertions(+), 206 deletions(-) rename include/{FxMixer.h => Mixer.h} (94%) rename include/{FxMixerView.h => MixerView.h} (89%) rename src/core/{FxMixer.cpp => Mixer.cpp} (92%) rename src/gui/{FxMixerView.cpp => MixerView.cpp} (87%) diff --git a/README.md b/README.md index 124859a6038..32cf0b55295 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Features * Song-Editor for composing songs * A Beat+Bassline-Editor for creating beats and basslines * An easy-to-use Piano-Roll for editing patterns and melodies -* An FX mixer with unlimited FX channels and arbitrary number of effects +* An Mixer with unlimited FX channels and arbitrary number of effects * Many powerful instrument and effect-plugins out of the box * Full user-defined track-based automation and computer-controlled automation sources * Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support diff --git a/doc/lmms.1 b/doc/lmms.1 index a7e8be23258..13f777345b0 100644 --- a/doc/lmms.1 +++ b/doc/lmms.1 @@ -29,7 +29,7 @@ lmms \- software for easy music production .B LMMS is a free cross-platform alternative to commercial programs like FL Studio®, which allow you to produce music with your computer. This includes the creation of melodies and beats, the synthesis and mixing of sounds, and arranging of samples. You can have fun with your MIDI-keyboard and much more; all in a user-friendly and modern interface. -LMMS features components such as a Song Editor, a Beat+Bassline Editor, a Piano Roll, an FX Mixer as well as many powerful instruments and effects. +LMMS features components such as a Song Editor, a Beat+Bassline Editor, a Piano Roll, an Mixer as well as many powerful instruments and effects. .SH ACTIONS diff --git a/include/Engine.h b/include/Engine.h index 835abc342fc..8d68fd09b18 100644 --- a/include/Engine.h +++ b/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 @@ class LMMS_EXPORT LmmsCore : public QObject return s_audioEngine; } - static FxMixer * fxMixer() + static Mixer * Mixer() { - return s_fxMixer; + return s_Mixer; } static Song * getSong() @@ -141,7 +141,7 @@ class LMMS_EXPORT LmmsCore : public QObject // 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; diff --git a/include/Fader.h b/include/Fader.h index 10f8c92ef05..86d7f0b965b 100644 --- a/include/Fader.h +++ b/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 * diff --git a/include/FxLine.h b/include/FxLine.h index d909dd6fd83..f191d9183ee 100644 --- a/include/FxLine.h +++ b/include/FxLine.h @@ -38,7 +38,7 @@ -class FxMixerView; +class MixerView; class SendButtonIndicator; class FxLine : public QWidget @@ -50,7 +50,7 @@ class FxLine : public QWidget 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( QWidget * _parent, MixerView * _mv, int _channelIndex); ~FxLine(); void paintEvent( QPaintEvent * ) override; @@ -87,7 +87,7 @@ class FxLine : public QWidget void drawFxLine( QPainter* p, const FxLine *fxLine, 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; diff --git a/include/GuiApplication.h b/include/GuiApplication.h index 1536cc2ceef..1d03861f0f3 100644 --- a/include/GuiApplication.h +++ b/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 @@ class LMMS_EXPORT GuiApplication : public QObject #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 slots: static GuiApplication* s_instance; MainWindow* m_mainWindow; - FxMixerView* m_fxMixerView; + MixerView* m_MixerView; SongEditorWindow* m_songEditor; AutomationEditorWindow* m_automationEditor; BBEditor* m_bbEditor; diff --git a/include/MainWindow.h b/include/MainWindow.h index 688e4fc6053..a23c3516a80 100644 --- a/include/MainWindow.h +++ b/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(); diff --git a/include/FxMixer.h b/include/Mixer.h similarity index 94% rename from include/FxMixer.h rename to include/Mixer.h index e7af1d50e1c..27b0119f033 100644 --- a/include/FxMixer.h +++ b/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 * @@ -22,8 +22,8 @@ * */ -#ifndef FX_MIXER_H -#define FX_MIXER_H +#ifndef MIXER_H +#define MIXER_H #include "Model.h" #include "EffectChain.h" @@ -134,12 +134,12 @@ class FxRoute : public QObject }; -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 ); @@ -151,7 +151,7 @@ class LMMS_EXPORT FxMixer : public Model, public JournallingObject QString nodeName() const override { - return "fxmixer"; + return "mixer"; } FxChannel * effectChannel( int _ch ) @@ -178,11 +178,11 @@ class LMMS_EXPORT FxMixer : public Model, public JournallingObject // toChannel. NULL if there is no send. FloatModel * channelSendModel(fx_ch_t fromChannel, fx_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 diff --git a/include/FxMixerView.h b/include/MixerView.h similarity index 89% rename from include/FxMixerView.h rename to include/MixerView.h index a7662321ac7..c3e68f95a30 100644 --- a/include/FxMixerView.h +++ b/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 * @@ -22,8 +22,8 @@ * */ -#ifndef FX_MIXER_VIEW_H -#define FX_MIXER_VIEW_H +#ifndef MIXER_VIEW_H +#define MIXER_VIEW_H #include #include @@ -41,7 +41,7 @@ class QButtonGroup; class FxLine; -class LMMS_EXPORT FxMixerView : public QWidget, public ModelView, +class LMMS_EXPORT MixerView : public QWidget, public ModelView, public SerializingObjectHook { Q_OBJECT @@ -49,7 +49,7 @@ class LMMS_EXPORT FxMixerView : public QWidget, public ModelView, class FxChannelView { public: - FxChannelView(QWidget * _parent, FxMixerView * _mv, int _chIndex ); + FxChannelView(QWidget * _parent, MixerView * _mv, int _chIndex ); void setChannelIndex( int index ); @@ -61,8 +61,8 @@ class LMMS_EXPORT FxMixerView : public QWidget, public ModelView, }; - FxMixerView(); - virtual ~FxMixerView(); + MixerView(); + virtual ~MixerView(); void keyPressEvent(QKeyEvent * e) override; @@ -102,7 +102,7 @@ class LMMS_EXPORT FxMixerView : public QWidget, public ModelView, 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(); diff --git a/include/SampleTrack.h b/include/SampleTrack.h index c2d984434ed..3b67764f8ef 100644 --- a/include/SampleTrack.h +++ b/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" diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h index b60113758d7..89f6775dc06 100644 --- a/include/SendButtonIndicator.h +++ b/include/SendButtonIndicator.h @@ -6,16 +6,16 @@ #include #include "FxLine.h" -#include "FxMixerView.h" +#include "MixerView.h" class FxLine; -class FxMixerView; +class MixerView; class SendButtonIndicator : public QLabel { public: SendButtonIndicator( QWidget * _parent, FxLine * _owner, - FxMixerView * _mv); + MixerView * _mv); void mousePressEvent( QMouseEvent * e ) override; void updateLightStatus(); @@ -23,7 +23,7 @@ class SendButtonIndicator : public QLabel private: FxLine * m_parent; - FxMixerView * m_mv; + MixerView * m_mv; static QPixmap * s_qpmOn; static QPixmap * s_qpmOff; diff --git a/src/core/AudioEngine.cpp b/src/core/AudioEngine.cpp index 657a1896643..98adb09fc47 100644 --- a/src/core/AudioEngine.cpp +++ b/src/core/AudioEngine.cpp @@ -30,7 +30,7 @@ #include "AudioEngineWorkerThread.h" #include "AudioPort.h" -#include "FxMixer.h" +#include "Mixer.h" #include "Song.h" #include "EnvelopeAndLfoParameters.h" #include "NotePlayHandle.h" @@ -367,8 +367,8 @@ const surroundSampleFrame * AudioEngine::renderNextBuffer() swapBuffers(); // prepare master mix (clear internal buffers etc.) - FxMixer * fxMixer = Engine::fxMixer(); - fxMixer->prepareMasterMix(); + Mixer * mixer = Engine::Mixer(); + mixer->prepareMasterMix(); handleMetronome(); @@ -419,8 +419,8 @@ const surroundSampleFrame * AudioEngine::renderNextBuffer() AudioEngineWorkerThread::startAndWaitForJobs(); - // STAGE 3: do master mix in FX mixer - fxMixer->masterMix(m_outputBufferWrite); + // STAGE 3: do master mix in mixer + mixer->masterMix(m_outputBufferWrite); emit nextAudioBuffer(m_outputBufferRead); diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 103c4c0624a..c67f7220e21 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -24,7 +24,7 @@ set(LMMS_SRCS core/Engine.cpp core/EnvelopeAndLfoParameters.cpp core/fft_helpers.cpp - core/FxMixer.cpp + core/Mixer.cpp core/ImportFilter.cpp core/InlineAutomation.cpp core/Instrument.cpp diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp index 6dbde861369..b1c6e5d7d6b 100644 --- a/src/core/Engine.cpp +++ b/src/core/Engine.cpp @@ -27,7 +27,7 @@ #include "AudioEngine.h" #include "BBTrackContainer.h" #include "ConfigManager.h" -#include "FxMixer.h" +#include "Mixer.h" #include "Ladspa2LMMS.h" #include "Lv2Manager.h" #include "Plugin.h" @@ -39,7 +39,7 @@ float LmmsCore::s_framesPerTick; AudioEngine* LmmsCore::s_audioEngine = nullptr; -FxMixer * LmmsCore::s_fxMixer = nullptr; +Mixer * LmmsCore::s_Mixer = nullptr; BBTrackContainer * LmmsCore::s_bbTrackContainer = nullptr; Song * LmmsCore::s_song = nullptr; ProjectJournal * LmmsCore::s_projectJournal = nullptr; @@ -66,7 +66,7 @@ void LmmsCore::init( bool renderOnly ) s_projectJournal = new ProjectJournal; s_audioEngine = new AudioEngine( renderOnly ); s_song = new Song; - s_fxMixer = new FxMixer; + s_Mixer = new Mixer; s_bbTrackContainer = new BBTrackContainer; #ifdef LMMS_HAVE_LV2 @@ -100,7 +100,7 @@ void LmmsCore::destroy() deleteHelper( &s_bbTrackContainer ); - deleteHelper( &s_fxMixer ); + deleteHelper( &s_Mixer ); deleteHelper( &s_audioEngine ); #ifdef LMMS_HAVE_LV2 diff --git a/src/core/FxMixer.cpp b/src/core/Mixer.cpp similarity index 92% rename from src/core/FxMixer.cpp rename to src/core/Mixer.cpp index 2d2b8cc89f3..d45a897096b 100644 --- a/src/core/FxMixer.cpp +++ b/src/core/Mixer.cpp @@ -1,5 +1,5 @@ /* - * FxMixer.cpp - effect mixer for LMMS + * Mixer.cpp - effect mixer for LMMS * * Copyright (c) 2008-2011 Tobias Doerffel * @@ -27,7 +27,7 @@ #include "AudioEngine.h" #include "AudioEngineWorkerThread.h" #include "BufferManager.h" -#include "FxMixer.h" +#include "Mixer.h" #include "MixHelpers.h" #include "Song.h" @@ -188,7 +188,7 @@ void FxChannel::doProcessing() -FxMixer::FxMixer() : +Mixer::Mixer() : Model( nullptr ), JournallingObject(), m_fxChannels() @@ -200,7 +200,7 @@ FxMixer::FxMixer() : -FxMixer::~FxMixer() +Mixer::~Mixer() { while( ! m_fxRoutes.isEmpty() ) { @@ -216,7 +216,7 @@ FxMixer::~FxMixer() -int FxMixer::createChannel() +int Mixer::createChannel() { const int index = m_fxChannels.size(); // create new channel @@ -228,7 +228,7 @@ int FxMixer::createChannel() return index; } -void FxMixer::activateSolo() +void Mixer::activateSolo() { for (int i = 1; i < m_fxChannels.size(); ++i) { @@ -237,7 +237,7 @@ void FxMixer::activateSolo() } } -void FxMixer::deactivateSolo() +void Mixer::deactivateSolo() { for (int i = 1; i < m_fxChannels.size(); ++i) { @@ -245,7 +245,7 @@ void FxMixer::deactivateSolo() } } -void FxMixer::toggledSolo() +void Mixer::toggledSolo() { int soloedChan = -1; bool resetSolo = m_lastSoloed != -1; @@ -280,7 +280,7 @@ void FxMixer::toggledSolo() -void FxMixer::deleteChannel( int index ) +void Mixer::deleteChannel( int index ) { // channel deletion is performed between mixer rounds Engine::audioEngine()->requestChangeInModel(); @@ -370,7 +370,7 @@ void FxMixer::deleteChannel( int index ) -void FxMixer::moveChannelLeft( int index ) +void Mixer::moveChannelLeft( int index ) { // can't move master or first channel if( index <= 1 || index >= m_fxChannels.size() ) @@ -433,14 +433,14 @@ void FxMixer::moveChannelLeft( int index ) -void FxMixer::moveChannelRight( int index ) +void Mixer::moveChannelRight( int index ) { moveChannelLeft( index + 1 ); } -FxRoute * FxMixer::createChannelSend( fx_ch_t fromChannel, fx_ch_t toChannel, +FxRoute * Mixer::createChannelSend( fx_ch_t fromChannel, fx_ch_t toChannel, float amount ) { // qDebug( "requested: %d to %d", fromChannel, toChannel ); @@ -463,7 +463,7 @@ FxRoute * FxMixer::createChannelSend( fx_ch_t fromChannel, fx_ch_t toChannel, } -FxRoute * FxMixer::createRoute( FxChannel * from, FxChannel * to, float amount ) +FxRoute * Mixer::createRoute( FxChannel * from, FxChannel * to, float amount ) { if( from == to ) { @@ -478,8 +478,8 @@ FxRoute * FxMixer::createRoute( FxChannel * from, FxChannel * to, float amount ) // add us to to's receives to->m_receives.append( route ); - // add us to fxmixer's list - Engine::fxMixer()->m_fxRoutes.append( route ); + // add us to mixer's list + Engine::Mixer()->m_fxRoutes.append( route ); Engine::audioEngine()->doneChangeInModel(); return route; @@ -487,7 +487,7 @@ FxRoute * FxMixer::createRoute( FxChannel * from, FxChannel * to, float amount ) // delete the connection made by createChannelSend -void FxMixer::deleteChannelSend( fx_ch_t fromChannel, fx_ch_t toChannel ) +void Mixer::deleteChannelSend( fx_ch_t fromChannel, fx_ch_t toChannel ) { // delete the send FxChannel * from = m_fxChannels[fromChannel]; @@ -505,21 +505,21 @@ void FxMixer::deleteChannelSend( fx_ch_t fromChannel, fx_ch_t toChannel ) } -void FxMixer::deleteChannelSend( FxRoute * route ) +void Mixer::deleteChannelSend( FxRoute * route ) { Engine::audioEngine()->requestChangeInModel(); // remove us from from's sends route->sender()->m_sends.remove( route->sender()->m_sends.indexOf( route ) ); // remove us from to's receives route->receiver()->m_receives.remove( route->receiver()->m_receives.indexOf( route ) ); - // remove us from fxmixer's list - Engine::fxMixer()->m_fxRoutes.remove( Engine::fxMixer()->m_fxRoutes.indexOf( route ) ); + // remove us from mixer's list + Engine::Mixer()->m_fxRoutes.remove( Engine::Mixer()->m_fxRoutes.indexOf( route ) ); delete route; Engine::audioEngine()->doneChangeInModel(); } -bool FxMixer::isInfiniteLoop( fx_ch_t sendFrom, fx_ch_t sendTo ) +bool Mixer::isInfiniteLoop( fx_ch_t sendFrom, fx_ch_t sendTo ) { if( sendFrom == sendTo ) return true; FxChannel * from = m_fxChannels[sendFrom]; @@ -529,7 +529,7 @@ bool FxMixer::isInfiniteLoop( fx_ch_t sendFrom, fx_ch_t sendTo ) } -bool FxMixer::checkInfiniteLoop( FxChannel * from, FxChannel * to ) +bool Mixer::checkInfiniteLoop( FxChannel * from, FxChannel * to ) { // can't send master to anything if( from == m_fxChannels[0] ) @@ -558,7 +558,7 @@ bool FxMixer::checkInfiniteLoop( FxChannel * from, FxChannel * to ) // how much does fromChannel send its output to the input of toChannel? -FloatModel * FxMixer::channelSendModel( fx_ch_t fromChannel, fx_ch_t toChannel ) +FloatModel * Mixer::channelSendModel( fx_ch_t fromChannel, fx_ch_t toChannel ) { if( fromChannel == toChannel ) { @@ -580,7 +580,7 @@ FloatModel * FxMixer::channelSendModel( fx_ch_t fromChannel, fx_ch_t toChannel ) -void FxMixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch ) +void Mixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch ) { if( m_fxChannels[_ch]->m_muteModel.value() == false ) { @@ -594,7 +594,7 @@ void FxMixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch ) -void FxMixer::prepareMasterMix() +void Mixer::prepareMasterMix() { BufferManager::clear( m_fxChannels[0]->m_buffer, Engine::audioEngine()->framesPerPeriod() ); @@ -602,7 +602,7 @@ void FxMixer::prepareMasterMix() -void FxMixer::masterMix( sampleFrame * _buf ) +void Mixer::masterMix( sampleFrame * _buf ) { const int fpp = Engine::audioEngine()->framesPerPeriod(); @@ -682,7 +682,7 @@ void FxMixer::masterMix( sampleFrame * _buf ) -void FxMixer::clear() +void Mixer::clear() { while( m_fxChannels.size() > 1 ) { @@ -694,7 +694,7 @@ void FxMixer::clear() -void FxMixer::clearChannel(fx_ch_t index) +void Mixer::clearChannel(fx_ch_t index) { FxChannel * ch = m_fxChannels[index]; ch->m_fxChain.clear(); @@ -726,7 +726,7 @@ void FxMixer::clearChannel(fx_ch_t index) } } -void FxMixer::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void Mixer::saveSettings( QDomDocument & _doc, QDomElement & _this ) { // save channels for( int i = 0; i < m_fxChannels.size(); ++i ) @@ -757,7 +757,7 @@ void FxMixer::saveSettings( QDomDocument & _doc, QDomElement & _this ) } // make sure we have at least num channels -void FxMixer::allocateChannelsTo(int num) +void Mixer::allocateChannelsTo(int num) { while( num > m_fxChannels.size() - 1 ) { @@ -769,7 +769,7 @@ void FxMixer::allocateChannelsTo(int num) } -void FxMixer::loadSettings( const QDomElement & _this ) +void Mixer::loadSettings( const QDomElement & _this ) { clear(); QDomNode node = _this.firstChild(); @@ -820,7 +820,7 @@ void FxMixer::loadSettings( const QDomElement & _this ) } -void FxMixer::validateChannelName( int index, int oldIndex ) +void Mixer::validateChannelName( int index, int oldIndex ) { if( m_fxChannels[index]->m_name == tr( "FX %1" ).arg( oldIndex ) ) { diff --git a/src/core/Song.cpp b/src/core/Song.cpp index 09c00d933e1..33187dd2d0d 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -44,8 +44,8 @@ #include "ControllerConnection.h" #include "embed.h" #include "EnvelopeAndLfoParameters.h" -#include "FxMixer.h" -#include "FxMixerView.h" +#include "Mixer.h" +#include "MixerView.h" #include "GuiApplication.h" #include "ExportFilter.h" #include "InstrumentTrack.h" @@ -874,15 +874,15 @@ void Song::clearProject() { getGUI()->songEditor()->m_editor->clearAllTracks(); } - if( getGUI() != nullptr && getGUI()->fxMixerView() ) + if( getGUI() != nullptr && getGUI()->MixerView() ) { - getGUI()->fxMixerView()->clear(); + getGUI()->MixerView()->clear(); } QCoreApplication::sendPostedEvents(); Engine::getBBTrackContainer()->clearAllTracks(); clearAllTracks(); - Engine::fxMixer()->clear(); + Engine::Mixer()->clear(); if( getGUI() != nullptr && getGUI()->automationEditor() ) { @@ -1089,14 +1089,14 @@ void Song::loadProject( const QString & fileName ) PeakController::initGetControllerBySetting(); // Load mixer first to be able to set the correct range for FX channels - node = dataFile.content().firstChildElement( Engine::fxMixer()->nodeName() ); + node = dataFile.content().firstChildElement( Engine::Mixer()->nodeName() ); if( !node.isNull() ) { - Engine::fxMixer()->restoreState( node.toElement() ); + Engine::Mixer()->restoreState( node.toElement() ); if( getGUI() != nullptr ) { - // refresh FxMixerView - getGUI()->fxMixerView()->refreshDisplay(); + // refresh MixerView + getGUI()->MixerView()->refreshDisplay(); } } @@ -1238,7 +1238,7 @@ bool Song::saveProjectFile(const QString & filename, bool withResources) saveState( dataFile, dataFile.content() ); m_globalAutomationTrack->saveState( dataFile, dataFile.content() ); - Engine::fxMixer()->saveState( dataFile, dataFile.content() ); + Engine::Mixer()->saveState( dataFile, dataFile.content() ); if( getGUI() != nullptr ) { getGUI()->getControllerRackView()->saveState( dataFile, dataFile.content() ); diff --git a/src/core/audio/AudioPort.cpp b/src/core/audio/AudioPort.cpp index e3c4569f018..27ce637de31 100644 --- a/src/core/audio/AudioPort.cpp +++ b/src/core/audio/AudioPort.cpp @@ -26,7 +26,7 @@ #include "AudioDevice.h" #include "AudioEngine.h" #include "EffectChain.h" -#include "FxMixer.h" +#include "Mixer.h" #include "Engine.h" #include "MixHelpers.h" #include "BufferManager.h" @@ -222,7 +222,7 @@ void AudioPort::doProcessing() const bool me = processEffects(); if( me || m_bufferUsage ) { - Engine::fxMixer()->mixToChannel( m_portBuffer, m_nextFxChannel ); // send output to fx mixer + Engine::Mixer()->mixToChannel( m_portBuffer, m_nextFxChannel ); // send output to mixer // TODO: improve the flow here - convert to pull model m_bufferUsage = false; } diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 695575b2e9a..93c628f269d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -16,7 +16,7 @@ SET(LMMS_SRCS gui/embed.cpp gui/ExportProjectDialog.cpp gui/FileBrowser.cpp - gui/FxMixerView.cpp + gui/MixerView.cpp gui/GuiApplication.cpp gui/InstrumentView.cpp gui/InstrumentTrackView.cpp diff --git a/src/gui/GuiApplication.cpp b/src/gui/GuiApplication.cpp index 4624cf2ffff..8f679ab0466 100644 --- a/src/gui/GuiApplication.cpp +++ b/src/gui/GuiApplication.cpp @@ -33,7 +33,7 @@ #include "BBEditor.h" #include "ConfigManager.h" #include "ControllerRackView.h" -#include "FxMixerView.h" +#include "MixerView.h" #include "InstrumentTrack.h" #include "MainWindow.h" #include "MicrotunerConfig.h" @@ -138,8 +138,8 @@ GuiApplication::GuiApplication() connect(m_songEditor, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*))); displayInitProgress(tr("Preparing mixer")); - m_fxMixerView = new FxMixerView; - connect(m_fxMixerView, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*))); + m_MixerView = new MixerView; + connect(m_MixerView, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*))); displayInitProgress(tr("Preparing controller rack")); m_controllerRackView = new ControllerRackView; @@ -189,15 +189,15 @@ void GuiApplication::displayInitProgress(const QString &msg) void GuiApplication::childDestroyed(QObject *obj) { - // when any object that can be reached via getGUI()->mainWindow(), getGUI()->fxMixerView(), etc + // when any object that can be reached via getGUI()->mainWindow(), getGUI()->MixerView(), etc // is destroyed, ensure that their accessor functions will return null instead of a garbage pointer. if (obj == m_mainWindow) { m_mainWindow = nullptr; } - else if (obj == m_fxMixerView) + else if (obj == m_MixerView) { - m_fxMixerView = nullptr; + m_MixerView = nullptr; } else if (obj == m_songEditor) { diff --git a/src/gui/InstrumentTrackView.cpp b/src/gui/InstrumentTrackView.cpp index 17454a64041..8cef1fafe2b 100644 --- a/src/gui/InstrumentTrackView.cpp +++ b/src/gui/InstrumentTrackView.cpp @@ -37,8 +37,8 @@ #include "Engine.h" #include "FadeButton.h" #include "FxLineLcdSpinBox.h" -#include "FxMixer.h" -#include "FxMixerView.h" +#include "Mixer.h" +#include "MixerView.h" #include "GuiApplication.h" #include "InstrumentTrack.h" #include "InstrumentTrackWindow.h" @@ -222,8 +222,8 @@ InstrumentTrackWindow * InstrumentTrackView::topLevelInstrumentTrackWindow() /*! \brief Create and assign a new FX Channel for this track */ void InstrumentTrackView::createFxLine() { - int channelIndex = getGUI()->fxMixerView()->addNewChannel(); - auto channel = Engine::fxMixer()->effectChannel(channelIndex); + int channelIndex = getGUI()->MixerView()->addNewChannel(); + auto channel = Engine::Mixer()->effectChannel(channelIndex); channel->m_name = getTrack()->name(); if (getTrack()->useColor()) { channel->setColor (getTrack()->color()); } @@ -239,7 +239,7 @@ void InstrumentTrackView::assignFxLine(int channelIndex) { model()->effectChannelModel()->setValue( channelIndex ); - getGUI()->fxMixerView()->setCurrentFxLine( channelIndex ); + getGUI()->MixerView()->setCurrentFxLine( channelIndex ); } @@ -354,7 +354,7 @@ QMenu * InstrumentTrackView::createFxMenu(QString title, QString newFxLabel) { int channelIndex = model()->effectChannelModel()->value(); - FxChannel *fxChannel = Engine::fxMixer()->effectChannel( channelIndex ); + FxChannel *fxChannel = Engine::Mixer()->effectChannel( channelIndex ); // If title allows interpolation, pass channel index and name if ( title.contains( "%2" ) ) @@ -367,9 +367,9 @@ QMenu * InstrumentTrackView::createFxMenu(QString title, QString newFxLabel) fxMenu->addAction( newFxLabel, this, SLOT( createFxLine() ) ); fxMenu->addSeparator(); - for (int i = 0; i < Engine::fxMixer()->numChannels(); ++i) + for (int i = 0; i < Engine::Mixer()->numChannels(); ++i) { - FxChannel * currentChannel = Engine::fxMixer()->effectChannel( i ); + FxChannel * currentChannel = Engine::Mixer()->effectChannel( i ); if ( currentChannel != fxChannel ) { diff --git a/src/gui/InstrumentTrackWindow.cpp b/src/gui/InstrumentTrackWindow.cpp index cda4e44f813..378ce8cb1a9 100644 --- a/src/gui/InstrumentTrackWindow.cpp +++ b/src/gui/InstrumentTrackWindow.cpp @@ -41,7 +41,7 @@ #include "FileBrowser.h" #include "FileDialog.h" #include "FxLineLcdSpinBox.h" -#include "FxMixer.h" +#include "Mixer.h" #include "GuiApplication.h" #include "gui_templates.h" #include "Instrument.h" diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 9f9f05296f5..e3b5b3a78f4 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -48,7 +48,7 @@ #include "ExportProjectDialog.h" #include "FileBrowser.h" #include "FileDialog.h" -#include "FxMixerView.h" +#include "MixerView.h" #include "GuiApplication.h" #include "ImportFilter.h" #include "InstrumentTrackView.h" @@ -526,12 +526,12 @@ void MainWindow::finalize() m_toolBar ); automation_editor_window->setShortcut( Qt::CTRL + Qt::Key_4 ); - ToolButton * fx_mixer_window = new ToolButton( - embed::getIconPixmap( "fx_mixer" ), - tr( "FX Mixer" ) + " (Ctrl+5)", - this, SLOT( toggleFxMixerWin() ), + ToolButton * mixer_window = new ToolButton( + embed::getIconPixmap( "mixer" ), + tr( "Mixer" ) + " (Ctrl+5)", + this, SLOT( toggleMixerWin() ), m_toolBar ); - fx_mixer_window->setShortcut( Qt::CTRL + Qt::Key_5 ); + mixer_window->setShortcut( Qt::CTRL + Qt::Key_5 ); ToolButton * controllers_window = new ToolButton( embed::getIconPixmap( "controller" ), @@ -561,7 +561,7 @@ void MainWindow::finalize() m_toolBarLayout->addWidget( bb_editor_window, 1, 2 ); m_toolBarLayout->addWidget( piano_roll_window, 1, 3 ); m_toolBarLayout->addWidget( automation_editor_window, 1, 4 ); - m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 ); + m_toolBarLayout->addWidget( mixer_window, 1, 5 ); m_toolBarLayout->addWidget( controllers_window, 1, 6 ); m_toolBarLayout->addWidget( project_notes_window, 1, 7 ); m_toolBarLayout->addWidget( microtuner_window, 1, 8 ); @@ -745,7 +745,7 @@ void MainWindow::clearKeyModifiers() void MainWindow::saveWidgetState( QWidget * _w, QDomElement & _de ) { - // If our widget is the main content of a window (e.g. piano roll, FxMixer, etc), + // If our widget is the main content of a window (e.g. piano roll, Mixer, etc), // we really care about the position of the *window* - not the position of the widget within its window if( _w->parentWidget() != nullptr && _w->parentWidget()->inherits( "QMdiSubWindow" ) ) @@ -782,7 +782,7 @@ void MainWindow::restoreWidgetState( QWidget * _w, const QDomElement & _de ) qMax( _w->minimumHeight(), _de.attribute( "height" ).toInt() ) ); if( _de.hasAttribute( "visible" ) && !r.isNull() ) { - // If our widget is the main content of a window (e.g. piano roll, FxMixer, etc), + // If our widget is the main content of a window (e.g. piano roll, Mixer, etc), // we really care about the position of the *window* - not the position of the widget within its window if ( _w->parentWidget() != nullptr && _w->parentWidget()->inherits( "QMdiSubWindow" ) ) @@ -1118,9 +1118,9 @@ void MainWindow::toggleAutomationEditorWin() -void MainWindow::toggleFxMixerWin() +void MainWindow::toggleMixerWin() { - toggleWindow( getGUI()->fxMixerView() ); + toggleWindow( getGUI()->MixerView() ); } @@ -1154,9 +1154,9 @@ void MainWindow::updateViewMenu() this, SLOT( toggleAutomationEditorWin()) ); - m_viewMenu->addAction(embed::getIconPixmap( "fx_mixer" ), - tr( "FX Mixer" ) + "\tCtrl+5", - this, SLOT( toggleFxMixerWin() ) + m_viewMenu->addAction(embed::getIconPixmap( "mixer" ), + tr( "Mixer" ) + "\tCtrl+5", + this, SLOT( toggleMixerWin() ) ); m_viewMenu->addAction(embed::getIconPixmap( "controller" ), tr( "Controller Rack" ) + "\tCtrl+6", diff --git a/src/gui/FxMixerView.cpp b/src/gui/MixerView.cpp similarity index 87% rename from src/gui/FxMixerView.cpp rename to src/gui/MixerView.cpp index 9b235e654d6..fc898985090 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/MixerView.cpp @@ -1,5 +1,5 @@ /* - * FxMixerView.cpp - effect-mixer-view for LMMS + * MixerView.cpp - effect-mixer-view for LMMS * * Copyright (c) 2008-2014 Tobias Doerffel * @@ -38,10 +38,10 @@ #include "lmms_math.h" -#include "FxMixerView.h" +#include "MixerView.h" #include "Knob.h" #include "FxLine.h" -#include "FxMixer.h" +#include "Mixer.h" #include "GuiApplication.h" #include "MainWindow.h" #include "AudioEngine.h" @@ -52,12 +52,12 @@ #include "BBTrackContainer.h" #include "TrackContainer.h" // For TrackContainer::TrackList typedef -FxMixerView::FxMixerView() : +MixerView::MixerView() : QWidget(), ModelView( nullptr, this ), SerializingObjectHook() { - FxMixer * m = Engine::fxMixer(); + Mixer * m = Engine::Mixer(); m->setHook( this ); //QPalette pal = palette(); @@ -67,8 +67,8 @@ FxMixerView::FxMixerView() : setAutoFillBackground( true ); setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); - setWindowTitle( tr( "FX-Mixer" ) ); - setWindowIcon( embed::getIconPixmap( "fx_mixer" ) ); + setWindowTitle( tr( "Mixer" ) ); + setWindowIcon( embed::getIconPixmap( "mixer" ) ); // main-layout QHBoxLayout * ml = new QHBoxLayout; @@ -113,7 +113,7 @@ FxMixerView::FxMixerView() : class ChannelArea : public QScrollArea { public: - ChannelArea( QWidget * parent, FxMixerView * mv ) : + ChannelArea( QWidget * parent, MixerView * mv ) : QScrollArea( parent ), m_mv( mv ) {} ~ChannelArea() {} void keyPressEvent( QKeyEvent * e ) override @@ -121,7 +121,7 @@ FxMixerView::FxMixerView() : m_mv->keyPressEvent( e ); } private: - FxMixerView * m_mv; + MixerView * m_mv; }; channelArea = new ChannelArea( this, this ); channelArea->setWidget( m_channelAreaWidget ); @@ -168,7 +168,7 @@ FxMixerView::FxMixerView() : setModel( m ); } -FxMixerView::~FxMixerView() +MixerView::~MixerView() { for (int i=0; icreateChannel(); m_fxChannelViews.push_back(new FxChannelView(m_channelAreaWidget, this, @@ -197,7 +197,7 @@ int FxMixerView::addNewChannel() } -void FxMixerView::refreshDisplay() +void MixerView::refreshDisplay() { // delete all views and re-add them for( int i = 1; iadjustSize(); // re-add the views - m_fxChannelViews.resize(Engine::fxMixer()->numChannels()); + m_fxChannelViews.resize(Engine::Mixer()->numChannels()); for( int i = 1; i < m_fxChannelViews.size(); ++i ) { m_fxChannelViews[i] = new FxChannelView(m_channelAreaWidget, this, i); @@ -236,7 +236,7 @@ void FxMixerView::refreshDisplay() // update the and max. channel number for every instrument -void FxMixerView::updateMaxChannelSelector() +void MixerView::updateMaxChannelSelector() { TrackContainer::TrackList songTrackList = Engine::getSong()->tracks(); TrackContainer::TrackList bbTrackList = Engine::getBBTrackContainer()->tracks(); @@ -264,7 +264,7 @@ void FxMixerView::updateMaxChannelSelector() } -void FxMixerView::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void MixerView::saveSettings( QDomDocument & _doc, QDomElement & _this ) { MainWindow::saveWidgetState( this, _this ); } @@ -272,18 +272,18 @@ void FxMixerView::saveSettings( QDomDocument & _doc, QDomElement & _this ) -void FxMixerView::loadSettings( const QDomElement & _this ) +void MixerView::loadSettings( const QDomElement & _this ) { MainWindow::restoreWidgetState( this, _this ); } -FxMixerView::FxChannelView::FxChannelView(QWidget * _parent, FxMixerView * _mv, +MixerView::FxChannelView::FxChannelView(QWidget * _parent, MixerView * _mv, int channelIndex ) { m_fxLine = new FxLine(_parent, _mv, channelIndex); - FxChannel *fxChannel = Engine::fxMixer()->effectChannel(channelIndex); + FxChannel *fxChannel = Engine::Mixer()->effectChannel(channelIndex); m_fader = new Fader( &fxChannel->m_volumeModel, tr( "FX Fader %1" ).arg( channelIndex ), m_fxLine ); @@ -323,9 +323,9 @@ FxMixerView::FxChannelView::FxChannelView(QWidget * _parent, FxMixerView * _mv, } -void FxMixerView::FxChannelView::setChannelIndex( int index ) +void MixerView::FxChannelView::setChannelIndex( int index ) { - FxChannel* fxChannel = Engine::fxMixer()->effectChannel( index ); + FxChannel* fxChannel = Engine::Mixer()->effectChannel( index ); m_fader->setModel( &fxChannel->m_volumeModel ); m_muteBtn->setModel( &fxChannel->m_muteModel ); @@ -334,14 +334,14 @@ void FxMixerView::FxChannelView::setChannelIndex( int index ) } -void FxMixerView::toggledSolo() +void MixerView::toggledSolo() { - Engine::fxMixer()->toggledSolo(); + Engine::Mixer()->toggledSolo(); } -void FxMixerView::setCurrentFxLine( FxLine * _line ) +void MixerView::setCurrentFxLine( FxLine * _line ) { // select m_currentFxLine = _line; @@ -355,14 +355,14 @@ void FxMixerView::setCurrentFxLine( FxLine * _line ) } -void FxMixerView::updateFxLine(int index) +void MixerView::updateFxLine(int index) { - FxMixer * mix = Engine::fxMixer(); + Mixer * mix = Engine::Mixer(); // does current channel send to this channel? int selIndex = m_currentFxLine->channelIndex(); FxLine * thisLine = m_fxChannelViews[index]->m_fxLine; - thisLine->setToolTip( Engine::fxMixer()->effectChannel( index )->m_name ); + thisLine->setToolTip( Engine::Mixer()->effectChannel( index )->m_name ); FloatModel * sendModel = mix->channelSendModel(selIndex, index); if( sendModel == nullptr ) @@ -384,7 +384,7 @@ void FxMixerView::updateFxLine(int index) } -void FxMixerView::deleteChannel(int index) +void MixerView::deleteChannel(int index) { // can't delete master if( index == 0 ) return; @@ -394,10 +394,10 @@ void FxMixerView::deleteChannel(int index) // in case the deleted channel is soloed or the remaining // channels will be left in a muted state - Engine::fxMixer()->clearChannel(index); + Engine::Mixer()->clearChannel(index); // delete the real channel - Engine::fxMixer()->deleteChannel(index); + Engine::Mixer()->deleteChannel(index); // delete the view chLayout->removeWidget(m_fxChannelViews[index]->m_fxLine); @@ -431,7 +431,7 @@ void FxMixerView::deleteChannel(int index) -void FxMixerView::deleteUnusedChannels() +void MixerView::deleteUnusedChannels() { TrackContainer::TrackList tracks; tracks += Engine::getSong()->tracks(); @@ -461,19 +461,19 @@ void FxMixerView::deleteUnusedChannels() //Check all channels except master, delete those with no incoming sends for(int i = m_fxChannelViews.size()-1; i > 0; --i) { - if (!inUse[i] && Engine::fxMixer()->effectChannel(i)->m_receives.isEmpty()) + if (!inUse[i] && Engine::Mixer()->effectChannel(i)->m_receives.isEmpty()) { deleteChannel(i); } } } -void FxMixerView::moveChannelLeft(int index, int focusIndex) +void MixerView::moveChannelLeft(int index, int focusIndex) { // can't move master or first channel left or last channel right if( index <= 1 || index >= m_fxChannelViews.size() ) return; - FxMixer *m = Engine::fxMixer(); + Mixer *m = Engine::Mixer(); // Move instruments channels m->moveChannelLeft( index ); @@ -488,27 +488,27 @@ void FxMixerView::moveChannelLeft(int index, int focusIndex) -void FxMixerView::moveChannelLeft(int index) +void MixerView::moveChannelLeft(int index) { moveChannelLeft( index, index - 1 ); } -void FxMixerView::moveChannelRight(int index) +void MixerView::moveChannelRight(int index) { moveChannelLeft( index + 1, index + 1 ); } -void FxMixerView::renameChannel(int index) +void MixerView::renameChannel(int index) { m_fxChannelViews[index]->m_fxLine->renameChannel(); } -void FxMixerView::keyPressEvent(QKeyEvent * e) +void MixerView::keyPressEvent(QKeyEvent * e) { switch(e->key()) { @@ -553,7 +553,7 @@ void FxMixerView::keyPressEvent(QKeyEvent * e) -void FxMixerView::closeEvent( QCloseEvent * _ce ) +void MixerView::closeEvent( QCloseEvent * _ce ) { if( parentWidget() ) { @@ -568,7 +568,7 @@ void FxMixerView::closeEvent( QCloseEvent * _ce ) -void FxMixerView::setCurrentFxLine( int _line ) +void MixerView::setCurrentFxLine( int _line ) { if( _line >= 0 && _line < m_fxChannelViews.size() ) { @@ -578,9 +578,9 @@ void FxMixerView::setCurrentFxLine( int _line ) -void FxMixerView::clear() +void MixerView::clear() { - Engine::fxMixer()->clear(); + Engine::Mixer()->clear(); refreshDisplay(); } @@ -588,9 +588,9 @@ void FxMixerView::clear() -void FxMixerView::updateFaders() +void MixerView::updateFaders() { - FxMixer * m = Engine::fxMixer(); + Mixer * m = Engine::Mixer(); // apply master gain m->effectChannel(0)->m_peakLeft *= Engine::audioEngine()->masterGain(); diff --git a/src/gui/SampleTrackView.cpp b/src/gui/SampleTrackView.cpp index 1f53c55e598..efe88f8a9ff 100644 --- a/src/gui/SampleTrackView.cpp +++ b/src/gui/SampleTrackView.cpp @@ -28,7 +28,7 @@ #include "embed.h" #include "Engine.h" -#include "FxMixerView.h" +#include "MixerView.h" #include "gui_templates.h" #include "GuiApplication.h" #include "Knob.h" @@ -119,7 +119,7 @@ QMenu * SampleTrackView::createFxMenu(QString title, QString newFxLabel) { int channelIndex = model()->effectChannelModel()->value(); - FxChannel *fxChannel = Engine::fxMixer()->effectChannel(channelIndex); + FxChannel *fxChannel = Engine::Mixer()->effectChannel(channelIndex); // If title allows interpolation, pass channel index and name if (title.contains("%2")) @@ -132,9 +132,9 @@ QMenu * SampleTrackView::createFxMenu(QString title, QString newFxLabel) fxMenu->addAction(newFxLabel, this, SLOT(createFxLine())); fxMenu->addSeparator(); - for (int i = 0; i < Engine::fxMixer()->numChannels(); ++i) + for (int i = 0; i < Engine::Mixer()->numChannels(); ++i) { - FxChannel * currentChannel = Engine::fxMixer()->effectChannel(i); + FxChannel * currentChannel = Engine::Mixer()->effectChannel(i); if (currentChannel != fxChannel) { @@ -210,8 +210,8 @@ void SampleTrackView::dropEvent(QDropEvent *de) /*! \brief Create and assign a new FX Channel for this track */ void SampleTrackView::createFxLine() { - int channelIndex = getGUI()->fxMixerView()->addNewChannel(); - auto channel = Engine::fxMixer()->effectChannel(channelIndex); + int channelIndex = getGUI()->MixerView()->addNewChannel(); + auto channel = Engine::Mixer()->effectChannel(channelIndex); channel->m_name = getTrack()->name(); if (getTrack()->useColor()) { channel->setColor (getTrack()->color()); } @@ -227,5 +227,5 @@ void SampleTrackView::assignFxLine(int channelIndex) { model()->effectChannelModel()->setValue(channelIndex); - getGUI()->fxMixerView()->setCurrentFxLine(channelIndex); + getGUI()->MixerView()->setCurrentFxLine(channelIndex); } \ No newline at end of file diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp index 4ea927279c2..40295e71213 100644 --- a/src/gui/widgets/FxLine.cpp +++ b/src/gui/widgets/FxLine.cpp @@ -30,7 +30,7 @@ #include #include "CaptionMenu.h" -#include "FxMixer.h" +#include "Mixer.h" #include "gui_templates.h" #include "GuiApplication.h" #include "Song.h" @@ -58,7 +58,7 @@ const int FxLine::FxLineHeight = 287; QPixmap * FxLine::s_sendBgArrow = nullptr; QPixmap * FxLine::s_receiveBgArrow = nullptr; -FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex ) : +FxLine::FxLine( QWidget * _parent, MixerView * _mv, int _channelIndex ) : QWidget( _parent ), m_mv( _mv ), m_channelIndex( _channelIndex ), @@ -97,7 +97,7 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex ) : m_lcd->move( 4, 58 ); m_lcd->setMarginWidth( 1 ); - QString name = Engine::fxMixer()->effectChannel( m_channelIndex )->m_name; + QString name = Engine::Mixer()->effectChannel( m_channelIndex )->m_name; setToolTip( name ); m_renameLineEdit = new QLineEdit(); @@ -122,7 +122,7 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex ) : proxyWidget->setPos( 8, 145 ); connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) ); - connect( &Engine::fxMixer()->effectChannel( m_channelIndex )->m_muteModel, SIGNAL( dataChanged() ), this, SLOT( update() ) ); + connect( &Engine::Mixer()->effectChannel( m_channelIndex )->m_muteModel, SIGNAL( dataChanged() ), this, SLOT( update() ) ); } @@ -150,7 +150,7 @@ void FxLine::setChannelIndex( int index ) void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool sendToThis, bool receiveFromThis ) { - auto channel = Engine::fxMixer()->effectChannel( m_channelIndex ); + auto channel = Engine::Mixer()->effectChannel( m_channelIndex ); bool muted = channel->m_muteModel.value(); QString name = channel->m_name; QString elidedName = elideName( name ); @@ -207,8 +207,8 @@ QString FxLine::elideName( const QString & name ) void FxLine::paintEvent( QPaintEvent * ) { - bool sendToThis = Engine::fxMixer()->channelSendModel( m_mv->currentFxLine()->m_channelIndex, m_channelIndex ) != nullptr; - bool receiveFromThis = Engine::fxMixer()->channelSendModel( m_channelIndex, m_mv->currentFxLine()->m_channelIndex ) != nullptr; + bool sendToThis = Engine::Mixer()->channelSendModel( m_mv->currentFxLine()->m_channelIndex, m_channelIndex ) != nullptr; + bool receiveFromThis = Engine::Mixer()->channelSendModel( m_channelIndex, m_mv->currentFxLine()->m_channelIndex ) != nullptr; QPainter painter; painter.begin( this ); drawFxLine( &painter, this, m_mv->currentFxLine() == this, sendToThis, receiveFromThis ); @@ -236,7 +236,7 @@ void FxLine::mouseDoubleClickEvent( QMouseEvent * ) void FxLine::contextMenuEvent( QContextMenuEvent * ) { - QPointer contextMenu = new CaptionMenu( Engine::fxMixer()->effectChannel( m_channelIndex )->m_name, this ); + QPointer contextMenu = new CaptionMenu( Engine::Mixer()->effectChannel( m_channelIndex )->m_name, this ); if( m_channelIndex != 0 ) // no move-options in master { contextMenu->addAction( tr( "Move &left" ), this, SLOT( moveChannelLeft() ) ); @@ -274,7 +274,7 @@ void FxLine::renameChannel() m_renameLineEdit->setReadOnly( false ); m_lcd->hide(); m_renameLineEdit->setFixedWidth( 135 ); - m_renameLineEdit->setText( Engine::fxMixer()->effectChannel( m_channelIndex )->m_name ); + m_renameLineEdit->setText( Engine::Mixer()->effectChannel( m_channelIndex )->m_name ); m_view->setFocus(); m_renameLineEdit->selectAll(); m_renameLineEdit->setFocus(); @@ -292,13 +292,13 @@ void FxLine::renameFinished() m_lcd->show(); QString newName = m_renameLineEdit->text(); setFocus(); - if( !newName.isEmpty() && Engine::fxMixer()->effectChannel( m_channelIndex )->m_name != newName ) + if( !newName.isEmpty() && Engine::Mixer()->effectChannel( m_channelIndex )->m_name != newName ) { - Engine::fxMixer()->effectChannel( m_channelIndex )->m_name = newName; + Engine::Mixer()->effectChannel( m_channelIndex )->m_name = newName; m_renameLineEdit->setText( elideName( newName ) ); Engine::getSong()->setModified(); } - QString name = Engine::fxMixer()->effectChannel( m_channelIndex )->m_name; + QString name = Engine::Mixer()->effectChannel( m_channelIndex )->m_name; setToolTip( name ); } @@ -307,7 +307,7 @@ void FxLine::renameFinished() void FxLine::removeChannel() { - FxMixerView * mix = getGUI()->fxMixerView(); + MixerView * mix = getGUI()->MixerView(); mix->deleteChannel( m_channelIndex ); } @@ -316,7 +316,7 @@ void FxLine::removeChannel() void FxLine::removeUnusedChannels() { - FxMixerView * mix = getGUI()->fxMixerView(); + MixerView * mix = getGUI()->MixerView(); mix->deleteUnusedChannels(); } @@ -325,7 +325,7 @@ void FxLine::removeUnusedChannels() void FxLine::moveChannelLeft() { - FxMixerView * mix = getGUI()->fxMixerView(); + MixerView * mix = getGUI()->MixerView(); mix->moveChannelLeft( m_channelIndex ); } @@ -334,7 +334,7 @@ void FxLine::moveChannelLeft() void FxLine::moveChannelRight() { - FxMixerView * mix = getGUI()->fxMixerView(); + MixerView * mix = getGUI()->MixerView(); mix->moveChannelRight( m_channelIndex ); } @@ -422,7 +422,7 @@ void FxLine::setStrokeInnerInactive( const QColor & c ) // Ask user for a color, and set it as the mixer line color void FxLine::selectColor() { - auto channel = Engine::fxMixer()->effectChannel( m_channelIndex ); + auto channel = Engine::Mixer()->effectChannel( m_channelIndex ); auto new_color = ColorChooser(this).withPalette(ColorChooser::Palette::Mixer)->getColor(channel->m_color); if(!new_color.isValid()) { return; } channel->setColor (new_color); @@ -434,7 +434,7 @@ void FxLine::selectColor() // Disable the usage of color on this mixer line void FxLine::resetColor() { - Engine::fxMixer()->effectChannel( m_channelIndex )->m_hasColor = false; + Engine::Mixer()->effectChannel( m_channelIndex )->m_hasColor = false; Engine::getSong()->setModified(); update(); } @@ -443,7 +443,7 @@ void FxLine::resetColor() // Pick a random color from the mixer palette and set it as our color void FxLine::randomizeColor() { - auto channel = Engine::fxMixer()->effectChannel( m_channelIndex ); + auto channel = Engine::Mixer()->effectChannel( m_channelIndex ); channel->setColor (ColorChooser::getPalette(ColorChooser::Palette::Mixer)[rand() % 48]); Engine::getSong()->setModified(); update(); diff --git a/src/gui/widgets/FxLineLcdSpinBox.cpp b/src/gui/widgets/FxLineLcdSpinBox.cpp index 44515762bca..fce3ae4c462 100644 --- a/src/gui/widgets/FxLineLcdSpinBox.cpp +++ b/src/gui/widgets/FxLineLcdSpinBox.cpp @@ -25,7 +25,7 @@ #include "FxLineLcdSpinBox.h" #include "CaptionMenu.h" -#include "FxMixerView.h" +#include "MixerView.h" #include "GuiApplication.h" #include "TrackView.h" @@ -36,12 +36,12 @@ void FxLineLcdSpinBox::setTrackView(TrackView * tv) void FxLineLcdSpinBox::mouseDoubleClickEvent(QMouseEvent* event) { - getGUI()->fxMixerView()->setCurrentFxLine(model()->value()); + getGUI()->MixerView()->setCurrentFxLine(model()->value()); - getGUI()->fxMixerView()->parentWidget()->show(); - getGUI()->fxMixerView()->show();// show fxMixer window - getGUI()->fxMixerView()->setFocus();// set focus to fxMixer window - //engine::getFxMixerView()->raise(); + getGUI()->MixerView()->parentWidget()->show(); + getGUI()->MixerView()->show();// show Mixer window + getGUI()->MixerView()->setFocus();// set focus to Mixer window + //engine::getMixerView()->raise(); } void FxLineLcdSpinBox::contextMenuEvent(QContextMenuEvent* event) diff --git a/src/gui/widgets/SendButtonIndicator.cpp b/src/gui/widgets/SendButtonIndicator.cpp index f0229b6a790..341046b3774 100644 --- a/src/gui/widgets/SendButtonIndicator.cpp +++ b/src/gui/widgets/SendButtonIndicator.cpp @@ -1,12 +1,12 @@ #include "SendButtonIndicator.h" -#include "FxMixer.h" +#include "Mixer.h" QPixmap * SendButtonIndicator::s_qpmOff = nullptr; QPixmap * SendButtonIndicator::s_qpmOn = nullptr; SendButtonIndicator:: SendButtonIndicator( QWidget * _parent, FxLine * _owner, - FxMixerView * _mv) : + MixerView * _mv) : QLabel( _parent ), m_parent( _owner ), m_mv( _mv ) @@ -21,7 +21,7 @@ SendButtonIndicator:: SendButtonIndicator( QWidget * _parent, FxLine * _owner, s_qpmOn = new QPixmap( embed::getIconPixmap( "mixer_send_on", 29, 20 ) ); } - // don't do any initializing yet, because the FxMixerView and FxLine + // don't do any initializing yet, because the MixerView and FxLine // that were passed to this constructor are not done with their constructors // yet. setPixmap( *s_qpmOff ); @@ -29,7 +29,7 @@ SendButtonIndicator:: SendButtonIndicator( QWidget * _parent, FxLine * _owner, void SendButtonIndicator::mousePressEvent( QMouseEvent * e ) { - FxMixer * mix = Engine::fxMixer(); + Mixer * mix = Engine::Mixer(); int from = m_mv->currentFxLine()->channelIndex(); int to = m_parent->channelIndex(); FloatModel * sendModel = mix->channelSendModel(from, to); @@ -50,7 +50,7 @@ void SendButtonIndicator::mousePressEvent( QMouseEvent * e ) FloatModel * SendButtonIndicator::getSendModel() { - FxMixer * mix = Engine::fxMixer(); + Mixer * mix = Engine::Mixer(); return mix->channelSendModel( m_mv->currentFxLine()->channelIndex(), m_parent->channelIndex()); } diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index d7904b38ee4..d133c5217fb 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -29,7 +29,7 @@ #include "ConfigManager.h" #include "ControllerConnection.h" #include "DataFile.h" -#include "FxMixer.h" +#include "Mixer.h" #include "InstrumentTrackView.h" #include "Instrument.h" #include "MidiClient.h" @@ -71,7 +71,7 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : m_firstKeyModel.setInitValue(0); m_lastKeyModel.setInitValue(NumKeys - 1); - m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1); + m_effectChannelModel.setRange( 0, Engine::Mixer()->numChannels()-1, 1); for( int i = 0; i < NumKeys; ++i ) { @@ -871,7 +871,7 @@ void InstrumentTrack::loadTrackSpecificSettings( const QDomElement & thisElement m_panningModel.loadSettings( thisElement, "pan" ); m_pitchRangeModel.loadSettings( thisElement, "pitchrange" ); m_pitchModel.loadSettings( thisElement, "pitch" ); - m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1 ); + m_effectChannelModel.setRange( 0, Engine::Mixer()->numChannels()-1 ); if ( !m_previewMode ) { m_effectChannelModel.loadSettings( thisElement, "fxch" ); diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index ef1c8bfc4a7..a74e51ccecb 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -44,7 +44,7 @@ SampleTrack::SampleTrack(TrackContainer* tc) : { setName(tr("Sample track")); m_panningModel.setCenterValue(DefaultPanning); - m_effectChannelModel.setRange(0, Engine::fxMixer()->numChannels()-1, 1); + m_effectChannelModel.setRange(0, Engine::Mixer()->numChannels()-1, 1); connect(&m_effectChannelModel, SIGNAL(dataChanged()), this, SLOT(updateEffectChannel())); } @@ -209,7 +209,7 @@ void SampleTrack::loadTrackSpecificSettings( const QDomElement & _this ) } m_volumeModel.loadSettings( _this, "vol" ); m_panningModel.loadSettings( _this, "pan" ); - m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels() - 1 ); + m_effectChannelModel.setRange( 0, Engine::Mixer()->numChannels() - 1 ); m_effectChannelModel.loadSettings( _this, "fxch" ); } From 689a32ffc27c00cdabacbc714403261a4995b332 Mon Sep 17 00:00:00 2001 From: yashraj466 Date: Thu, 23 Dec 2021 03:56:09 +0530 Subject: [PATCH 02/33] Rename FxMixer to Mixer --- data/themes/classic/style.css | 2 +- data/themes/default/style.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index f6450c31ae2..224cfc0f10c 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -608,7 +608,7 @@ PianoView { /* font sizes for text buttons */ -FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { +MixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { font-size: 10px; } diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 7171003f728..8815aa502cf 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -647,7 +647,7 @@ PianoView { /* font sizes for text buttons */ -FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { +MixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { font-size: 10px; } From a915ac0c54ace3b7a6509f2fbb24d7b3c472d9e3 Mon Sep 17 00:00:00 2001 From: yashraj466 Date: Thu, 23 Dec 2021 04:01:46 +0530 Subject: [PATCH 03/33] Rename FxMixer to Mixer --- data/themes/classic/{fx_mixer.png => mixer.png} | Bin data/themes/default/{fx_mixer.png => mixer.png} | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename data/themes/classic/{fx_mixer.png => mixer.png} (100%) rename data/themes/default/{fx_mixer.png => mixer.png} (100%) diff --git a/data/themes/classic/fx_mixer.png b/data/themes/classic/mixer.png similarity index 100% rename from data/themes/classic/fx_mixer.png rename to data/themes/classic/mixer.png diff --git a/data/themes/default/fx_mixer.png b/data/themes/default/mixer.png similarity index 100% rename from data/themes/default/fx_mixer.png rename to data/themes/default/mixer.png From 446bbbc20d583e17b2748e9b3ec1528b1d6e50dd Mon Sep 17 00:00:00 2001 From: yashraj466 Date: Thu, 23 Dec 2021 16:10:36 +0530 Subject: [PATCH 04/33] Rename FxMixer to Mixer --- data/locale/ar.ts | 38 ++++++++--------- data/locale/bs.ts | 36 ++++++++-------- data/locale/ca.ts | 38 ++++++++--------- data/locale/cs.ts | 38 ++++++++--------- data/locale/de.ts | 42 +++++++++---------- data/locale/el.ts | 38 ++++++++--------- data/locale/en.ts | 38 ++++++++--------- data/locale/eo.ts | 38 ++++++++--------- data/locale/es.ts | 38 ++++++++--------- data/locale/eu.ts | 38 ++++++++--------- data/locale/fa.ts | 38 ++++++++--------- data/locale/fr.ts | 38 ++++++++--------- data/locale/gl.ts | 38 ++++++++--------- data/locale/he.ts | 38 ++++++++--------- data/locale/hi_IN.ts | 38 ++++++++--------- data/locale/hu_HU.ts | 38 ++++++++--------- data/locale/id.ts | 42 +++++++++---------- data/locale/it.ts | 38 ++++++++--------- data/locale/ja.ts | 38 ++++++++--------- data/locale/ka.ts | 38 ++++++++--------- data/locale/ko.ts | 38 ++++++++--------- data/locale/ms_MY.ts | 38 ++++++++--------- data/locale/nb.ts | 38 ++++++++--------- data/locale/nl.ts | 42 +++++++++---------- data/locale/oc.ts | 38 ++++++++--------- data/locale/pl.ts | 40 +++++++++--------- data/locale/pt.ts | 38 ++++++++--------- data/locale/ro.ts | 38 ++++++++--------- data/locale/ru.ts | 38 ++++++++--------- data/locale/sl.ts | 38 ++++++++--------- data/locale/sr.ts | 12 +++--- data/locale/sv.ts | 42 +++++++++---------- data/locale/tr.ts | 38 ++++++++--------- data/locale/uk.ts | 38 ++++++++--------- data/locale/zh_CN.ts | 38 ++++++++--------- data/locale/zh_TW.ts | 38 ++++++++--------- .../demos/StrictProduction-DearJonDoe.mmp | 4 +- data/projects/shorties/Crunk(Demo).mmp | 4 +- data/projects/templates/AcousticDrumset.mpt | 4 +- data/projects/templates/CR8000.mpt | 4 +- data/projects/templates/ClubMix.mpt | 4 +- data/projects/templates/Empty.mpt | 4 +- data/projects/templates/TR808.mpt | 4 +- data/projects/templates/default.mpt | 4 +- .../tutorials/editing_note_volumes.mmp | 4 +- tests/emptyproject.mmp | 4 +- 46 files changed, 699 insertions(+), 699 deletions(-) diff --git a/data/locale/ar.ts b/data/locale/ar.ts index 44128b13576..25097e45eeb 100644 --- a/data/locale/ar.ts +++ b/data/locale/ar.ts @@ -5395,64 +5395,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master الرئيسية - - - + + + FX %1 - + Volume الحجم - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer المازج - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5460,8 +5460,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7460,7 +7460,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer المازج diff --git a/data/locale/bs.ts b/data/locale/bs.ts index cd28c14a622..6a807ca74c1 100644 --- a/data/locale/bs.ts +++ b/data/locale/bs.ts @@ -2742,49 +2742,49 @@ You can remove and move FX channels in the context menu, which is accessed by ri - FxMixer + Mixer - + Master - - - + + + FX %1 - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -2802,8 +2802,8 @@ You can remove and move FX channels in the context menu, which is accessed by ri FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -4780,12 +4780,12 @@ Please make sure you have write-access to the file and try again. - Show/hide FX Mixer + Show/hide Mixer - Click here to show or hide the FX Mixer. The FX Mixer is a very powerful tool for managing effects for your song. You can insert effects into different effect-channels. + Click here to show or hide the Mixer. The Mixer is a very powerful tool for managing effects for your song. You can insert effects into different effect-channels. @@ -4911,7 +4911,7 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS. - FX Mixer + Mixer diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 2500c5478c2..6050527c259 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Volum - + Mute Silenci - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute Silenci - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/cs.ts b/data/locale/cs.ts index 72992d838a2..bb596b2c6c9 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -5395,64 +5395,64 @@ Ověřte si prosím, zda máte povolen zápis do souboru a do složky, ve které - FxMixer + Mixer - + Master Hlavní - - - + + + FX %1 Efekt %1 - + Volume Hlasitost - + Mute Ztlumit - + Solo Sólo - FxMixerView + MixerView - - FX-Mixer + + Mixer Efektový mixážní panel - + FX Fader %1 Efektový fader %1 - + Mute Ztlumit - + Mute this FX channel Ztlumit tento efektový kanál - + Solo Sólo - + Solo FX channel Sólovat efektový kanál @@ -5460,8 +5460,8 @@ Ověřte si prosím, zda máte povolen zápis do souboru a do složky, ve které FxRoute - - + + Amount to send from channel %1 to channel %2 Množství k odeslání z kanálu %1 do kanálu %2 @@ -7462,7 +7462,7 @@ Ujistěte se prosím, zda máte povolen zápis do souboru a do složky obsahují - FX Mixer + Mixer Efektový mixážní panel diff --git a/data/locale/de.ts b/data/locale/de.ts index 0135fdaa876..55b9ae2066b 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -5395,64 +5395,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master Master - - - + + + FX %1 FX %1 - + Volume Lautstärke - + Mute Stumm - + Solo Solo - FxMixerView + MixerView - - FX-Mixer - FX-Mixer + + Mixer + Mixer - + FX Fader %1 FX Schieber %1 - + Mute Stumm - + Mute this FX channel Diesen FX-Kanal stummschalten - + Solo Solo - + Solo FX channel Solo FX-Kanal @@ -5460,8 +5460,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 Anteil, der von Kanal %1 zu Kanal %2 gesendet werden soll @@ -7460,8 +7460,8 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer - Zeige/verstecke FX-Mixer + Mixer + Zeige/verstecke Mixer diff --git a/data/locale/el.ts b/data/locale/el.ts index 837ffe4688d..76f7cc8302c 100644 --- a/data/locale/el.ts +++ b/data/locale/el.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Ενταση - + Mute Σίγαση - + Solo Σόλο - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute Σίγαση - + Mute this FX channel - + Solo Σόλο - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/en.ts b/data/locale/en.ts index a8326c4e1d9..15c66d8fa79 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -5396,64 +5396,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5461,8 +5461,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7461,7 +7461,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/eo.ts b/data/locale/eo.ts index cab5b19a073..ee0c7476c7d 100644 --- a/data/locale/eo.ts +++ b/data/locale/eo.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Volumo - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/es.ts b/data/locale/es.ts index 15378881032..d1230a38255 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -5395,64 +5395,64 @@ Asegúrate de tener permisos de escritura tanto del archivo como del directorio - FxMixer + Mixer - + Master Maestro - - - + + + FX %1 FX %1 - + Volume Volumen - + Mute Silencio - + Solo Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer Mezcladora FX - + FX Fader %1 Fader FX %1 - + Mute Silencio - + Mute this FX channel Silenciar este canal FX - + Solo Solo - + Solo FX channel Canal FX Solo @@ -5460,8 +5460,8 @@ Asegúrate de tener permisos de escritura tanto del archivo como del directorio FxRoute - - + + Amount to send from channel %1 to channel %2 Cantidad de envío del canal %1 al canal %2 @@ -7461,7 +7461,7 @@ Asegúrate de tener permisos de escritura tanto del archivo como del directorio - FX Mixer + Mixer Mezcladora FX diff --git a/data/locale/eu.ts b/data/locale/eu.ts index ce6637719a0..91851926a40 100644 --- a/data/locale/eu.ts +++ b/data/locale/eu.ts @@ -5675,64 +5675,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Bolumena - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5740,8 +5740,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7740,7 +7740,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/fa.ts b/data/locale/fa.ts index 454c14f273d..69cfb642c84 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume ولوم - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/fr.ts b/data/locale/fr.ts index f48908fcc4b..dec2a4a8d8e 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -5679,64 +5679,64 @@ Veuillez vous assurez que vous avez les droits d'écriture sur le fichier e - FxMixer + Mixer - + Master Général - - - + + + FX %1 Effet %1 - + Volume Volume - + Mute Mettre en sourdine - + Solo Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer Mélangeur d'effets - + FX Fader %1 Chariot d'effet %1 - + Mute Mettre en sourdine - + Mute this FX channel Mettre ce canal d'effet en sourdine - + Solo Solo - + Solo FX channel Mettre ce canal d'effet en solo @@ -5744,8 +5744,8 @@ Veuillez vous assurez que vous avez les droits d'écriture sur le fichier e FxRoute - - + + Amount to send from channel %1 to channel %2 Quantité à envoyer du canal %1 au canal %2 @@ -7753,7 +7753,7 @@ Veuillez vous assurez que vous avez les droits d'écriture sur le fichier e - FX Mixer + Mixer Mélangeur d'effets diff --git a/data/locale/gl.ts b/data/locale/gl.ts index a691c1ba766..873503fb793 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master Global - - - + + + FX %1 Efecto %1 - + Volume Volume - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer Mesturador de efectos especiais - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer Mostrar/Agochar os Mesturador de efectos especiais diff --git a/data/locale/he.ts b/data/locale/he.ts index 34a68ab44e6..c254b1a3c70 100644 --- a/data/locale/he.ts +++ b/data/locale/he.ts @@ -5395,64 +5395,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume ווליום - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5460,8 +5460,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7460,7 +7460,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/hi_IN.ts b/data/locale/hi_IN.ts index 803c8ca33b7..c8214a8dea9 100644 --- a/data/locale/hi_IN.ts +++ b/data/locale/hi_IN.ts @@ -5396,64 +5396,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume वॉल्यूम - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5461,8 +5461,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7461,7 +7461,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/hu_HU.ts b/data/locale/hu_HU.ts index 8ae0cc7ca64..874ac4797d2 100644 --- a/data/locale/hu_HU.ts +++ b/data/locale/hu_HU.ts @@ -5400,64 +5400,64 @@ Ellenőrizd, hogy rendelkezel-e a szükséges engedélyekkel és próbáld újra - FxMixer + Mixer - + Master Master - - - + + + FX %1 FX %1 - + Volume Hangerő - + Mute Némítás - + Solo Szóló - FxMixerView + MixerView - - FX-Mixer + + Mixer Keverő - + FX Fader %1 FX Fader %1 - + Mute Némítás - + Mute this FX channel Csatorna némítása - + Solo Szóló - + Solo FX channel Csatorna szóló @@ -5465,8 +5465,8 @@ Ellenőrizd, hogy rendelkezel-e a szükséges engedélyekkel és próbáld újra FxRoute - - + + Amount to send from channel %1 to channel %2 %1. csatornáról %2. csatornára küldött jel mennyisége @@ -7468,7 +7468,7 @@ Ellenőrizd, hogy rendelkezel-e a szükséges engedélyekkel és próbáld újra - FX Mixer + Mixer Keverő diff --git a/data/locale/id.ts b/data/locale/id.ts index efdb53e1e9c..3c6f6a71c1b 100644 --- a/data/locale/id.ts +++ b/data/locale/id.ts @@ -5396,64 +5396,64 @@ Pastikan Anda memiliki izin menulis ke file dan direktori yang berisi berkas ter - FxMixer + Mixer - + Master Master - - - + + + FX %1 FX %1 - + Volume Volume - + Mute Bisu - + Solo Solo - FxMixerView + MixerView - - FX-Mixer - FX-Mixer + + Mixer + Mixer - + FX Fader %1 FX Pemudar %1 - + Mute Bisu - + Mute this FX channel Bisukan saluran FX ini - + Solo Solo - + Solo FX channel Saluran FX Solo @@ -5461,8 +5461,8 @@ Pastikan Anda memiliki izin menulis ke file dan direktori yang berisi berkas ter FxRoute - - + + Amount to send from channel %1 to channel %2 Jumlah untuk kirim dari saluran %1 ke saluran %2 @@ -7464,8 +7464,8 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer - FX Mixer + Mixer + Mixer diff --git a/data/locale/it.ts b/data/locale/it.ts index 414ab7da4bd..5cba07b7e9f 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -5400,64 +5400,64 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co - FxMixer + Mixer - + Master Principale - - - + + + FX %1 FX %1 - + Volume Volume - + Mute Silenziato - + Solo Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer Mixer FX - + FX Fader %1 Volume FX %1 - + Mute Silenziato - + Mute this FX channel Silenzia questo canale FX - + Solo Solo - + Solo FX channel Canale solo FX @@ -5465,8 +5465,8 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co FxRoute - - + + Amount to send from channel %1 to channel %2 Quantità da mandare dal canale %1 al canale %2 @@ -7474,7 +7474,7 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co - FX Mixer + Mixer Mostra/nascondi mixer effetti diff --git a/data/locale/ja.ts b/data/locale/ja.ts index cc03a6640b7..c56c29fb33f 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -5396,64 +5396,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 FX %1 - + Volume 音量 - + Mute ミュート - + Solo ソロ - FxMixerView + MixerView - - FX-Mixer + + Mixer エフェクトミキサー - + FX Fader %1 - + Mute ミュート - + Mute this FX channel このFXチャンネルをミュート - + Solo ソロ - + Solo FX channel @@ -5461,8 +5461,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7462,7 +7462,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer エフェクトミキサー diff --git a/data/locale/ka.ts b/data/locale/ka.ts index 7c871296248..c974c0f597c 100644 --- a/data/locale/ka.ts +++ b/data/locale/ka.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/ko.ts b/data/locale/ko.ts index 25fcae00b77..e334677e6c8 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -5398,64 +5398,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master 마스터 - - - + + + FX %1 FX %1 - + Volume 음량 - + Mute 음소거 - + Solo 독주 - FxMixerView + MixerView - - FX-Mixer + + Mixer FX-믹서 - + FX Fader %1 FX 페이더 %1 - + Mute 음소거 - + Mute this FX channel 이 채널 음소거 - + Solo 독주 - + Solo FX channel 이 채널 독주 @@ -5463,8 +5463,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 채널 %1에서 채널 %2(으)로 보낼 양 @@ -7465,7 +7465,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer FX 믹서 diff --git a/data/locale/ms_MY.ts b/data/locale/ms_MY.ts index 18950604952..ab4cf68c99f 100644 --- a/data/locale/ms_MY.ts +++ b/data/locale/ms_MY.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Kekuatan suara - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/nb.ts b/data/locale/nb.ts index 905295ce515..1b63e3ccf05 100644 --- a/data/locale/nb.ts +++ b/data/locale/nb.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Volum - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/nl.ts b/data/locale/nl.ts index f3250c3d6ed..2576aed8350 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -5396,64 +5396,64 @@ Zorg ervoor dat u schrijfbevoegdheid heeft voor het bestand en voor de map die h - FxMixer + Mixer - + Master Master - - - + + + FX %1 FX %1 - + Volume Volume - + Mute Dempen - + Solo Solo - FxMixerView + MixerView - - FX-Mixer - FX-mixer + + Mixer + mixer - + FX Fader %1 FX-fader %1 - + Mute Dempen - + Mute this FX channel Dit FX-kanaal dempen - + Solo Solo - + Solo FX channel Solo FX-kanaal @@ -5461,8 +5461,8 @@ Zorg ervoor dat u schrijfbevoegdheid heeft voor het bestand en voor de map die h FxRoute - - + + Amount to send from channel %1 to channel %2 Te zenden hoeveelheid van kanaal %1 naar kanaal %2 @@ -7463,8 +7463,8 @@ Zorg ervoor dat u schrijfbevoegdheid heeft voor het bestand en voor de map die h - FX Mixer - FX-mixer + Mixer + mixer diff --git a/data/locale/oc.ts b/data/locale/oc.ts index 426e5df3494..17293f0bd6a 100644 --- a/data/locale/oc.ts +++ b/data/locale/oc.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master General - - - + + + FX %1 EF %1 - + Volume Volum - + Mute - + Solo Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo Solo - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/pl.ts b/data/locale/pl.ts index 525ae32e5fc..30849bbd972 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -5680,64 +5680,64 @@ Upewnij się, że masz uprawnienia do zapisu do pliku i katalogu zawierającego - FxMixer + Mixer - + Master Master - - - + + + FX %1 FX %1 - + Volume Głośność - + Mute Wycisz - + Solo Solo - FxMixerView + MixerView - - FX-Mixer - FX-Mixer + + Mixer + Mixer - + FX Fader %1 Fader FX %1 - + Mute Wycisz - + Mute this FX channel Wycisz ten kanał FX - + Solo Solo - + Solo FX channel Kanał FX solo @@ -5745,8 +5745,8 @@ Upewnij się, że masz uprawnienia do zapisu do pliku i katalogu zawierającego FxRoute - - + + Amount to send from channel %1 to channel %2 Ilość do wysyłania z kanału %1 do kanału %2 @@ -7746,7 +7746,7 @@ Upewnij się, że masz uprawnienia do zapisu do pliku i katalogu zawierającego - FX Mixer + Mixer Pokaż/ukryj Mikser Efektów diff --git a/data/locale/pt.ts b/data/locale/pt.ts index 087ef435ab5..8533661c36b 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -5397,64 +5397,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master Mestre - - - + + + FX %1 FX %1 - + Volume Volume - + Mute Mudo - + Solo Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer Mixer de Efeitos - + FX Fader %1 FX Fader %1 - + Mute Mudo - + Mute this FX channel Este canal FX mudo - + Solo Solo - + Solo FX channel Canal FX solo @@ -5462,8 +5462,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 Quantidade para enviar do canal %1 para o canal %2 @@ -7462,7 +7462,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer Mostrar/esconder Mixer de Efeitos diff --git a/data/locale/ro.ts b/data/locale/ro.ts index c14e0c523d8..532911eace9 100644 --- a/data/locale/ro.ts +++ b/data/locale/ro.ts @@ -5395,64 +5395,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Volum - + Mute - + Solo - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute - + Mute this FX channel - + Solo - + Solo FX channel @@ -5460,8 +5460,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7460,7 +7460,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/ru.ts b/data/locale/ru.ts index 16a6dcce070..99c20058d53 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -5409,64 +5409,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master Главный - - - + + + FX %1 ЭФ %1 - + Volume Громкость - + Mute Тихо - + Solo Соло - FxMixerView + MixerView - - FX-Mixer + + Mixer Микшер Эффектов - + FX Fader %1 Регулятор ЭФ %1 - + Mute Заглушить - + Mute this FX channel Заглушить этот канал ЭФ - + Solo Соло - + Solo FX channel Соло канал ЭФ @@ -5474,8 +5474,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 Величина отправки с канала %1 на канал %2 @@ -7483,7 +7483,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer Микшер Эффектов diff --git a/data/locale/sl.ts b/data/locale/sl.ts index 07d3c4d1cb1..532216a9b53 100644 --- a/data/locale/sl.ts +++ b/data/locale/sl.ts @@ -5394,64 +5394,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master - - - + + + FX %1 - + Volume Glasnost - + Mute Mute - + Solo Solist - FxMixerView + MixerView - - FX-Mixer + + Mixer - + FX Fader %1 - + Mute Mute - + Mute this FX channel - + Solo Solist - + Solo FX channel @@ -5459,8 +5459,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer diff --git a/data/locale/sr.ts b/data/locale/sr.ts index 1d38c5d24d9..b6320510f88 100644 --- a/data/locale/sr.ts +++ b/data/locale/sr.ts @@ -2215,7 +2215,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - FxMixer + Mixer Master @@ -2226,9 +2226,9 @@ You can remove and move FX channels in the context menu, which is accessed by ri - FxMixerView + MixerView - FX-Mixer + Mixer @@ -3692,11 +3692,11 @@ Please make sure you have write-access to the file and try again. - FX Mixer + Mixer - Click here to show or hide the FX Mixer. The FX Mixer is a very powerful tool for managing effects for your song. You can insert effects into different effect-channels. + Click here to show or hide the Mixer. The Mixer is a very powerful tool for managing effects for your song. You can insert effects into different effect-channels. @@ -3901,7 +3901,7 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS. - Show/hide FX Mixer + Show/hide Mixer diff --git a/data/locale/sv.ts b/data/locale/sv.ts index a7a3f56b7ac..013c9719356 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -5678,64 +5678,64 @@ Se till att du har skrivbehörighet till filen och mappen som innehåller filen - FxMixer + Mixer - + Master Master - - - + + + FX %1 FX %1 - + Volume Volym - + Mute Tysta - + Solo Solo - FxMixerView + MixerView - - FX-Mixer - FX-mixer + + Mixer + mixer - + FX Fader %1 FX Fader %1 - + Mute Tysta - + Mute this FX channel Tysta denna FX-kanal - + Solo Solo - + Solo FX channel Solo FX-kanal @@ -5743,8 +5743,8 @@ Se till att du har skrivbehörighet till filen och mappen som innehåller filen FxRoute - - + + Amount to send from channel %1 to channel %2 Mängd att skicka från kanal %1 till kanal %2 @@ -7752,8 +7752,8 @@ Se till att du har skrivbehörighet till filen och mappen som innehåller filen - FX Mixer - FX-mixer + Mixer + mixer diff --git a/data/locale/tr.ts b/data/locale/tr.ts index a001f710afd..1c3baf29eda 100644 --- a/data/locale/tr.ts +++ b/data/locale/tr.ts @@ -5680,64 +5680,64 @@ Lütfen dosyaya ve dosyayı içeren dizine yazma izniniz olduğundan emin olun v - FxMixer + Mixer - + Master Usta - - - + + + FX %1 FX %1 - + Volume Ses Düzeyi - + Mute Sustur - + Solo Tek - FxMixerView + MixerView - - FX-Mixer + + Mixer FX-Karıştırıcısı - + FX Fader %1 FX Fader %1 - + Mute Sustur - + Mute this FX channel Bu FX kanalını sessize al - + Solo Tek - + Solo FX channel Solo FX kanalı @@ -5745,8 +5745,8 @@ Lütfen dosyaya ve dosyayı içeren dizine yazma izniniz olduğundan emin olun v FxRoute - - + + Amount to send from channel %1 to channel %2 %1 kanalından %2 kanalına gönderilecek miktar @@ -7754,7 +7754,7 @@ Lütfen dosyaya ve dosyayı içeren dizine yazma izniniz olduğundan emin olun v - FX Mixer + Mixer FX Karıştırıcısı diff --git a/data/locale/uk.ts b/data/locale/uk.ts index b32c81b953e..617f2169b85 100644 --- a/data/locale/uk.ts +++ b/data/locale/uk.ts @@ -5395,64 +5395,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master Головний - - - + + + FX %1 Ефект %1 - + Volume Гучність - + Mute Тиша - + Solo Соло - FxMixerView + MixerView - - FX-Mixer + + Mixer Мікшер Ефектів - + FX Fader %1 Повзунок Ефекту %1 - + Mute Тиша - + Mute this FX channel Тиша на цьому каналі Ефекту - + Solo Соло - + Solo FX channel Соло каналу ЕФ @@ -5460,8 +5460,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 Величина відправки з каналу %1 на канал %2 @@ -7461,7 +7461,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer Мікшер Ефектів diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts index cc7653c09c8..4dcce0cbcf8 100644 --- a/data/locale/zh_CN.ts +++ b/data/locale/zh_CN.ts @@ -5404,64 +5404,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master 主控 - - - + + + FX %1 FX %1 - + Volume 音量 - + Mute 静音 - + Solo 独奏 - FxMixerView + MixerView - - FX-Mixer + + Mixer 效果混合器 - + FX Fader %1 FX 衰减器 %1 - + Mute 静音 - + Mute this FX channel 静音此效果通道 - + Solo 独奏 - + Solo FX channel 独奏效果通道 @@ -5469,8 +5469,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 从通道 %1 发送到通道 %2 的量 @@ -7471,7 +7471,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer 显示/隐藏混音器 diff --git a/data/locale/zh_TW.ts b/data/locale/zh_TW.ts index 5a82ca64f5d..5d1dae168cd 100644 --- a/data/locale/zh_TW.ts +++ b/data/locale/zh_TW.ts @@ -5395,64 +5395,64 @@ Please make sure you have write permission to the file and the directory contain - FxMixer + Mixer - + Master 主控 - - - + + + FX %1 FX %1 - + Volume 音量 - + Mute 靜音 - + Solo 獨奏 - FxMixerView + MixerView - - FX-Mixer + + Mixer 效果混合器 - + FX Fader %1 FX 衰減器 %1 - + Mute 靜音 - + Mute this FX channel 靜音此效果通道 - + Solo 獨奏 - + Solo FX channel 獨奏效果通道 @@ -5460,8 +5460,8 @@ Please make sure you have write permission to the file and the directory contain FxRoute - - + + Amount to send from channel %1 to channel %2 從通道 %1 發送到通道 %2 的量 @@ -7461,7 +7461,7 @@ Please make sure you have write permission to the file and the directory contain - FX Mixer + Mixer 顯示/隱藏混音器 diff --git a/data/projects/demos/StrictProduction-DearJonDoe.mmp b/data/projects/demos/StrictProduction-DearJonDoe.mmp index 98d26d74a6b..7d1583b0c47 100644 --- a/data/projects/demos/StrictProduction-DearJonDoe.mmp +++ b/data/projects/demos/StrictProduction-DearJonDoe.mmp @@ -673,11 +673,11 @@