Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
1dc3edc8
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1dc3edc8
编写于
3月 13, 2019
作者:
C
Colin Edwards
提交者:
GitHub
3月 13, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1694 from cg2121/audio-mixer-copy-filters
UI: Add ability to copy & paste filters from the mixer
上级
6039cbb9
ad55f413
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
51 addition
and
1 deletion
+51
-1
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+47
-0
UI/window-basic-main.hpp
UI/window-basic-main.hpp
+4
-1
未找到文件。
UI/window-basic-main.cpp
浏览文件 @
1dc3edc8
...
@@ -2792,6 +2792,9 @@ void OBSBasic::VolControlContextMenu()
...
@@ -2792,6 +2792,9 @@ void OBSBasic::VolControlContextMenu()
QAction
unhideAllAction
(
QTStr
(
"UnhideAll"
),
this
);
QAction
unhideAllAction
(
QTStr
(
"UnhideAll"
),
this
);
QAction
mixerRenameAction
(
QTStr
(
"Rename"
),
this
);
QAction
mixerRenameAction
(
QTStr
(
"Rename"
),
this
);
QAction
copyFiltersAction
(
QTStr
(
"Copy.Filters"
),
this
);
QAction
pasteFiltersAction
(
QTStr
(
"Paste.Filters"
),
this
);
QAction
filtersAction
(
QTStr
(
"Filters"
),
this
);
QAction
filtersAction
(
QTStr
(
"Filters"
),
this
);
QAction
propertiesAction
(
QTStr
(
"Properties"
),
this
);
QAction
propertiesAction
(
QTStr
(
"Properties"
),
this
);
QAction
advPropAction
(
QTStr
(
"Basic.MainMenu.Edit.AdvAudio"
),
this
);
QAction
advPropAction
(
QTStr
(
"Basic.MainMenu.Edit.AdvAudio"
),
this
);
...
@@ -2813,6 +2816,13 @@ void OBSBasic::VolControlContextMenu()
...
@@ -2813,6 +2816,13 @@ void OBSBasic::VolControlContextMenu()
this
,
&
OBSBasic
::
MixerRenameSource
,
this
,
&
OBSBasic
::
MixerRenameSource
,
Qt
::
DirectConnection
);
Qt
::
DirectConnection
);
connect
(
&
copyFiltersAction
,
&
QAction
::
triggered
,
this
,
&
OBSBasic
::
AudioMixerCopyFilters
,
Qt
::
DirectConnection
);
connect
(
&
pasteFiltersAction
,
&
QAction
::
triggered
,
this
,
&
OBSBasic
::
AudioMixerPasteFilters
,
Qt
::
DirectConnection
);
connect
(
&
filtersAction
,
&
QAction
::
triggered
,
connect
(
&
filtersAction
,
&
QAction
::
triggered
,
this
,
&
OBSBasic
::
GetAudioSourceFilters
,
this
,
&
OBSBasic
::
GetAudioSourceFilters
,
Qt
::
DirectConnection
);
Qt
::
DirectConnection
);
...
@@ -2836,6 +2846,11 @@ void OBSBasic::VolControlContextMenu()
...
@@ -2836,6 +2846,11 @@ void OBSBasic::VolControlContextMenu()
mixerRenameAction
.
setProperty
(
"volControl"
,
mixerRenameAction
.
setProperty
(
"volControl"
,
QVariant
::
fromValue
<
VolControl
*>
(
vol
));
QVariant
::
fromValue
<
VolControl
*>
(
vol
));
copyFiltersAction
.
setProperty
(
"volControl"
,
QVariant
::
fromValue
<
VolControl
*>
(
vol
));
pasteFiltersAction
.
setProperty
(
"volControl"
,
QVariant
::
fromValue
<
VolControl
*>
(
vol
));
filtersAction
.
setProperty
(
"volControl"
,
filtersAction
.
setProperty
(
"volControl"
,
QVariant
::
fromValue
<
VolControl
*>
(
vol
));
QVariant
::
fromValue
<
VolControl
*>
(
vol
));
propertiesAction
.
setProperty
(
"volControl"
,
propertiesAction
.
setProperty
(
"volControl"
,
...
@@ -2843,11 +2858,19 @@ void OBSBasic::VolControlContextMenu()
...
@@ -2843,11 +2858,19 @@ void OBSBasic::VolControlContextMenu()
/* ------------------- */
/* ------------------- */
if
(
copyFiltersString
==
nullptr
)
pasteFiltersAction
.
setEnabled
(
false
);
else
pasteFiltersAction
.
setEnabled
(
true
);
QMenu
popup
;
QMenu
popup
;
popup
.
addAction
(
&
unhideAllAction
);
popup
.
addAction
(
&
unhideAllAction
);
popup
.
addAction
(
&
hideAction
);
popup
.
addAction
(
&
hideAction
);
popup
.
addAction
(
&
mixerRenameAction
);
popup
.
addAction
(
&
mixerRenameAction
);
popup
.
addSeparator
();
popup
.
addSeparator
();
popup
.
addAction
(
&
copyFiltersAction
);
popup
.
addAction
(
&
pasteFiltersAction
);
popup
.
addSeparator
();
popup
.
addAction
(
&
toggleControlLayoutAction
);
popup
.
addAction
(
&
toggleControlLayoutAction
);
popup
.
addSeparator
();
popup
.
addSeparator
();
popup
.
addAction
(
&
filtersAction
);
popup
.
addAction
(
&
filtersAction
);
...
@@ -6773,6 +6796,30 @@ void OBSBasic::on_actionPasteDup_triggered()
...
@@ -6773,6 +6796,30 @@ void OBSBasic::on_actionPasteDup_triggered()
on_actionPasteTransform_triggered
();
on_actionPasteTransform_triggered
();
}
}
void
OBSBasic
::
AudioMixerCopyFilters
()
{
QAction
*
action
=
reinterpret_cast
<
QAction
*>
(
sender
());
VolControl
*
vol
=
action
->
property
(
"volControl"
).
value
<
VolControl
*>
();
obs_source_t
*
source
=
vol
->
GetSource
();
copyFiltersString
=
obs_source_get_name
(
source
);
}
void
OBSBasic
::
AudioMixerPasteFilters
()
{
QAction
*
action
=
reinterpret_cast
<
QAction
*>
(
sender
());
VolControl
*
vol
=
action
->
property
(
"volControl"
).
value
<
VolControl
*>
();
obs_source_t
*
dstSource
=
vol
->
GetSource
();
OBSSource
source
=
obs_get_source_by_name
(
copyFiltersString
);
obs_source_release
(
source
);
if
(
source
==
dstSource
)
return
;
obs_source_copy_filters
(
dstSource
,
source
);
}
void
OBSBasic
::
on_actionCopyFilters_triggered
()
void
OBSBasic
::
on_actionCopyFilters_triggered
()
{
{
OBSSceneItem
item
=
GetCurrentSceneItem
();
OBSSceneItem
item
=
GetCurrentSceneItem
();
...
...
UI/window-basic-main.hpp
浏览文件 @
1dc3edc8
...
@@ -155,7 +155,7 @@ private:
...
@@ -155,7 +155,7 @@ private:
bool
fullscreenInterface
=
false
;
bool
fullscreenInterface
=
false
;
const
char
*
copyString
;
const
char
*
copyString
;
const
char
*
copyFiltersString
;
const
char
*
copyFiltersString
=
nullptr
;
bool
copyVisible
=
true
;
bool
copyVisible
=
true
;
QScopedPointer
<
QThread
>
updateCheckThread
;
QScopedPointer
<
QThread
>
updateCheckThread
;
...
@@ -522,6 +522,9 @@ private slots:
...
@@ -522,6 +522,9 @@ private slots:
void
on_actionShowAbout_triggered
();
void
on_actionShowAbout_triggered
();
void
AudioMixerCopyFilters
();
void
AudioMixerPasteFilters
();
private:
private:
/* OBS Callbacks */
/* OBS Callbacks */
static
void
SceneReordered
(
void
*
data
,
calldata_t
*
params
);
static
void
SceneReordered
(
void
*
data
,
calldata_t
*
params
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录