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

rename Master output to Main output in user visible strings #2894

Merged
merged 5 commits into from
Jul 8, 2020
Merged

rename Master output to Main output in user visible strings #2894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ee3e4b
rename Master output to Main output in user visible strings
Be-ing Jun 21, 2020
34f78b8
DlgPrefSoundDlg: use "Output" for delay labels for consistency
Be-ing Jun 30, 2020
ad18f52
SoundManagerUtil: keep using "Master" string in XML files
Be-ing Jun 30, 2020
c027f9b
Replace Master by Main in the Shade main mixing region
daschuer Jul 7, 2020
8cea40a
Merge pull request #48 from daschuer/master_output_rename
Be-ing Jul 7, 2020
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 res/skins/Deere/tool_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<SetVariable name="group">[Master]</SetVariable>
<SetVariable name="control">gain</SetVariable>
<SetVariable name="color">green</SetVariable>
<SetVariable name="label">Master</SetVariable>
<SetVariable name="label">Main</SetVariable>
</Template>

<Template src="skin:left_2state_button.xml">
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/mixer/mixer_master_headphone.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<ObjectName>KnobLabel</ObjectName>
<SizePolicy>min,min</SizePolicy>
<Alignment>left</Alignment>
<Text> master&#8194;&#8194; l / r </Text>
<Text> &#8194;main&#8194;&#8194;&#8194; l / r </Text>
</Label>
<WidgetGroup><Size>0me,0min</Size></WidgetGroup>
</Children>
Expand Down
Binary file modified res/skins/Shade/style/style_bg_mixer_panel_main.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions src/controllers/controlpickermenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
: QMenu(pParent) {
m_effectMasterOutputStr = tr("Master Output");
m_effectMasterOutputStr = tr("Main Output");
m_effectHeadphoneOutputStr = tr("Headphone Output");
m_deckStr = tr("Deck %1");
m_samplerStr = tr("Sampler %1");
Expand All @@ -27,10 +27,10 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)

// Master Controls
QMenu* mixerMenu = addSubmenu(tr("Mixer"));
addControl("[Master]", "crossfader", tr("Crossfader"), tr("Master crossfader"), mixerMenu, true);
addControl("[Master]", "gain", tr("Master Gain"), tr("Master gain"), mixerMenu, true);
addControl("[Master]", "balance", tr("Master Balance"), tr("Master balance"), mixerMenu, true);
addControl("[Master]", "delay", tr("Master Delay"), tr("Master delay"), mixerMenu, true);
addControl("[Master]", "balance", tr("Main Output Balance"), tr("Main output balance"), mixerMenu, true);
addControl("[Master]", "delay", tr("Main Output Delay"), tr("Main output delay"), mixerMenu, true);
addControl("[Master]", "crossfader", tr("Crossfader"), tr("Crossfader"), mixerMenu, true);
addControl("[Master]", "gain", tr("Main Output Gain"), tr("Main output gain"), mixerMenu, true);
addControl("[Master]", "headGain", tr("Headphone Gain"), tr("Headphone gain"), mixerMenu, true);
addControl("[Master]", "headMix", tr("Headphone Mix"), tr("Headphone mix (pre/main)"), mixerMenu, true);
addControl("[Master]", "headSplit", tr("Headphone Split Cue"), tr("Toggle headphone split cueing"), mixerMenu);
Expand Down
4 changes: 2 additions & 2 deletions src/preferences/dialog/dlgprefsound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, SoundManager* pSoundManager,
this, SLOT(boothDelaySpinboxChanged(double)));

