Skip to content

frontend: Add MediaControls to source properties #12831

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+98 −8
Open

frontend: Add MediaControls to source properties #12831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cccc66
frontend: Move transition preview button to button box
Warchamp7 Nov 17, 2025
0791aa5
frontend: Add MediaControls to source properties
Warchamp7 Nov 18, 2025
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
4 changes: 4 additions & 0 deletions frontend/data/themes/Yami.obt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,10 @@

/* Media icons */

MediaControls QPushButton {
min-height: var(--input_height);
}

.icon-media-play {
qproperty-icon: url(theme:Dark/media/media_play.svg);
}
Expand Down
56 changes: 51 additions & 5 deletions frontend/dialogs/OBSBasicProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#include "OBSBasicProperties.hpp"

#include <components/MediaControls.hpp>
#include <Idian/Utils.hpp>
#include <utility/display-helpers.hpp>
#include <widgets/OBSBasic.hpp>

Expand All @@ -39,6 +41,19 @@ using namespace std;

static void CreateTransitionScene(OBSSource scene, const char *text, uint32_t color);

namespace {
bool is_network_media_source(obs_source_t *source, const char *id)
{
if (strcmp(id, "ffmpeg_source") != 0)
return false;

OBSDataAutoRelease s = obs_source_get_settings(source);
bool is_local_file = obs_data_get_bool(s, "is_local_file");

return !is_local_file;
}
} // namespace

OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
: QDialog(parent),
ui(new Ui::OBSBasicProperties),
Expand All @@ -53,12 +68,18 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
int cy = (int)config_get_int(App()->GetAppConfig(), "PropertiesWindow", "cy");

enum obs_source_type type = obs_source_get_type(source);
uint32_t caps = obs_source_get_output_flags(source);

setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

idian::Utils utils(this);

ui->setupUi(this);
ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();

ui->controlsFrame->hide();
utils.addClass(ui->controlsFrame, "dialog-frame");

if (cx > 400 && cy > 400)
resize(cx, cy);

Expand All @@ -76,7 +97,16 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
ui->propertiesLayout->addWidget(view);

if (type == OBS_SOURCE_TYPE_TRANSITION) {
connect(view, &OBSPropertiesView::PropertiesRefreshed, this, &OBSBasicProperties::AddPreviewButton);
addTransitionPreviewButton();
}

if ((caps & OBS_SOURCE_CONTROLLABLE_MEDIA) != 0) {
MediaControls *mediaControls = new MediaControls(this);
mediaControls->SetSource(source);

ui->controlsFrame->layout()->addWidget(mediaControls);

connect(view, &OBSPropertiesView::PropertiesRefreshed, this, &OBSBasicProperties::refreshControls);
}

view->show();
Expand All @@ -97,7 +127,7 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
obs_display_add_draw_callback(ui->preview->GetDisplay(), OBSBasicProperties::DrawTransitionPreview,
this);
};
uint32_t caps = obs_source_get_output_flags(source);

bool drawable_type = type == OBS_SOURCE_TYPE_INPUT || type == OBS_SOURCE_TYPE_SCENE;
bool drawable_preview = (caps & OBS_SOURCE_VIDEO) != 0;

Expand Down Expand Up @@ -159,11 +189,12 @@ OBSBasicProperties::~OBSBasicProperties()
main->UpdateContextBarDeferred(true);
}

void OBSBasicProperties::AddPreviewButton()
void OBSBasicProperties::addTransitionPreviewButton()
{
QPushButton *playButton = new QPushButton(QTStr("PreviewTransition"), this);
VScrollArea *area = view;
area->widget()->layout()->addWidget(playButton);

ui->controlsFrame->layout()->addWidget(playButton);
ui->controlsFrame->show();

playButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);

Expand Down Expand Up @@ -406,6 +437,21 @@ void OBSBasicProperties::DrawTransitionPreview(void *data, uint32_t cx, uint32_t
gs_viewport_pop();
}

void OBSBasicProperties::refreshControls()
{
uint32_t caps = obs_source_get_output_flags(source);

if ((caps & OBS_SOURCE_CONTROLLABLE_MEDIA) != 0) {
const char *id = obs_source_get_unversioned_id(source);

if (!is_network_media_source(source, id)) {
ui->controlsFrame->show();
} else {
ui->controlsFrame->hide();
}
}
}

void OBSBasicProperties::Cleanup()
{
config_set_int(App()->GetAppConfig(), "PropertiesWindow", "cx", width());
Expand Down
5 changes: 3 additions & 2 deletions frontend/dialogs/OBSBasicProperties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class OBSBasicProperties : public QDialog {
OBSSignal updatePropertiesSignal;
OBSData oldSettings;
OBSPropertiesView *view;
QDialogButtonBox *buttonBox;
QSplitter *windowSplitter;

OBSSourceAutoRelease sourceA;
Expand All @@ -52,14 +51,16 @@ class OBSBasicProperties : public QDialog {
static void UpdateProperties(void *data, calldata_t *params);
static void DrawPreview(void *data, uint32_t cx, uint32_t cy);
static void DrawTransitionPreview(void *data, uint32_t cx, uint32_t cy);

void refreshControls();
void UpdateCallback(void *obj, obs_data_t *settings);
bool ConfirmQuit();
int CheckSettings();
void Cleanup();
void addTransitionPreviewButton();

private slots:
void on_buttonBox_clicked(QAbstractButton *button);
void AddPreviewButton();

public:
OBSBasicProperties(QWidget *parent, OBSSource source_);
Expand Down
41 changes: 40 additions & 1 deletion frontend/forms/OBSBasicProperties.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
Expand Down Expand Up @@ -76,6 +79,42 @@
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="controlsFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<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>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QFrame" name="propertiesFrame">
Expand Down
Loading