Mirrors/obs-aitum-multistream
1
0
Fork 0
mirror of https://github.com/Aitum/obs-aitum-multistream.git synced 2024-11-21 18:02:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Validate output name unique

Browse Source
This commit is contained in:
Exeldro 2024-07-31 11:08:09 +02:00
parent bf56b6f853
commit 6c4d065cb3
No known key found for this signature in database
GPG Key ID: 97269A83FC715751
4 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
config-dialog.cpp
View File

@ -196,7 +196,19 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
addButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall"))); addButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall")));
connect(addButton, &QPushButton::clicked, [this] { connect(addButton, &QPushButton::clicked, [this] {
auto outputDialog = new OutputDialog(this); QStringList otherNames;
auto outputs = obs_data_get_array(settings, "outputs");
obs_data_array_enum(
outputs,
[](obs_data_t *data, void *param) {
auto otherNames = (QStringList *)param;
otherNames->append(QString::fromUtf8(obs_data_get_string(data, "name")));
},
&otherNames);
obs_data_array_release(outputs);
otherNames.removeDuplicates();
otherNames.removeOne(QString::fromUtf8(obs_data_get_string(settings, "name")));
auto outputDialog = new OutputDialog(this, otherNames);
outputDialog->setWindowModality(Qt::WindowModal); outputDialog->setWindowModality(Qt::WindowModal);
outputDialog->setModal(true); outputDialog->setModal(true);
@ -282,7 +294,17 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
verticalAddButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall"))); verticalAddButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall")));
connect(verticalAddButton, &QPushButton::clicked, [this] { connect(verticalAddButton, &QPushButton::clicked, [this] {
auto outputDialog = new OutputDialog(this); QStringList otherNames;
obs_data_array_enum(
vertical_outputs,
[](obs_data_t *data, void *param) {
auto otherNames = (QStringList *)param;
otherNames->append(QString::fromUtf8(obs_data_get_string(data, "name")));
},
&otherNames);
otherNames.removeDuplicates();
otherNames.removeOne(QString::fromUtf8(obs_data_get_string(settings, "name")));
auto outputDialog = new OutputDialog(this, otherNames);
outputDialog->setWindowModality(Qt::WindowModal); outputDialog->setWindowModality(Qt::WindowModal);
outputDialog->setModal(true); outputDialog->setModal(true);
@ -875,10 +897,20 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
auto editButton = new QPushButton(QString::fromUtf8(obs_module_text("EditServerSettings"))); auto editButton = new QPushButton(QString::fromUtf8(obs_module_text("EditServerSettings")));
editButton->setProperty("themeID", "configIconSmall"); editButton->setProperty("themeID", "configIconSmall");
connect(editButton, &QPushButton::clicked, [this, settings] { connect(editButton, &QPushButton::clicked, [this, settings, outputs] {
QStringList otherNames;
obs_data_array_enum(
outputs,
[](obs_data_t *data, void *param) {
auto otherNames = (QStringList *)param;
otherNames->append(QString::fromUtf8(obs_data_get_string(data, "name")));
},
&otherNames);
otherNames.removeDuplicates();
otherNames.removeOne(QString::fromUtf8(obs_data_get_string(settings, "name")));
auto outputDialog = new OutputDialog(this, obs_data_get_string(settings, "name"), auto outputDialog = new OutputDialog(this, obs_data_get_string(settings, "name"),
obs_data_get_string(settings, "stream_server"), obs_data_get_string(settings, "stream_server"),
obs_data_get_string(settings, "stream_key")); obs_data_get_string(settings, "stream_key"), otherNames);
outputDialog->setWindowModality(Qt::WindowModal); outputDialog->setWindowModality(Qt::WindowModal);
outputDialog->setModal(true); outputDialog->setModal(true);

1
multistream.cpp
View File

@ -55,7 +55,6 @@ bool version_info_downloaded(void *param, struct file_download_data *file)
bool obs_module_load(void) bool obs_module_load(void)
{ {
//return true;
blog(LOG_INFO, "[Aitum-Multistream] loaded version %s", PROJECT_VERSION); blog(LOG_INFO, "[Aitum-Multistream] loaded version %s", PROJECT_VERSION);
const auto main_window = static_cast<QMainWindow *>(obs_frontend_get_main_window()); const auto main_window = static_cast<QMainWindow *>(obs_frontend_get_main_window());

8
output-dialog.cpp
View File

@ -33,7 +33,7 @@ void OutputDialog::acceptOutputs()
void OutputDialog::validateOutputs(QPushButton *confirmButton) void OutputDialog::validateOutputs(QPushButton *confirmButton)
{ {
if (outputName.isEmpty()) { if (outputName.isEmpty() || otherNames.contains(outputName)) {
confirmButton->setEnabled(false); confirmButton->setEnabled(false);
} else if (outputServer.isEmpty()) { } else if (outputServer.isEmpty()) {
confirmButton->setEnabled(false); confirmButton->setEnabled(false);
@ -241,7 +241,7 @@ obs_data_t *OutputDialog::getService(std::string serviceName)
return nullptr; return nullptr;
} }
OutputDialog::OutputDialog(QDialog *parent) : QDialog(parent) OutputDialog::OutputDialog(QDialog *parent, QStringList _otherNames) : QDialog(parent), otherNames(_otherNames)
{ {
// Load the services from rtmp-services plugin // Load the services from rtmp-services plugin
auto servicesPath = obs_module_get_config_path(obs_get_module("rtmp-services"), "services.json"); auto servicesPath = obs_module_get_config_path(obs_get_module("rtmp-services"), "services.json");
@ -293,7 +293,9 @@ OutputDialog::OutputDialog(QDialog *parent) : QDialog(parent)
} }
// Edit mode // Edit mode
OutputDialog::OutputDialog(QDialog *parent, QString name, QString server, QString key) : QDialog(parent) OutputDialog::OutputDialog(QDialog *parent, QString name, QString server, QString key, QStringList _otherNames)
: QDialog(parent),
otherNames(_otherNames)
{ {
// Load the services from rtmp-services plugin // Load the services from rtmp-services plugin

5
output-dialog.hpp
View File

@ -54,10 +54,11 @@ private:
obs_data_t *getService(std::string serviceName); obs_data_t *getService(std::string serviceName);
QStackedWidget *stackedWidget; QStackedWidget *stackedWidget;
QStringList otherNames;
public: public:
OutputDialog(QDialog *parent); OutputDialog(QDialog *parent, QStringList otherNames);
OutputDialog(QDialog *parent, QString name, QString server, QString key); OutputDialog(QDialog *parent, QString name, QString server, QString key, QStringList otherNames);
QString outputName; QString outputName;
QString outputServer; QString outputServer;