OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Rename 'Media Channel' to 'Tracks'

Browse source 
In the advanced audio properties, the last set of controls designate
what tracks the audio of a specific source is applied to, but for some
reason I named it 'Media Channels'.  It feels a bit confusing of a name.
I feel like it should really just be called 'Tracks' here for lack of a
better term.
This commit is contained in:
jp9000 2015-01-16 07:58:13 -08:00
parent 84e1f47ced
commit 82ca17ab66
4 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
obs/adv-audio-control.cpp
View file

@ -14,7 +14,7 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
: source(source_)
{
QWidget *forceMonoContainer;
QWidget *mediaChannelContainer;
QWidget *mixerContainer;
QWidget *panningContainer;
QHBoxLayout *hlayout;
QLabel *labelL, *labelR;
@ -24,7 +24,7 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
uint32_t flags = obs_source_get_flags(source);
forceMonoContainer = new QWidget();
mediaChannelContainer = new QWidget();
mixerContainer = new QWidget();
panningContainer = new QWidget();
labelL = new QLabel();
labelR = new QLabel();
@ -33,10 +33,10 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
forceMono = new QCheckBox();
panning = new QSlider(Qt::Horizontal);
syncOffset = new QSpinBox();
mediaChannel1 = new QCheckBox();
mediaChannel2 = new QCheckBox();
mediaChannel3 = new QCheckBox();
mediaChannel4 = new QCheckBox();
mixer1 = new QCheckBox();
mixer2 = new QCheckBox();
mixer3 = new QCheckBox();
mixer4 = new QCheckBox();
volChangedSignal.Connect(handler, "volume", OBSSourceVolumeChanged,
this);
@ -50,7 +50,7 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
forceMonoContainer->setLayout(hlayout);
hlayout = new QHBoxLayout();
hlayout->setContentsMargins(0, 0, 0, 0);
mediaChannelContainer->setLayout(hlayout);
mixerContainer->setLayout(hlayout);
hlayout = new QHBoxLayout();
hlayout->setContentsMargins(0, 0, 0, 0);
panningContainer->setLayout(hlayout);
@ -90,15 +90,15 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
syncOffset->setMaximumWidth(130);
syncOffset->setValue(int(cur_sync / NSEC_PER_MSEC));
mediaChannel1->setChecked(true);
mediaChannel1->setText("1");
mediaChannel1->setEnabled(false);
mediaChannel2->setText("2");
mediaChannel2->setEnabled(false);
mediaChannel3->setText("3");
mediaChannel3->setEnabled(false);
mediaChannel4->setText("4");
mediaChannel4->setEnabled(false);
mixer1->setChecked(true);
mixer1->setText("1");
mixer1->setEnabled(false);
mixer2->setText("2");
mixer2->setEnabled(false);
mixer3->setText("3");
mixer3->setEnabled(false);
mixer4->setText("4");
mixer4->setEnabled(false);
panningContainer->setMinimumWidth(140);
panningContainer->setMaximumWidth(140);
@ -106,12 +106,12 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
panningContainer->layout()->addWidget(panning);
panningContainer->layout()->addWidget(labelR);
mediaChannelContainer->setMinimumWidth(160);
mediaChannelContainer->setMaximumWidth(160);
mediaChannelContainer->layout()->addWidget(mediaChannel1);
mediaChannelContainer->layout()->addWidget(mediaChannel2);
mediaChannelContainer->layout()->addWidget(mediaChannel3);
mediaChannelContainer->layout()->addWidget(mediaChannel4);
mixerContainer->setMinimumWidth(160);
mixerContainer->setMaximumWidth(160);
mixerContainer->layout()->addWidget(mixer1);
mixerContainer->layout()->addWidget(mixer2);
mixerContainer->layout()->addWidget(mixer3);
mixerContainer->layout()->addWidget(mixer4);
QWidget::connect(volume, SIGNAL(valueChanged(int)),
this, SLOT(volumeChanged(int)));
@ -121,14 +121,14 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
this, SLOT(panningChanged(int)));
QWidget::connect(syncOffset, SIGNAL(valueChanged(int)),
this, SLOT(syncOffsetChanged(int)));
QWidget::connect(mediaChannel1, SIGNAL(clicked(bool)),
this, SLOT(mediaChannel1Changed(bool)));
QWidget::connect(mediaChannel2, SIGNAL(clicked(bool)),
this, SLOT(mediaChannel2Changed(bool)));
QWidget::connect(mediaChannel3, SIGNAL(clicked(bool)),
this, SLOT(mediaChannel3Changed(bool)));
QWidget::connect(mediaChannel4, SIGNAL(clicked(bool)),
this, SLOT(mediaChannel4Changed(bool)));
QWidget::connect(mixer1, SIGNAL(clicked(bool)),
this, SLOT(mixer1Changed(bool)));
QWidget::connect(mixer2, SIGNAL(clicked(bool)),
this, SLOT(mixer2Changed(bool)));
QWidget::connect(mixer3, SIGNAL(clicked(bool)),
this, SLOT(mixer3Changed(bool)));
QWidget::connect(mixer4, SIGNAL(clicked(bool)),
this, SLOT(mixer4Changed(bool)));
hlayout = new QHBoxLayout;
hlayout->setContentsMargins(0, 0, 0, 0);
@ -137,7 +137,7 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
hlayout->addWidget(forceMonoContainer);
hlayout->addWidget(panningContainer);
hlayout->addWidget(syncOffset);
hlayout->addWidget(mediaChannelContainer);
hlayout->addWidget(mixerContainer);
setLayout(hlayout);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
}
@ -230,25 +230,25 @@ void OBSAdvAudioCtrl::syncOffsetChanged(int milliseconds)
int64_t(milliseconds) * NSEC_PER_MSEC);
}
void OBSAdvAudioCtrl::mediaChannel1Changed(bool checked)
void OBSAdvAudioCtrl::mixer1Changed(bool checked)
{
/* TODO */
UNUSED_PARAMETER(checked);
}
void OBSAdvAudioCtrl::mediaChannel2Changed(bool checked)
void OBSAdvAudioCtrl::mixer2Changed(bool checked)
{
/* TODO */
UNUSED_PARAMETER(checked);
}
void OBSAdvAudioCtrl::mediaChannel3Changed(bool checked)
void OBSAdvAudioCtrl::mixer3Changed(bool checked)
{
/* TODO */
UNUSED_PARAMETER(checked);
}
void OBSAdvAudioCtrl::mediaChannel4Changed(bool checked)
void OBSAdvAudioCtrl::mixer4Changed(bool checked)
{
/* TODO */
UNUSED_PARAMETER(checked);

16
obs/adv-audio-control.hpp
View file

@ -18,10 +18,10 @@ private:
QCheckBox *forceMono = nullptr;
QSlider *panning = nullptr;
QSpinBox *syncOffset = nullptr;
QCheckBox *mediaChannel1 = nullptr;
QCheckBox *mediaChannel2 = nullptr;
QCheckBox *mediaChannel3 = nullptr;
QCheckBox *mediaChannel4 = nullptr;
QCheckBox *mixer1 = nullptr;
QCheckBox *mixer2 = nullptr;
QCheckBox *mixer3 = nullptr;
QCheckBox *mixer4 = nullptr;
OBSSignal volChangedSignal;
OBSSignal syncOffsetSignal;
@ -45,8 +45,8 @@ public slots:
void downmixMonoChanged(bool checked);
void panningChanged(int val);
void syncOffsetChanged(int milliseconds);
void mediaChannel1Changed(bool checked);
void mediaChannel2Changed(bool checked);
void mediaChannel3Changed(bool checked);
void mediaChannel4Changed(bool checked);
void mixer1Changed(bool checked);
void mixer2Changed(bool checked);
void mixer3Changed(bool checked);
void mixer4Changed(bool checked);
};

2
obs/data/locale/en-US.ini
View file

@ -269,4 +269,4 @@ Basic.AdvAudio.Volume="Volume (%)"
Basic.AdvAudio.Mono="Downmix to Mono"
Basic.AdvAudio.Panning="Panning"
Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
Basic.AdvAudio.MediaChannel="Media Channel"
Basic.AdvAudio.AudioTracks="Tracks"

2
obs/window-basic-adv-audio.cpp
View file

@ -48,7 +48,7 @@ OBSBasicAdvAudio::OBSBasicAdvAudio(QWidget *parent)
label->setMaximumWidth(130);
label->setAlignment(Qt::AlignHCenter);
hlayout->addWidget(label);
label = new QLabel(QTStr("Basic.AdvAudio.MediaChannel"));
label = new QLabel(QTStr("Basic.AdvAudio.AudioTracks"));
label->setMinimumWidth(160);
label->setMaximumWidth(160);
label->setAlignment(Qt::AlignHCenter);