Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
e5365ec5
O
Obs Studio
项目概览
小白菜888
/
Obs Studio
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Obs Studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e5365ec5
编写于
7月 17, 2019
作者:
C
Clayton Groeneveld
提交者:
jp9000
7月 21, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Improve look of adv audio control dialog
上级
696cebb6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
16 deletion
+18
-16
UI/adv-audio-control.cpp
UI/adv-audio-control.cpp
+9
-7
UI/data/locale/en-US.ini
UI/data/locale/en-US.ini
+1
-1
UI/window-basic-adv-audio.cpp
UI/window-basic-adv-audio.cpp
+8
-8
未找到文件。
UI/adv-audio-control.cpp
浏览文件 @
e5365ec5
...
...
@@ -64,15 +64,14 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_)
hlayout
=
new
QHBoxLayout
();
hlayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
balanceContainer
->
setLayout
(
hlayout
);
balanceContainer
->
set
MinimumWidth
(
10
0
);
balanceContainer
->
set
FixedWidth
(
15
0
);
labelL
->
setText
(
"L"
);
labelR
->
setText
(
"R"
);
nameLabel
->
setMinimumWidth
(
170
);
nameLabel
->
setText
(
QT_UTF8
(
sourceName
));
nameLabel
->
setAlignment
(
Qt
::
Align
HCenter
|
Qt
::
Align
VCenter
);
nameLabel
->
setAlignment
(
Qt
::
AlignVCenter
);
volume
->
setMinimum
(
MIN_DB
-
0.1
);
volume
->
setMaximum
(
MAX_DB
);
...
...
@@ -80,6 +79,7 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_)
volume
->
setDecimals
(
1
);
volume
->
setSuffix
(
" dB"
);
volume
->
setValue
(
obs_mul_to_db
(
vol
));
volume
->
setFixedWidth
(
100
);
if
(
volume
->
value
()
<
MIN_DB
)
volume
->
setSpecialValueText
(
"-"
+
QT_UTF8
(
"\u221E"
)
+
" dB"
);
...
...
@@ -87,8 +87,8 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_)
forceMono
->
setChecked
((
flags
&
OBS_SOURCE_FLAG_FORCE_MONO
)
!=
0
);
forceMonoContainer
->
layout
()
->
addWidget
(
forceMono
);
forceMonoContainer
->
layout
()
->
setAlignment
(
forceMono
,
Qt
::
AlignHCenter
|
Qt
::
AlignVCenter
);
forceMonoContainer
->
layout
()
->
setAlignment
(
forceMono
,
Qt
::
AlignVCenter
);
forceMonoContainer
->
setFixedWidth
(
50
);
balance
->
setOrientation
(
Qt
::
Horizontal
);
balance
->
setMinimum
(
0
);
...
...
@@ -112,7 +112,9 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_)
int64_t
cur_sync
=
obs_source_get_sync_offset
(
source
);
syncOffset
->
setMinimum
(
-
950
);
syncOffset
->
setMaximum
(
20000
);
syncOffset
->
setSuffix
(
" ms"
);
syncOffset
->
setValue
(
int
(
cur_sync
/
NSEC_PER_MSEC
));
syncOffset
->
setFixedWidth
(
100
);
int
idx
;
#if defined(_WIN32) || defined(__APPLE__) || HAVE_PULSEAUDIO
...
...
@@ -213,8 +215,8 @@ void OBSAdvAudioCtrl::ShowAudioControl(QGridLayout *layout)
layout
->
addWidget
(
monitoringType
,
lastRow
,
idx
++
);
#endif
layout
->
addWidget
(
mixerContainer
,
lastRow
,
idx
++
);
layout
->
layout
()
->
setAlignment
(
mixerContainer
,
Qt
::
AlignHCenter
|
Qt
::
AlignVCenter
);
layout
->
layout
()
->
setAlignment
(
mixerContainer
,
Qt
::
AlignVCenter
);
layout
->
setHorizontalSpacing
(
15
);
}
/* ------------------------------------------------------------------------- */
...
...
UI/data/locale/en-US.ini
浏览文件 @
e5365ec5
...
...
@@ -839,7 +839,7 @@ Basic.Settings.Advanced.AutoRemux.MP4="(record as mkv)"
Basic.AdvAudio
=
"Advanced Audio Properties"
Basic.AdvAudio.Name
=
"Name"
Basic.AdvAudio.Volume
=
"Volume"
Basic.AdvAudio.Mono
=
"
Downmix to
Mono"
Basic.AdvAudio.Mono
=
"Mono"
Basic.AdvAudio.Balance
=
"Balance"
Basic.AdvAudio.SyncOffset
=
"Sync Offset"
Basic.AdvAudio.Monitoring
=
"Audio Monitoring"
...
...
UI/window-basic-adv-audio.cpp
浏览文件 @
e5365ec5
...
...
@@ -29,27 +29,27 @@ OBSBasicAdvAudio::OBSBasicAdvAudio(QWidget *parent)
mainLayout
=
new
QGridLayout
;
mainLayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.Name"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.Volume"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.Mono"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.Balance"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.SyncOffset"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
#if defined(_WIN32) || defined(__APPLE__) || HAVE_PULSEAUDIO
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.Monitoring"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
#endif
label
=
new
QLabel
(
QTStr
(
"Basic.AdvAudio.AudioTracks"
));
label
->
set
Alignment
(
Qt
::
AlignHCenter
);
label
->
set
StyleSheet
(
"font-weight: bold;"
);
mainLayout
->
addWidget
(
label
,
0
,
idx
++
);
controlArea
=
new
QWidget
;
...
...
@@ -87,7 +87,7 @@ OBSBasicAdvAudio::OBSBasicAdvAudio(QWidget *parent)
/* enum user scene/sources */
obs_enum_sources
(
EnumSources
,
this
);
resize
(
1
0
00
,
340
);
resize
(
1
1
00
,
340
);
setWindowTitle
(
QTStr
(
"Basic.AdvAudio"
));
setWindowFlags
(
windowFlags
()
&
~
Qt
::
WindowContextHelpButtonHint
);
setSizeGripEnabled
(
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录