Skip to content

UI, libobs: Add downstream keyer #2846

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

Closed
cg2121 wants to merge 3 commits into from
Closed

UI, libobs: Add downstream keyer #2846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1389633
libobs: Add dsk scene type
cg2121 May 14, 2020
4467750
frontend-api: Add frontend dsk functions
cg2121 May 14, 2020
b81e86a
UI: Add global scenes dock
cg2121 May 14, 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
3 changes: 2 additions & 1 deletion UI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ set(obs_SOURCES
source-label.cpp
remote-text.cpp
audio-encoders.cpp
qt-wrappers.cpp)
qt-wrappers.cpp
window-basic-main-dsk.cpp)

set(obs_HEADERS
${obs_PLATFORM_HEADERS}
Expand Down
32 changes: 30 additions & 2 deletions UI/api-interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct OBSStudioAPI : obs_frontend_callbacks {
if (main->IsPreviewProgramMode()) {
source = obs_weak_source_get_source(main->programScene);
} else {
source = main->GetCurrentSceneSource();
source = main->GetCurrentSceneListSource();
obs_source_addref(source);
}
return source;
Expand Down Expand Up @@ -505,7 +505,7 @@ struct OBSStudioAPI : obs_frontend_callbacks {
OBSSource source = nullptr;

if (main->IsPreviewProgramMode()) {
source = main->GetCurrentSceneSource();
source = main->GetCurrentSceneListSource();
obs_source_addref(source);
}

Expand All @@ -523,6 +523,34 @@ struct OBSStudioAPI : obs_frontend_callbacks {
}
}

obs_source_t *obs_frontend_get_current_global_scene(void) override
{
OBSSource source = main->GetCurrentSceneListSource();
obs_source_addref(source);

return source;
}

void obs_frontend_set_current_global_scene(obs_source_t *scene) override
{
QMetaObject::invokeMethod(main, "SetDSKSource",
Q_ARG(OBSSource, OBSSource(scene)),
Q_ARG(bool, false));
}

void obs_frontend_get_global_scenes(
struct obs_frontend_source_list *sources) override
{
for (int i = 0; i < main->ui->dsk->count(); i++) {
QListWidgetItem *item = main->ui->dsk->item(i);
OBSScene scene = GetOBSRef<OBSScene>(item);
obs_source_t *source = obs_scene_get_source(scene);

obs_source_addref(source);
da_push_back(sources->sources, &source);
}
}

void on_load(obs_data_t *settings) override
{
for (size_t i = saveCallbacks.size(); i > 0; i--) {
Expand Down
1 change: 1 addition & 0 deletions UI/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ Windowed="Windowed"
Percent="Percent"
AspectRatio="Aspect Ratio <b>%1:%2</b>"
LockVolume="Lock Volume"
DownstreamKeyer="Global Scenes"

# warning if program already open
AlreadyRunning.Title="OBS is already running"
Expand Down
214 changes: 209 additions & 5 deletions UI/forms/OBSBasic.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1079</width>
<width>1191</width>
<height>730</height>
</rect>
</property>
Expand Down Expand Up @@ -202,8 +202,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1079</width>
<height>22</height>
<width>1191</width>
<height>30</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
Expand Down Expand Up @@ -395,6 +395,7 @@
<addaction name="toggleTransitions"/>
<addaction name="toggleControls"/>
<addaction name="toggleStats"/>
<addaction name="toggleDSK"/>
</widget>
<action name="actionFullscreenInterface">
<property name="text">
Expand Down Expand Up @@ -429,6 +430,144 @@
<addaction name="menuBasic_MainMenu_Help"/>
</widget>
<widget class="OBSBasicStatusBar" name="statusbar"/>
<widget class="OBSDock" name="dskDock">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="features">
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>DownstreamKeyer</string>
</property>
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents_2">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="dskFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="SceneTree" name="dsk">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="showDropIndicator" stdset="0">
<bool>true</bool>
</property>
<property name="dragEnabled">
<bool>true</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::InternalMove</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::TargetMoveAction</enum>
</property>
<addaction name="actionRemoveScene"/>
</widget>
</item>
<item>
<widget class="QToolBar" name="dskToolbar">
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="floatable">
<bool>false</bool>
</property>
<addaction name="actionAddSceneDSK"/>
<addaction name="actionRemoveSceneDSK"/>
<addaction name="separator"/>
<addaction name="actionSceneUpDSK"/>
<addaction name="actionSceneDownDSK"/>
</widget>
</item>
<item>
<spacer name="scenesFixedSizeHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="OBSDock" name="scenesDock">
<property name="features">
<set>QDockWidget::AllDockWidgetFeatures</set>
Expand Down Expand Up @@ -753,7 +892,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>71</width>
<width>76</width>
<height>16</height>
</rect>
</property>
Expand Down Expand Up @@ -807,7 +946,7 @@
<x>0</x>
<y>0</y>
<width>16</width>
<height>28</height>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -1241,6 +1380,18 @@
<string notr="true">addIconSmall</string>
</property>
</action>
<action name="actionAddSceneDSK">
<property name="icon">
<iconset>
<normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
</property>
<property name="text">
<string>Add</string>
</property>
<property name="themeID" stdset="0">
<string notr="true">addIconSmall</string>
</property>
</action>
<action name="actionAddSource">
<property name="icon">
<iconset>
Expand Down Expand Up @@ -1271,6 +1422,24 @@
<string notr="true">removeIconSmall</string>
</property>
</action>
<action name="actionRemoveSceneDSK">
<property name="icon">
<iconset>
<normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
</property>
<property name="text">
<string>Remove</string>
</property>
<property name="shortcut">
<string>Del</string>
</property>
<property name="shortcutContext">
<enum>Qt::WidgetWithChildrenShortcut</enum>
</property>
<property name="themeID" stdset="0">
<string notr="true">removeIconSmall</string>
</property>
</action>
<action name="actionRemoveSource">
<property name="icon">
<iconset>
Expand Down Expand Up @@ -1316,6 +1485,18 @@
<string notr="true">upArrowIconSmall</string>
</property>
</action>
<action name="actionSceneUpDSK">
<property name="icon">
<iconset>
<normaloff>:/res/images/up.png</normaloff>:/res/images/up.png</iconset>
</property>
<property name="text">
<string>MoveUp</string>
</property>
<property name="themeID" stdset="0">
<string notr="true">upArrowIconSmall</string>
</property>
</action>
<action name="actionSourceUp">
<property name="enabled">
<bool>true</bool>
Expand Down Expand Up @@ -1343,6 +1524,18 @@
<string notr="true">downArrowIconSmall</string>
</property>
</action>
<action name="actionSceneDownDSK">
<property name="icon">
<iconset>
<normaloff>:/res/images/down.png</normaloff>:/res/images/down.png</iconset>
</property>
<property name="text">
<string>MoveDown</string>
</property>
<property name="themeID" stdset="0">
<string notr="true">downArrowIconSmall</string>
</property>
</action>
<action name="actionSourceDown">
<property name="enabled">
<bool>true</bool>
Expand Down Expand Up @@ -1824,6 +2017,17 @@
<string>Basic.MainMenu.View.SourceIcons</string>
</property>
</action>
<action name="toggleDSK">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>DownstreamKeyer</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down
18 changes: 18 additions & 0 deletions UI/obs-frontend-api/obs-frontend-api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,3 +451,21 @@ void obs_frontend_set_current_preview_scene(obs_source_t *scene)
if (callbacks_valid())
c->obs_frontend_set_current_preview_scene(scene);
}

obs_source_t *obs_frontend_get_current_global_scene(void)
{
return !!callbacks_valid() ? c->obs_frontend_get_current_global_scene()
: nullptr;
}

void obs_frontend_set_current_global_scene(obs_source_t *scene)
{
if (callbacks_valid())
c->obs_frontend_set_current_global_scene(scene);
}

void obs_frontend_get_global_scenes(struct obs_frontend_source_list *sources)
{
if (callbacks_valid())
c->obs_frontend_get_global_scenes(sources);
}
Loading