Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
f91d3baf
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,发现更多精彩内容 >>
提交
f91d3baf
编写于
4月 18, 2020
作者:
C
Clayton Groeneveld
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Remove unnecessary global variables
上级
8b1b6b1e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
90 deletion
+21
-90
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+21
-71
UI/window-basic-main.hpp
UI/window-basic-main.hpp
+0
-19
未找到文件。
UI/window-basic-main.cpp
浏览文件 @
f91d3baf
...
...
@@ -271,8 +271,7 @@ OBSBasic::OBSBasic(QWidget *parent)
connect
(
windowHandle
(),
&
QWindow
::
screenChanged
,
displayResize
);
connect
(
ui
->
preview
,
&
OBSQTDisplay
::
DisplayResized
,
displayResize
);
delete
shortcutFilter
;
shortcutFilter
=
CreateShortcutFilter
();
QObject
*
shortcutFilter
=
CreateShortcutFilter
();
installEventFilter
(
shortcutFilter
);
stringstream
name
;
...
...
@@ -1822,12 +1821,10 @@ void OBSBasic::OBSInit()
ui
->
viewMenu
->
addSeparator
();
multiviewProjectorMenu
=
new
QMenu
(
QTStr
(
"MultiviewProjector"
));
QMenu
*
multiviewProjectorMenu
=
new
QMenu
(
QTStr
(
"MultiviewProjector"
));
ui
->
viewMenu
->
addMenu
(
multiviewProjectorMenu
);
AddProjectorMenuMonitors
(
multiviewProjectorMenu
,
this
,
SLOT
(
OpenMultiviewProjector
()));
connect
(
ui
->
viewMenu
->
menuAction
(),
&
QAction
::
hovered
,
this
,
&
OBSBasic
::
UpdateMultiviewProjectorMenu
);
ui
->
viewMenu
->
addAction
(
QTStr
(
"MultiviewWindowed"
),
this
,
SLOT
(
OpenMultiviewWindow
()));
...
...
@@ -2046,13 +2043,6 @@ void OBSBasic::ShowWhatsNew(const QString &url)
#endif
}
void
OBSBasic
::
UpdateMultiviewProjectorMenu
()
{
multiviewProjectorMenu
->
clear
();
AddProjectorMenuMonitors
(
multiviewProjectorMenu
,
this
,
SLOT
(
OpenMultiviewProjector
()));
}
void
OBSBasic
::
InitHotkeys
()
{
ProfileScope
(
"OBSBasic::InitHotkeys"
);
...
...
@@ -2309,21 +2299,6 @@ OBSBasic::~OBSBasic()
if
(
updateCheckThread
&&
updateCheckThread
->
isRunning
())
updateCheckThread
->
wait
();
delete
multiviewProjectorMenu
;
delete
previewProjector
;
delete
studioProgramProjector
;
delete
previewProjectorSource
;
delete
previewProjectorMain
;
delete
sourceProjector
;
delete
sceneProjectorMenu
;
delete
scaleFilteringMenu
;
delete
colorMenu
;
delete
colorWidgetAction
;
delete
colorSelect
;
delete
deinterlaceMenu
;
delete
perSceneTransitionMenu
;
delete
shortcutFilter
;
delete
trayMenu
;
delete
programOptions
;
delete
program
;
...
...
@@ -4256,8 +4231,7 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
popup
.
addSeparator
();
delete
sceneProjectorMenu
;
sceneProjectorMenu
=
new
QMenu
(
QTStr
(
"SceneProjector"
));
QMenu
*
sceneProjectorMenu
=
new
QMenu
(
QTStr
(
"SceneProjector"
));
AddProjectorMenuMonitors
(
sceneProjectorMenu
,
this
,
SLOT
(
OpenSceneProjector
()));
popup
.
addMenu
(
sceneProjectorMenu
);
...
...
@@ -4272,8 +4246,7 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
popup
.
addSeparator
();
delete
perSceneTransitionMenu
;
perSceneTransitionMenu
=
CreatePerSceneTransitionMenu
();
QMenu
*
perSceneTransitionMenu
=
CreatePerSceneTransitionMenu
();
popup
.
addMenu
(
perSceneTransitionMenu
);
/* ---------------------- */
...
...
@@ -4584,13 +4557,6 @@ ColorSelect::ColorSelect(QWidget *parent)
void
OBSBasic
::
CreateSourcePopupMenu
(
int
idx
,
bool
preview
)
{
QMenu
popup
(
this
);
delete
previewProjectorSource
;
delete
sourceProjector
;
delete
scaleFilteringMenu
;
delete
colorMenu
;
delete
colorWidgetAction
;
delete
colorSelect
;
delete
deinterlaceMenu
;
if
(
preview
)
{
QAction
*
action
=
popup
.
addAction
(
...
...
@@ -4605,7 +4571,8 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
popup
.
addAction
(
ui
->
actionLockPreview
);
popup
.
addMenu
(
ui
->
scalingMenu
);
previewProjectorSource
=
new
QMenu
(
QTStr
(
"PreviewProjector"
));
QMenu
*
previewProjectorSource
=
new
QMenu
(
QTStr
(
"PreviewProjector"
));
AddProjectorMenuMonitors
(
previewProjectorSource
,
this
,
SLOT
(
OpenPreviewProjector
()));
...
...
@@ -4662,9 +4629,9 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
bool
hasAudio
=
(
flags
&
OBS_SOURCE_AUDIO
)
==
OBS_SOURCE_AUDIO
;
QAction
*
action
;
colorMenu
=
new
QMenu
(
QTStr
(
"ChangeBG"
));
colorWidgetAction
=
new
QWidgetAction
(
colorMenu
);
colorSelect
=
new
ColorSelect
(
colorMenu
);
QMenu
*
colorMenu
=
new
QMenu
(
QTStr
(
"ChangeBG"
));
QWidgetAction
*
colorWidgetAction
=
new
QWidgetAction
(
colorMenu
);
ColorSelect
*
colorSelect
=
new
ColorSelect
(
colorMenu
);
popup
.
addMenu
(
AddBackgroundColorMenu
(
colorMenu
,
colorWidgetAction
,
colorSelect
,
sceneItem
));
popup
.
addAction
(
QTStr
(
"Rename"
),
this
,
...
...
@@ -4687,7 +4654,7 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
ui
->
actionVerticalCenter
->
setEnabled
(
!
lock
);
ui
->
actionHorizontalCenter
->
setEnabled
(
!
lock
);
sourceProjector
=
new
QMenu
(
QTStr
(
"SourceProjector"
));
QMenu
*
sourceProjector
=
new
QMenu
(
QTStr
(
"SourceProjector"
));
AddProjectorMenuMonitors
(
sourceProjector
,
this
,
SLOT
(
OpenSourceProjector
()));
...
...
@@ -4707,7 +4674,8 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
}
if
(
isAsyncVideo
)
{
deinterlaceMenu
=
new
QMenu
(
QTStr
(
"Deinterlacing"
));
QMenu
*
deinterlaceMenu
=
new
QMenu
(
QTStr
(
"Deinterlacing"
));
popup
.
addMenu
(
AddDeinterlacingMenu
(
deinterlaceMenu
,
source
));
popup
.
addSeparator
();
...
...
@@ -4725,7 +4693,7 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
if
(
width
==
0
||
height
==
0
)
resizeOutput
->
setEnabled
(
false
);
scaleFilteringMenu
=
new
QMenu
(
QTStr
(
"ScaleFiltering"
));
QMenu
*
scaleFilteringMenu
=
new
QMenu
(
QTStr
(
"ScaleFiltering"
));
popup
.
addMenu
(
AddScaleFilteringMenu
(
scaleFilteringMenu
,
sceneItem
));
popup
.
addSeparator
();
...
...
@@ -5385,10 +5353,7 @@ void OBSBasic::StreamDelayStarting(int sec)
sysTrayStream
->
setEnabled
(
true
);
}
if
(
!
startStreamMenu
.
isNull
())
startStreamMenu
->
deleteLater
();
startStreamMenu
=
new
QMenu
();
QMenu
*
startStreamMenu
=
new
QMenu
();
startStreamMenu
->
addAction
(
QTStr
(
"Basic.Main.StopStreaming"
),
this
,
SLOT
(
StopStreaming
()));
startStreamMenu
->
addAction
(
QTStr
(
"Basic.Main.ForceStopStreaming"
),
this
,
...
...
@@ -5411,10 +5376,7 @@ void OBSBasic::StreamDelayStopping(int sec)
sysTrayStream
->
setEnabled
(
true
);
}
if
(
!
startStreamMenu
.
isNull
())
startStreamMenu
->
deleteLater
();
startStreamMenu
=
new
QMenu
();
QMenu
*
startStreamMenu
=
new
QMenu
();
startStreamMenu
->
addAction
(
QTStr
(
"Basic.Main.StartStreaming"
),
this
,
SLOT
(
StartStreaming
()));
startStreamMenu
->
addAction
(
QTStr
(
"Basic.Main.ForceStopStreaming"
),
this
,
...
...
@@ -5537,11 +5499,7 @@ void OBSBasic::StreamingStop(int code, QString last_error)
QSystemTrayIcon
::
Warning
);
}
if
(
!
startStreamMenu
.
isNull
())
{
ui
->
streamButton
->
setMenu
(
nullptr
);
startStreamMenu
->
deleteLater
();
startStreamMenu
=
nullptr
;
}
ui
->
streamButton
->
setMenu
(
nullptr
);
}
void
OBSBasic
::
AutoRemux
()
...
...
@@ -6108,7 +6066,6 @@ void OBSBasic::on_program_customContextMenuRequested(const QPoint &)
void
OBSBasic
::
PreviewDisabledMenu
(
const
QPoint
&
pos
)
{
QMenu
popup
(
this
);
delete
previewProjectorMain
;
QAction
*
action
=
popup
.
addAction
(
QTStr
(
"Basic.Main.PreviewConextMenu.Enable"
),
...
...
@@ -6116,7 +6073,7 @@ void OBSBasic::PreviewDisabledMenu(const QPoint &pos)
action
->
setCheckable
(
true
);
action
->
setChecked
(
obs_display_enabled
(
ui
->
preview
->
GetDisplay
()));
previewProjectorMain
=
new
QMenu
(
QTStr
(
"PreviewProjector"
));
QMenu
*
previewProjectorMain
=
new
QMenu
(
QTStr
(
"PreviewProjector"
));
AddProjectorMenuMonitors
(
previewProjectorMain
,
this
,
SLOT
(
OpenPreviewProjector
()));
...
...
@@ -7148,9 +7105,10 @@ void OBSBasic::SystemTrayInit()
trayIcon
.
data
());
exit
=
new
QAction
(
QTStr
(
"Exit"
),
trayIcon
.
data
());
trayMenu
=
new
QMenu
;
previewProjector
=
new
QMenu
(
QTStr
(
"PreviewProjector"
));
studioProgramProjector
=
new
QMenu
(
QTStr
(
"StudioProgramProjector"
));
QMenu
*
trayMenu
=
new
QMenu
;
QMenu
*
previewProjector
=
new
QMenu
(
QTStr
(
"PreviewProjector"
));
QMenu
*
studioProgramProjector
=
new
QMenu
(
QTStr
(
"StudioProgramProjector"
));
AddProjectorMenuMonitors
(
previewProjector
,
this
,
SLOT
(
OpenPreviewProjector
()));
AddProjectorMenuMonitors
(
studioProgramProjector
,
this
,
...
...
@@ -7183,14 +7141,6 @@ void OBSBasic::SystemTrayInit()
void
OBSBasic
::
IconActivated
(
QSystemTrayIcon
::
ActivationReason
reason
)
{
// Refresh projector list
previewProjector
->
clear
();
studioProgramProjector
->
clear
();
AddProjectorMenuMonitors
(
previewProjector
,
this
,
SLOT
(
OpenPreviewProjector
()));
AddProjectorMenuMonitors
(
studioProgramProjector
,
this
,
SLOT
(
OpenStudioProgramProjector
()));
if
(
reason
==
QSystemTrayIcon
::
Trigger
)
{
EnablePreviewDisplay
(
previewEnabled
&&
!
isVisible
());
ToggleShowHide
();
...
...
UI/window-basic-main.hpp
浏览文件 @
f91d3baf
...
...
@@ -242,8 +242,6 @@ private:
QPointer
<
QWidget
>
extraBrowsers
;
QPointer
<
QWidget
>
importer
;
QPointer
<
QMenu
>
startStreamMenu
;
QPointer
<
QPushButton
>
transitionButton
;
QPointer
<
QPushButton
>
replayBufferButton
;
QPointer
<
QHBoxLayout
>
replayLayout
;
...
...
@@ -256,21 +254,6 @@ private:
QPointer
<
QAction
>
sysTrayReplayBuffer
;
QPointer
<
QAction
>
showHide
;
QPointer
<
QAction
>
exit
;
QPointer
<
QMenu
>
trayMenu
;
QPointer
<
QMenu
>
previewProjector
;
QPointer
<
QMenu
>
studioProgramProjector
;
QPointer
<
QMenu
>
multiviewProjectorMenu
;
QPointer
<
QMenu
>
previewProjectorSource
;
QPointer
<
QMenu
>
previewProjectorMain
;
QPointer
<
QMenu
>
sceneProjectorMenu
;
QPointer
<
QMenu
>
sourceProjector
;
QPointer
<
QMenu
>
scaleFilteringMenu
;
QPointer
<
QMenu
>
colorMenu
;
QPointer
<
QWidgetAction
>
colorWidgetAction
;
QPointer
<
ColorSelect
>
colorSelect
;
QPointer
<
QMenu
>
deinterlaceMenu
;
QPointer
<
QMenu
>
perSceneTransitionMenu
;
QPointer
<
QObject
>
shortcutFilter
;
QPointer
<
QWidget
>
programWidget
;
QPointer
<
QVBoxLayout
>
programLayout
;
...
...
@@ -279,8 +262,6 @@ private:
QScopedPointer
<
QThread
>
patronJsonThread
;
std
::
string
patronJson
;
void
UpdateMultiviewProjectorMenu
();
void
DrawBackdrop
(
float
cx
,
float
cy
);
void
SetupEncoders
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录