Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename FxMixer to Mixer #6239

Merged
merged 42 commits into from
Jan 9, 2022
Merged

Rename FxMixer to Mixer #6239

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7e43e0f
Rename FxMixer to Mixer
Dec 22, 2021
689a32f
Rename FxMixer to Mixer
Dec 22, 2021
a915ac0
Rename FxMixer to Mixer
Dec 22, 2021
446bbbc
Rename FxMixer to Mixer
Dec 23, 2021
ced45d0
Merge pull request #1 from LMMS/master
Dec 25, 2021
5707115
Function Mixer(),MixerView() case issue
Dec 26, 2021
0bdb57b
modified: src/core/Mixer.cpp
Dec 26, 2021
d539091
Merge branch 'LMMS:master' into master
Dec 27, 2021
fc7d0c6
Changed m_MixerView, s_Mixer to m_mixerView, s_mixer
Dec 27, 2021
d2f8ee0
Merge branch 'master' of https://github.com/yashraj466/lmms
Dec 27, 2021
2005824
Merge branch 'LMMS:master' into master
Dec 27, 2021
6fe6be1
modified: src/core/Engine.cpp
Dec 27, 2021
e6ac5a8
modified: src/gui/GuiApplication.cpp
Dec 27, 2021
4e848bf
Added upgrade_mixerRenme() method in DataFile.cpp | DataFile.h
Dec 27, 2021
8333935
modified: src/core/DataFile.cpp
Dec 27, 2021
4265602
modified: src/core/DataFile.cpp
Dec 28, 2021
8a302cd
Update src/core/DataFile.cpp
Dec 28, 2021
ab0b11e
Merge branch 'LMMS:master' into master
Dec 28, 2021
419fc08
Update README.md
Dec 28, 2021
a532ac5
Update doc/lmms.1
Dec 28, 2021
7743067
Renamed fx_ch_t to mix_ch_t
Dec 28, 2021
d8ea2d0
Renamed FxChannel to MixerChannel
Dec 29, 2021
e3a9973
Added method in DataFile.cpp to change node name fxchannel
Dec 29, 2021
8c4f80a
Renamed fxch to mixch used InstrumentTrack lcdSpinBox
Dec 29, 2021
a2d857f
Added method in DataFile.cpp to rename attribute fxch to mixch
Jan 2, 2022
91645fb
Renamed FxRoute to MixerRoute
Jan 2, 2022
5a3d1ae
Renamed FxLine to MixerLine
Jan 2, 2022
3eb9ea2
Changed fx related menus in song-editor
Jan 3, 2022
f816b83
Changed fx related menus in instrument Track
Jan 3, 2022
38a406b
Changed fx menu related methods and, objects and variables
Jan 3, 2022
381ddd7
Changed menus related to fx in mixer
Jan 3, 2022
9ec922a
modified: include/DataFile.h
Jan 3, 2022
2466bb1
Changed comments
Jan 5, 2022
fee995b
Changed effectChannel to mixerChannel
Jan 5, 2022
7cb5b05
Merge branch 'LMMS:master' into master
Jan 6, 2022
6aec5fc
Fixed the menus
Jan 7, 2022
856777a
Reorganized the methods in DataFile.xpp
Jan 7, 2022
3ef17d8
Merge branch 'master' of https://github.com/yashraj466/lmms
Jan 7, 2022
e05c711
Merge branch 'LMMS:master' into master
Jan 7, 2022
b0c5b95
Removed redundant blank lines
Jan 7, 2022
ec8d6e5
Merge branch 'master' of https://github.com/yashraj466/lmms
Jan 7, 2022
abf64c9
Some .mmpz files had Mixer Channel name as FX ... , Changed the Mixer…
Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
gityssh marked this conversation as resolved.
Show resolved Hide resolved
* 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
Expand Down
38 changes: 19 additions & 19 deletions data/locale/ar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5395,73 +5395,73 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>FxMixer</name>
<name>Mixer</name>
<message>
<location filename="../../src/core/FxMixer.cpp" line="704"/>
<location filename="../../src/core/Mixer.cpp" line="704"/>
<source>Master</source>
<translation>الرئيسية</translation>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="704"/>
<location filename="../../src/core/FxMixer.cpp" line="825"/>
<location filename="../../src/core/FxMixer.cpp" line="827"/>
<location filename="../../src/core/Mixer.cpp" line="704"/>
<location filename="../../src/core/Mixer.cpp" line="825"/>
<location filename="../../src/core/Mixer.cpp" line="827"/>
<source>FX %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="705"/>
<location filename="../../src/core/Mixer.cpp" line="705"/>
<source>Volume</source>
<translation>الحجم</translation>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="706"/>
<location filename="../../src/core/Mixer.cpp" line="706"/>
<source>Mute</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="707"/>
<location filename="../../src/core/Mixer.cpp" line="707"/>
<source>Solo</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>FxMixerView</name>
<name>MixerView</name>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="70"/>
<source>FX-Mixer</source>
<location filename="../../src/gui/MixerView.cpp" line="70"/>
<source>Mixer</source>
<translation>المازج</translation>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="289"/>
<location filename="../../src/gui/MixerView.cpp" line="289"/>
<source>FX Fader %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="298"/>
<location filename="../../src/gui/MixerView.cpp" line="298"/>
<source>Mute</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="306"/>
<location filename="../../src/gui/MixerView.cpp" line="306"/>
<source>Mute this FX channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="308"/>
<location filename="../../src/gui/MixerView.cpp" line="308"/>
<source>Solo</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="318"/>
<location filename="../../src/gui/MixerView.cpp" line="318"/>
<source>Solo FX channel</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>FxRoute</name>
<message>
<location filename="../../src/core/FxMixer.cpp" line="43"/>
<location filename="../../src/core/FxMixer.cpp" line="58"/>
<location filename="../../src/core/Mixer.cpp" line="43"/>
<location filename="../../src/core/Mixer.cpp" line="58"/>
<source>Amount to send from channel %1 to channel %2</source>
<translation type="unfinished"/>
</message>
Expand Down Expand Up @@ -7460,7 +7460,7 @@ Please make sure you have write permission to the file and the directory contain
<message>
<location filename="../../src/gui/MainWindow.cpp" line="528"/>
<location filename="../../src/gui/MainWindow.cpp" line="1139"/>
<source>FX Mixer</source>
<source>Mixer</source>
<translation>المازج</translation>
</message>
<message>
Expand Down
36 changes: 18 additions & 18 deletions data/locale/bs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2742,49 +2742,49 @@ You can remove and move FX channels in the context menu, which is accessed by ri
</message>
</context>
<context>
<name>FxMixer</name>
<name>Mixer</name>
<message>
<location filename="src/core/FxMixer.cpp" line="655"/>
<location filename="src/core/Mixer.cpp" line="655"/>
<source>Master</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/core/FxMixer.cpp" line="655"/>
<location filename="src/core/FxMixer.cpp" line="779"/>
<location filename="src/core/FxMixer.cpp" line="781"/>
<location filename="src/core/Mixer.cpp" line="655"/>
<location filename="src/core/Mixer.cpp" line="779"/>
<location filename="src/core/Mixer.cpp" line="781"/>
<source>FX %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>FxMixerView</name>
<name>MixerView</name>
<message>
<location filename="src/gui/FxMixerView.cpp" line="66"/>
<source>FX-Mixer</source>
<location filename="src/gui/MixerView.cpp" line="66"/>
<source>Mixer</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/FxMixerView.cpp" line="276"/>
<location filename="src/gui/MixerView.cpp" line="276"/>
<source>FX Fader %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/FxMixerView.cpp" line="281"/>
<location filename="src/gui/MixerView.cpp" line="281"/>
<source>Mute</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/FxMixerView.cpp" line="289"/>
<location filename="src/gui/MixerView.cpp" line="289"/>
<source>Mute this FX channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/FxMixerView.cpp" line="291"/>
<location filename="src/gui/MixerView.cpp" line="291"/>
<source>Solo</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/FxMixerView.cpp" line="301"/>
<location filename="src/gui/MixerView.cpp" line="301"/>
<source>Solo FX channel</source>
<translation type="unfinished"/>
</message>
Expand All @@ -2802,8 +2802,8 @@ You can remove and move FX channels in the context menu, which is accessed by ri
<context>
<name>FxRoute</name>
<message>
<location filename="src/core/FxMixer.cpp" line="41"/>
<location filename="src/core/FxMixer.cpp" line="56"/>
<location filename="src/core/Mixer.cpp" line="41"/>
<location filename="src/core/Mixer.cpp" line="56"/>
<source>Amount to send from channel %1 to channel %2</source>
<translation type="unfinished"/>
</message>
Expand Down Expand Up @@ -4780,12 +4780,12 @@ Please make sure you have write-access to the file and try again.</source>
</message>
<message>
<location filename="src/gui/MainWindow.cpp" line="526"/>
<source>Show/hide FX Mixer</source>
<source>Show/hide Mixer</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MainWindow.cpp" line="531"/>
<source>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.</source>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
Expand Down Expand Up @@ -4911,7 +4911,7 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
</message>
<message>
<location filename="src/gui/MainWindow.cpp" line="1184"/>
<source>FX Mixer</source>
<source>Mixer</source>
<translation type="unfinished"/>
</message>
<message>
Expand Down
38 changes: 19 additions & 19 deletions data/locale/ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5394,73 +5394,73 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>FxMixer</name>
<name>Mixer</name>
<message>
<location filename="../../src/core/FxMixer.cpp" line="704"/>
<location filename="../../src/core/Mixer.cpp" line="704"/>
<source>Master</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="704"/>
<location filename="../../src/core/FxMixer.cpp" line="825"/>
<location filename="../../src/core/FxMixer.cpp" line="827"/>
<location filename="../../src/core/Mixer.cpp" line="704"/>
<location filename="../../src/core/Mixer.cpp" line="825"/>
<location filename="../../src/core/Mixer.cpp" line="827"/>
<source>FX %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="705"/>
<location filename="../../src/core/Mixer.cpp" line="705"/>
<source>Volume</source>
<translation>Volum</translation>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="706"/>
<location filename="../../src/core/Mixer.cpp" line="706"/>
<source>Mute</source>
<translation>Silenci</translation>
</message>
<message>
<location filename="../../src/core/FxMixer.cpp" line="707"/>
<location filename="../../src/core/Mixer.cpp" line="707"/>
<source>Solo</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>FxMixerView</name>
<name>MixerView</name>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="70"/>
<source>FX-Mixer</source>
<location filename="../../src/gui/MixerView.cpp" line="70"/>
<source>Mixer</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="289"/>
<location filename="../../src/gui/MixerView.cpp" line="289"/>
<source>FX Fader %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="298"/>
<location filename="../../src/gui/MixerView.cpp" line="298"/>
<source>Mute</source>
<translation>Silenci</translation>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="306"/>
<location filename="../../src/gui/MixerView.cpp" line="306"/>
<source>Mute this FX channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="308"/>
<location filename="../../src/gui/MixerView.cpp" line="308"/>
<source>Solo</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/FxMixerView.cpp" line="318"/>
<location filename="../../src/gui/MixerView.cpp" line="318"/>
<source>Solo FX channel</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>FxRoute</name>
<message>
<location filename="../../src/core/FxMixer.cpp" line="43"/>
<location filename="../../src/core/FxMixer.cpp" line="58"/>
<location filename="../../src/core/Mixer.cpp" line="43"/>
<location filename="../../src/core/Mixer.cpp" line="58"/>
<source>Amount to send from channel %1 to channel %2</source>
<translation type="unfinished"/>
</message>
Expand Down Expand Up @@ -7459,7 +7459,7 @@ Please make sure you have write permission to the file and the directory contain
<message>
<location filename="../../src/gui/MainWindow.cpp" line="528"/>
<location filename="../../src/gui/MainWindow.cpp" line="1139"/>
<source>FX Mixer</source>
<source>Mixer</source>
<translation type="unfinished"/>
</message>
<message>
Expand Down
Loading