m_pMicMonitorMode = new ControlProxy("[Master]", "talkover_mix", this);
micMonitorModeComboBox->addItem(tr("Master output only"),
micMonitorModeComboBox->addItem(tr("Main output only"),
QVariant(static_cast<int>(EngineMaster::MicMonitorMode::MASTER)));
micMonitorModeComboBox->addItem(tr("Master and booth outputs"),
micMonitorModeComboBox->addItem(tr("Main and booth outputs"),
QVariant(static_cast<int>(EngineMaster::MicMonitorMode::MASTER_AND_BOOTH)));
micMonitorModeComboBox->addItem(tr("Direct monitor (recording and broadcasting only)"),
QVariant(static_cast<int>(EngineMaster::MicMonitorMode::DIRECT_MONITOR)));
Expand Down
10 changes: 5 additions & 5 deletions src/preferences/dialog/dlgprefsounddlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<item row="6" column="0">
<widget class="QLabel" name="masteMixLabel">
<property name="text">
<string>Master Mix</string>
<string>Main Mix</string>
</property>
</widget>
</item>
Expand All @@ -108,7 +108,7 @@
<item row="7" column="0">
<widget class="QLabel" name="masterMonoLabel">
<property name="text">
<string>Master Output Mode</string>
<string>Main Output Mode</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -148,7 +148,7 @@
<item row="11" column="0">
<widget class="QLabel" name="masterDelayLabel">
<property name="text">
<string>Master Delay</string>
<string>Main Output Delay</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should either omit Output here or add Output also to Headphone and Booth Delay

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "Main Delay" by itself would be a bit unclear what it is referring to.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add "Output" to the rest of the delay labels for consistency.

</property>
</widget>
</item>
Expand All @@ -171,7 +171,7 @@
<item row="12" column="0">
<widget class="QLabel" name="headDelayLabel">
<property name="text">
<string>Headphone Delay</string>
<string>Headphone Output Delay</string>
</property>
</widget>
</item>
Expand All @@ -194,7 +194,7 @@
<item row="13" column="0">
<widget class="QLabel" name="boothDelayLabel">
<property name="text">
<string>Booth Delay</string>
<string>Booth Output Delay</string>
</property>
</widget>
</item>
Expand Down
44 changes: 22 additions & 22 deletions src/skin/tooltips.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ void Tooltips::addStandardTooltips() {
<< clippingHelp;

add("master_PeakIndicator")
<< tr("Master Peak Indicator")
<< tr("Indicates when the signal on the master output is clipping,")
<< tr("Main Output Peak Indicator")
<< tr("Indicates when the signal on the main output is clipping,")
<< clippingHelp;

add("master_PeakIndicatorL")
<< tr("Master L Peak Indicator")
<< tr("Indicates when the left signal on the master output is clipping,")
<< tr("Main Output L Peak Indicator")
<< tr("Indicates when the left signal on the main output is clipping,")
<< clippingHelp;

add("master_PeakIndicatorR")
<< tr("Master R Peak Indicator")
<< tr("Indicates when the right signal on the master output is clipping,")
<< tr("Main Output R Peak Indicator")
<< tr("Indicates when the right signal on the main output is clipping,")
<< clippingHelp;

add("channel_VuMeter")
Expand Down Expand Up @@ -155,12 +155,12 @@ void Tooltips::addStandardTooltips() {
<< clippingHelp;

add("master_VuMeterL")
<< tr("Master Channel L Volume Meter")
<< tr("Shows the current master volume for the left channel.");
<< tr("Main Channel L Volume Meter")
<< tr("Shows the current volume for the left channel of the main output.");

add("master_VuMeterR")
<< tr("Master Channel R Volume Meter")
<< tr("Shows the current master volume for the right channel.");
<< tr("Shows the current volume for the right channel of the main output.");

add("channel_volume")
<< tr("Volume Control")
Expand All @@ -169,13 +169,13 @@ void Tooltips::addStandardTooltips() {

// Legacy control.
add("master_volume")
<< tr("Master Volume")
<< tr("Adjusts the master output volume.")
<< tr("Main Output Gain")
<< tr("Adjusts the main output gain.")
<< QString("%1: %2").arg(rightClick, resetToDefault);

add("master_gain")
<< tr("Master Gain")
<< tr("Adjusts the master output gain.")
<< tr("Main Output Gain")
<< tr("Adjusts the main output gain.")
<< QString("%1: %2").arg(rightClick, resetToDefault);

add("booth_gain")
Expand All @@ -185,13 +185,13 @@ void Tooltips::addStandardTooltips() {

add("crossfader")
<< tr("Crossfader")
<< tr("Determines the master output by fading between the left and right channels.")
<< tr("Determines the main output by fading between the left and right channels.")
<< QString("%1: %2").arg(rightClick, resetToDefault)
<< tr("Change the crossfader curve in Preferences -> Crossfader");

add("balance")
<< tr("Balance")
<< tr("Adjusts the left/right channel balance on the master output.")
<< tr("Adjusts the left/right channel balance on the main output.")
<< QString("%1: %2").arg(rightClick, resetToDefault);

// Legacy control.
Expand All @@ -207,12 +207,12 @@ void Tooltips::addStandardTooltips() {

add("headMix")
<< tr("Headphone Mix")
<< tr("Crossfades the headphone output between the master mix and cueing (PFL or Pre-Fader Listening) signal.")
<< tr("Crossfades the headphone output between the main mix and cueing (PFL or Pre-Fader Listening) signal.")
<< QString("%1: %2").arg(rightClick, resetToDefault);

add("headSplit")
<< tr("Headphone Split Cue")
<< tr("If activated, the master signal plays in the right channel, while the cueing signal "
<< tr("If activated, the main mix signal plays in the right channel, while the cueing signal "
"plays in the left channel.")
<< tr("Adjust the Headphone Mix so in the left channel is not the pure cueing signal.");

Expand Down Expand Up @@ -280,7 +280,7 @@ void Tooltips::addStandardTooltips() {
add("microphone_talkover")
<< tr("Microphone Talk-Over")
<< tr("Hold-to-talk or short click for latching to")
<< tr("mix microphone input into the master output.");
<< tr("mix microphone input into the main output.");

add("talkover_duck_mode")
<< tr("Microphone Talkover Mode")
Expand Down Expand Up @@ -488,12 +488,12 @@ void Tooltips::addStandardTooltips() {

add("mute")
<< tr("Mute")
<< tr("Mutes the selected channel's audio in the master output.");
<< tr("Mutes the selected channel's audio in the main output.");

add("master_enable")
<< tr("Master enable")
<< tr("Main mix enable")
<< tr("Hold or short click for latching to "
"mix this input into the master output.");
"mix this input into the main output.");

add("back_start")
<< tr("Fast Rewind")
Expand Down Expand Up @@ -867,7 +867,7 @@ void Tooltips::addStandardTooltips() {

add("EffectUnit_master_enabled")
<< tr("Assign Effect Unit")
<< tr("Route the master mix through this effect unit.")
<< tr("Route the main mix through this effect unit.")
<< effectsWithinUnit;

add("EffectUnit_BusLeft_enabled")
Expand Down
5 changes: 4 additions & 1 deletion src/soundio/soundmanagerutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ QString AudioPath::getStringFromType(AudioPathType type) {
// handle this -- bkgood
return QStringLiteral("Invalid");
case MASTER:
// This was renamed to "Main" in the GUI, but keep "Master" here to avoid
// making users reconfigure the output when upgrading.
// https://mixxx.org/news/2020-06-29-black-lives-matter/
return QStringLiteral("Master");
case BOOTH:
return QStringLiteral("Booth");
Expand Down Expand Up @@ -186,7 +189,7 @@ QString AudioPath::getTrStringFromType(AudioPathType type, unsigned char index)
// handle this -- bkgood
return QObject::tr("Invalid");
case MASTER:
return QObject::tr("Master");
return QObject::tr("Main");
case BOOTH:
return QObject::tr("Booth");
case HEADPHONES:
Expand Down