mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-09-03 23:26:00 -05:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
bc17f0c708 | ||
|
|
e11499c308 | ||
|
|
e76df589e2 | ||
|
|
1390565fc6 | ||
|
|
d76a37c785 | ||
|
|
ce8a35adea | ||
|
|
9030ba1adf |
16
.github/workflows/build-project.yaml
vendored
16
.github/workflows/build-project.yaml
vendored
@@ -249,6 +249,14 @@ jobs:
|
|||||||
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-sources-${{ needs.check-event.outputs.commitHash }}
|
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-sources-${{ needs.check-event.outputs.commitHash }}
|
||||||
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-source.*
|
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-source.*
|
||||||
|
|
||||||
|
- name: Rename artifacts for Ubuntu 24 🏷️
|
||||||
|
run: |
|
||||||
|
: Rename artifacts for Ubuntu 24 🏷️
|
||||||
|
for f in ${{ github.workspace }}/release/*-x86_64-linux-gnu.*; do
|
||||||
|
[ -e "${f}" ] || continue
|
||||||
|
mv "${f}" "${f/x86_64-linux-gnu/x86_64-ubuntu24.04-linux-gnu}"
|
||||||
|
done
|
||||||
|
|
||||||
- name: Upload Artifacts 📡
|
- name: Upload Artifacts 📡
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
@@ -320,6 +328,14 @@ jobs:
|
|||||||
target: x86_64
|
target: x86_64
|
||||||
config: ${{ needs.check-event.outputs.config }}
|
config: ${{ needs.check-event.outputs.config }}
|
||||||
|
|
||||||
|
- name: Rename artifacts for Ubuntu 26 🏷️
|
||||||
|
run: |
|
||||||
|
: Rename artifacts for Ubuntu 26 🏷️
|
||||||
|
for f in ${{ github.workspace }}/release/*-x86_64-linux-gnu.*; do
|
||||||
|
[ -e "${f}" ] || continue
|
||||||
|
mv "${f}" "${f/x86_64-linux-gnu/x86_64-ubuntu26.04-linux-gnu}"
|
||||||
|
done
|
||||||
|
|
||||||
- name: Upload Artifacts 📡
|
- name: Upload Artifacts 📡
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
|
|||||||
1
.github/workflows/push.yaml
vendored
1
.github/workflows/push.yaml
vendored
@@ -78,6 +78,7 @@ jobs:
|
|||||||
'windows-x64;zip|exe'
|
'windows-x64;zip|exe'
|
||||||
'macos-universal;tar.xz|pkg'
|
'macos-universal;tar.xz|pkg'
|
||||||
'ubuntu-24.04-x86_64;tar.xz|deb|ddeb'
|
'ubuntu-24.04-x86_64;tar.xz|deb|ddeb'
|
||||||
|
'ubuntu-26.04-x86_64;tar.xz|deb|ddeb'
|
||||||
'sources;tar.xz'
|
'sources;tar.xz'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -191,14 +191,21 @@ function(_check_dependencies)
|
|||||||
foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
|
foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
|
||||||
message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
|
message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
|
||||||
|
|
||||||
file(
|
file(DOWNLOAD "${url}" "${dependencies_dir}/${file}"
|
||||||
DOWNLOAD "${url}" "${dependencies_dir}/${file}"
|
STATUS download_status)
|
||||||
STATUS download_status
|
|
||||||
EXPECTED_HASH SHA256=${hash})
|
|
||||||
|
|
||||||
list(GET download_status 0 error_code)
|
list(GET download_status 0 error_code)
|
||||||
list(GET download_status 1 error_message)
|
list(GET download_status 1 error_message)
|
||||||
|
|
||||||
|
if(error_code EQUAL 0)
|
||||||
|
file(SHA256 "${dependencies_dir}/${file}" actual_hash)
|
||||||
|
if(NOT actual_hash STREQUAL hash)
|
||||||
|
set(error_code 1)
|
||||||
|
set(error_message
|
||||||
|
"hash mismatch (expected ${hash}, got ${actual_hash})")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
if(error_code EQUAL 0)
|
if(error_code EQUAL 0)
|
||||||
message(STATUS "Downloading ${url} - success on attempt ${i}")
|
message(STATUS "Downloading ${url} - success on attempt ${i}")
|
||||||
set(download_success TRUE)
|
set(download_success TRUE)
|
||||||
|
|||||||
@@ -904,9 +904,19 @@ AdvSceneSwitcher.condition.streamDeck.stopListen="Stop listening"
|
|||||||
AdvSceneSwitcher.condition.streamDeck.pluginDownload="<html><head/><body><p>The Stream Deck plugin can be found <a href=\"https://github.com/WarmUpTill/advanced-scene-switcher-streamdeck-plugin/releases\"><span style=\" text-decoration: underline; color:#268bd2;\">here on GitHub</span></a>.</p></body></html>"
|
AdvSceneSwitcher.condition.streamDeck.pluginDownload="<html><head/><body><p>The Stream Deck plugin can be found <a href=\"https://github.com/WarmUpTill/advanced-scene-switcher-streamdeck-plugin/releases\"><span style=\" text-decoration: underline; color:#268bd2;\">here on GitHub</span></a>.</p></body></html>"
|
||||||
AdvSceneSwitcher.condition.gameCapture="Game capture"
|
AdvSceneSwitcher.condition.gameCapture="Game capture"
|
||||||
AdvSceneSwitcher.condition.gameCapture.entry="{{sources}}hooked a game."
|
AdvSceneSwitcher.condition.gameCapture.entry="{{sources}}hooked a game."
|
||||||
|
|
||||||
AdvSceneSwitcher.condition.screenshot="Screenshot"
|
AdvSceneSwitcher.condition.screenshot="Screenshot"
|
||||||
AdvSceneSwitcher.condition.screenshot.entry="A screenshot was taken"
|
AdvSceneSwitcher.condition.screenshot.entry="A screenshot was taken"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying="Now Playing"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.checkType.playbackState="Playback state"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.checkType.title="Title"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.checkType.artist="Artist"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.checkType.album="Album"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.checkType.appName="App name"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.playbackState.playing="Playing"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.playbackState.paused="Paused"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.playbackState.stopped="Stopped"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.playbackState.opening="Opening"
|
||||||
|
AdvSceneSwitcher.condition.nowPlaying.playbackState.changing="Changing"
|
||||||
AdvSceneSwitcher.condition.mqtt="MQTT"
|
AdvSceneSwitcher.condition.mqtt="MQTT"
|
||||||
AdvSceneSwitcher.condition.mqtt.layout.match="Message was received from{{connection}} which matches{{regex}}:"
|
AdvSceneSwitcher.condition.mqtt.layout.match="Message was received from{{connection}} which matches{{regex}}:"
|
||||||
AdvSceneSwitcher.condition.mqtt.layout.listen="Set message selection to incoming message:{{listenButton}}"
|
AdvSceneSwitcher.condition.mqtt.layout.listen="Set message selection to incoming message:{{listenButton}}"
|
||||||
@@ -2599,6 +2609,12 @@ AdvSceneSwitcher.tempVar.gameCapture.class.description="Window class of the appl
|
|||||||
AdvSceneSwitcher.tempVar.gameCapture.executable="Executable"
|
AdvSceneSwitcher.tempVar.gameCapture.executable="Executable"
|
||||||
AdvSceneSwitcher.tempVar.gameCapture.executable.description="Executable name of the application captured by the source."
|
AdvSceneSwitcher.tempVar.gameCapture.executable.description="Executable name of the application captured by the source."
|
||||||
|
|
||||||
|
AdvSceneSwitcher.tempVar.nowPlaying.title="Title"
|
||||||
|
AdvSceneSwitcher.tempVar.nowPlaying.artist="Artist"
|
||||||
|
AdvSceneSwitcher.tempVar.nowPlaying.album="Album"
|
||||||
|
AdvSceneSwitcher.tempVar.nowPlaying.appName="App name"
|
||||||
|
AdvSceneSwitcher.tempVar.nowPlaying.playbackStatus="Playback status"
|
||||||
|
|
||||||
AdvSceneSwitcher.tempVar.http.status="Status code"
|
AdvSceneSwitcher.tempVar.http.status="Status code"
|
||||||
AdvSceneSwitcher.tempVar.http.error="Error"
|
AdvSceneSwitcher.tempVar.http.error="Error"
|
||||||
AdvSceneSwitcher.tempVar.http.error.description="Empty when no error occurred.\nOther possible values:\n\n * Could not establish connection\n * Failed to bind IP address\n * Failed to read connection\n * Failed to write connection\n * Maximum redirect count exceeded\n * Connection handling canceled\n * SSL connection failed\n * SSL certificate loading failed\n * SSL server verification failed\n * Unsupported HTTP multipart boundary characters\n * Compression failed\n * Connection timed out\n * Proxy connection failed\n * Unknown"
|
AdvSceneSwitcher.tempVar.http.error.description="Empty when no error occurred.\nOther possible values:\n\n * Could not establish connection\n * Failed to bind IP address\n * Failed to read connection\n * Failed to write connection\n * Maximum redirect count exceeded\n * Connection handling canceled\n * SSL connection failed\n * SSL certificate loading failed\n * SSL server verification failed\n * Unsupported HTTP multipart boundary characters\n * Compression failed\n * Connection timed out\n * Proxy connection failed\n * Unknown"
|
||||||
@@ -3107,3 +3123,6 @@ AdvSceneSwitcher.sceneGroupTab.defaultname="Scene Group %1"
|
|||||||
AdvSceneSwitcher.sceneGroupTab.exists="Scene Group or Scene name exists already"
|
AdvSceneSwitcher.sceneGroupTab.exists="Scene Group or Scene name exists already"
|
||||||
AdvSceneSwitcher.sceneGroupTab.help="Scene Groups can be selected as a target just like a regular scene.\n\nAs the name suggests a scene group is a collection of multiple scenes.\nThe scene group will advance through the list of its assigned scenes depending on the configured settings, which can be found on the right side.\n\nYou can configure the scene group to advance to the next scene in the list:\nAfter a number of times the scene group is selected as a target.\nAfter a certain amount of time has passed.\nOr randomly.\n\nFor example, a scene group containing the scenes ...\nScene 1\nScene 2\nScene 3 \n... will activate \"Scene 1\" the first time it is selected as a target.\nThe second time it will activate \"Scene 2\".\nThe remaining times \"Scene 3\" will be activated.\n\nClick the highlighted plus symbol below to add a new scene group."
|
AdvSceneSwitcher.sceneGroupTab.help="Scene Groups can be selected as a target just like a regular scene.\n\nAs the name suggests a scene group is a collection of multiple scenes.\nThe scene group will advance through the list of its assigned scenes depending on the configured settings, which can be found on the right side.\n\nYou can configure the scene group to advance to the next scene in the list:\nAfter a number of times the scene group is selected as a target.\nAfter a certain amount of time has passed.\nOr randomly.\n\nFor example, a scene group containing the scenes ...\nScene 1\nScene 2\nScene 3 \n... will activate \"Scene 1\" the first time it is selected as a target.\nThe second time it will activate \"Scene 2\".\nThe remaining times \"Scene 3\" will be activated.\n\nClick the highlighted plus symbol below to add a new scene group."
|
||||||
AdvSceneSwitcher.sceneGroupTab.scenes.help="Select the scene group you want to modify on the left.\n\nSelect a scene to add to this scene group by selecting the scene above and clicking the plus symbol below.\n\nA scene can be added multiple times to the same scene group."
|
AdvSceneSwitcher.sceneGroupTab.scenes.help="Select the scene group you want to modify on the left.\n\nSelect a scene to add to this scene group by selecting the scene above and clicking the plus symbol below.\n\nA scene can be added multiple times to the same scene group."
|
||||||
|
AdvSceneSwitcher.kwin.flatpakPermissionWarning="Window detection via KWin is unavailable.\nThe OBS Studio Flatpak sandbox is missing the 'org.kde.KWin' D-Bus permission this feature needs.\nRun the following, then restart OBS:"
|
||||||
|
AdvSceneSwitcher.wayland.flatpakPermissionWarning="Window detection is unavailable.\nThe OBS Studio Flatpak has no X11 access on this Wayland session, and no compatible integration exists yet for this desktop.\nRunning OBS under an X11 session, or a non-Flatpak install, allows this feature to work."
|
||||||
|
AdvSceneSwitcher.flatpakWindowDetectionWarning.doNotShowAgain="Don't show this warning again"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,16 @@
|
|||||||
#include "platform-funcs.hpp"
|
#include "platform-funcs.hpp"
|
||||||
|
|
||||||
#include "log-helper.hpp"
|
#include "log-helper.hpp"
|
||||||
|
#include "obs-module-helper.hpp"
|
||||||
|
#include "plugin-state-helpers.hpp"
|
||||||
|
#include "ui-helpers.hpp"
|
||||||
|
|
||||||
|
#include <obs-frontend-api.h>
|
||||||
|
#include <QCheckBox>
|
||||||
|
#include <QFontDatabase>
|
||||||
|
#include <QGridLayout>
|
||||||
|
#include <QLineEdit>
|
||||||
|
#include <QMessageBox>
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
@@ -628,27 +639,108 @@ int ignoreXerror(Display *d, XErrorEvent *e)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool warnAboutWindowDetectionUnavailable = true;
|
||||||
|
|
||||||
|
static bool setupWindowDetectionWarningPersistence = []() {
|
||||||
|
AddSaveStep([](obs_data_t *obj) {
|
||||||
|
obs_data_set_bool(obj, "warnAboutFlatpakWindowDetection",
|
||||||
|
warnAboutWindowDetectionUnavailable);
|
||||||
|
});
|
||||||
|
AddLoadStep([](obs_data_t *obj) {
|
||||||
|
obs_data_set_default_bool(
|
||||||
|
obj, "warnAboutFlatpakWindowDetection", true);
|
||||||
|
warnAboutWindowDetectionUnavailable = obs_data_get_bool(
|
||||||
|
obj, "warnAboutFlatpakWindowDetection");
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}();
|
||||||
|
|
||||||
|
static void showWindowDetectionWarning(const char *messageId,
|
||||||
|
const char *command)
|
||||||
|
{
|
||||||
|
auto mainWindow =
|
||||||
|
static_cast<QWidget *>(obs_frontend_get_main_window());
|
||||||
|
QMessageBox msgBox(QMessageBox::Warning,
|
||||||
|
obs_module_text("AdvSceneSwitcher.pluginName"),
|
||||||
|
obs_module_text(messageId), QMessageBox::Ok,
|
||||||
|
mainWindow);
|
||||||
|
|
||||||
|
if (command) {
|
||||||
|
auto commandLineEdit = new QLineEdit(command, &msgBox);
|
||||||
|
commandLineEdit->setReadOnly(true);
|
||||||
|
commandLineEdit->setFont(
|
||||||
|
QFontDatabase::systemFont(QFontDatabase::FixedFont));
|
||||||
|
commandLineEdit->setCursorPosition(0);
|
||||||
|
auto layout = qobject_cast<QGridLayout *>(msgBox.layout());
|
||||||
|
if (layout) {
|
||||||
|
layout->addWidget(commandLineEdit, layout->rowCount(),
|
||||||
|
0, 1, layout->columnCount());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto checkbox = new QCheckBox(obs_module_text(
|
||||||
|
"AdvSceneSwitcher.flatpakWindowDetectionWarning.doNotShowAgain"));
|
||||||
|
msgBox.setCheckBox(checkbox);
|
||||||
|
msgBox.exec();
|
||||||
|
warnAboutWindowDetectionUnavailable = !checkbox->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleWindowDetectionUnavailable(bool hasX11)
|
||||||
|
{
|
||||||
|
if (hasX11 || KWin) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!qEnvironmentVariableIsSet("FLATPAK_ID")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const bool onKDE = qEnvironmentVariable("XDG_CURRENT_DESKTOP")
|
||||||
|
.contains("KDE", Qt::CaseInsensitive);
|
||||||
|
const char *messageId =
|
||||||
|
onKDE ? "AdvSceneSwitcher.kwin.flatpakPermissionWarning"
|
||||||
|
: "AdvSceneSwitcher.wayland.flatpakPermissionWarning";
|
||||||
|
const char *command =
|
||||||
|
onKDE ? "flatpak override --user --talk-name=org.kde.KWin com.obsproject.Studio"
|
||||||
|
: nullptr;
|
||||||
|
|
||||||
|
blog(LOG_WARNING,
|
||||||
|
"window detection unavailable: OBS Flatpak sandbox has no X11 "
|
||||||
|
"access on this Wayland session and %s",
|
||||||
|
onKDE ? "the KWin D-Bus compat call was blocked (missing "
|
||||||
|
"'org.kde.KWin' talk-name permission)"
|
||||||
|
: "no compatible native Wayland integration exists for "
|
||||||
|
"this desktop");
|
||||||
|
|
||||||
|
AddFinishedLoadingStep([messageId, command]() {
|
||||||
|
if (!warnAboutWindowDetectionUnavailable) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
showWindowDetectionWarning(messageId, command);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void PlatformInit()
|
void PlatformInit()
|
||||||
{
|
{
|
||||||
|
const bool kwinAvailable = isKWinAvailable();
|
||||||
|
KWin = kwinAvailable && registerKWinDBusListener(¬ifier) &&
|
||||||
|
startKWinScript(KWinScriptObjectPath);
|
||||||
|
if (KWin) {
|
||||||
|
blog(LOG_INFO, "using KWin compat");
|
||||||
|
} else {
|
||||||
|
blog(LOG_INFO, "not using KWin compat");
|
||||||
|
}
|
||||||
|
|
||||||
|
initProcps();
|
||||||
|
initProc2();
|
||||||
|
|
||||||
auto display = disp();
|
auto display = disp();
|
||||||
|
handleWindowDetectionUnavailable(display != nullptr);
|
||||||
if (!display) {
|
if (!display) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
KWin = isKWinAvailable();
|
|
||||||
if (!(KWin && startKWinScript(KWinScriptObjectPath) &&
|
|
||||||
registerKWinDBusListener(¬ifier))) {
|
|
||||||
// something bad happened while trying to initialize
|
|
||||||
// the KWin script/dbus so disable it
|
|
||||||
KWin = false;
|
|
||||||
blog(LOG_INFO, "not using KWin compat");
|
|
||||||
} else {
|
|
||||||
blog(LOG_INFO, "using KWin compat");
|
|
||||||
}
|
|
||||||
|
|
||||||
initXss();
|
initXss();
|
||||||
initProcps();
|
|
||||||
initProc2();
|
|
||||||
XSetErrorHandler(ignoreXerror);
|
XSetErrorHandler(ignoreXerror);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QFileDevice>
|
#include <QFileDevice>
|
||||||
|
#include <QStandardPaths>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
#include <QtDBus/QDBusConnectionInterface>
|
#include <QtDBus/QDBusConnectionInterface>
|
||||||
#include <QtDBus/QDBusInterface>
|
#include <QtDBus/QDBusInterface>
|
||||||
@@ -96,12 +97,16 @@ bool isKWinAvailable()
|
|||||||
|
|
||||||
bool startKWinScript(QString &scriptObjectPath)
|
bool startKWinScript(QString &scriptObjectPath)
|
||||||
{
|
{
|
||||||
|
// Not RuntimeLocation: under Flatpak, $XDG_RUNTIME_DIR is private to
|
||||||
|
// the sandbox, so the unsandboxed KWin process can't read it back.
|
||||||
const QString scriptPath =
|
const QString scriptPath =
|
||||||
"/tmp/AdvancedSceneSwitcher/KWinFocusNotifier.js";
|
QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::CacheLocation) +
|
||||||
|
"/AdvancedSceneSwitcher/KWinFocusNotifier.js";
|
||||||
|
|
||||||
const QString script =
|
const QString script =
|
||||||
R"(var adss = "com.github.AdvancedSceneSwitcher";
|
R"(var adss = "com.obsproject.Studio.Plugin.SceneSwitcher";
|
||||||
var adssPath = "/com/github/AdvancedSceneSwitcher";
|
var adssPath = "/com/obsproject/Studio/Plugin/SceneSwitcher";
|
||||||
|
|
||||||
function trackWindow(window) {
|
function trackWindow(window) {
|
||||||
var id = window.internalId.toString();
|
var id = window.internalId.toString();
|
||||||
@@ -129,7 +134,8 @@ workspace.windowActivated.connect(function(client) {
|
|||||||
}))";
|
}))";
|
||||||
|
|
||||||
if (const QDir dir; !dir.mkpath(QFileInfo(scriptPath).absolutePath())) {
|
if (const QDir dir; !dir.mkpath(QFileInfo(scriptPath).absolutePath())) {
|
||||||
blog(LOG_ERROR, "error creating /tmp/AdvancedSceneSwitcher");
|
blog(LOG_ERROR,
|
||||||
|
"error creating KWinFocusNotifier script directory");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,8 +204,10 @@ bool stopKWinScript(const QString &scriptObjectPath)
|
|||||||
|
|
||||||
bool registerKWinDBusListener(FocusNotifier *notifier)
|
bool registerKWinDBusListener(FocusNotifier *notifier)
|
||||||
{
|
{
|
||||||
static const QString serviceName = "com.github.AdvancedSceneSwitcher";
|
static const QString serviceName =
|
||||||
static const QString objectPath = "/com/github/AdvancedSceneSwitcher";
|
"com.obsproject.Studio.Plugin.SceneSwitcher";
|
||||||
|
static const QString objectPath =
|
||||||
|
"/com/obsproject/Studio/Plugin/SceneSwitcher";
|
||||||
auto bus = QDBusConnection::sessionBus();
|
auto bus = QDBusConnection::sessionBus();
|
||||||
|
|
||||||
if (bus.objectRegisteredAt(objectPath)) {
|
if (bus.objectRegisteredAt(objectPath)) {
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ namespace advss {
|
|||||||
|
|
||||||
class FocusNotifier final : public QObject {
|
class FocusNotifier final : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_CLASSINFO("D-Bus Interface", "com.github.AdvancedSceneSwitcher")
|
Q_CLASSINFO("D-Bus Interface",
|
||||||
|
"com.obsproject.Studio.Plugin.SceneSwitcher")
|
||||||
|
|
||||||
static std::mutex _mutex;
|
static std::mutex _mutex;
|
||||||
static int activePID;
|
static int activePID;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "websocket-api.hpp"
|
#include "websocket-api.hpp"
|
||||||
#include "obs-websocket-api.h"
|
#include "obs-websocket-api.h"
|
||||||
#include "plugin-state-helpers.hpp"
|
#include "plugin-state-helpers.hpp"
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
// Must be after "obs-websocket-api.h" to avoid logging function conflict
|
// Must be after "obs-websocket-api.h" to avoid logging function conflict
|
||||||
#include "log-helper.hpp"
|
#include "log-helper.hpp"
|
||||||
@@ -15,6 +16,7 @@ static constexpr char VendorName[] = "AdvancedSceneSwitcher";
|
|||||||
static constexpr char VendorRequestStart[] = "AdvancedSceneSwitcherStart";
|
static constexpr char VendorRequestStart[] = "AdvancedSceneSwitcherStart";
|
||||||
static constexpr char VendorRequestStop[] = "AdvancedSceneSwitcherStop";
|
static constexpr char VendorRequestStop[] = "AdvancedSceneSwitcherStop";
|
||||||
static constexpr char VendorRequestStatus[] = "IsAdvancedSceneSwitcherRunning";
|
static constexpr char VendorRequestStatus[] = "IsAdvancedSceneSwitcherRunning";
|
||||||
|
static constexpr char VendorRequestVersion[] = "AdvancedSceneSwitcherVersion";
|
||||||
static obs_websocket_vendor vendor;
|
static obs_websocket_vendor vendor;
|
||||||
|
|
||||||
static void registerWebsocketVendor();
|
static void registerWebsocketVendor();
|
||||||
@@ -82,6 +84,12 @@ static void registerWebsocketVendor()
|
|||||||
obs_data_set_bool(response, "isRunning",
|
obs_data_set_bool(response, "isRunning",
|
||||||
PluginIsRunning());
|
PluginIsRunning());
|
||||||
});
|
});
|
||||||
|
registerWebsocketVendorRequest(
|
||||||
|
VendorRequestVersion,
|
||||||
|
[](obs_data_t *, obs_data_t *response, void *) {
|
||||||
|
obs_data_set_string(response, "version", g_GIT_TAG);
|
||||||
|
obs_data_set_string(response, "commit", g_GIT_SHA1);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *GetWebsocketVendorName()
|
const char *GetWebsocketVendorName()
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ add_plugin(twitch)
|
|||||||
add_plugin(usb)
|
add_plugin(usb)
|
||||||
add_plugin(video)
|
add_plugin(video)
|
||||||
add_plugin(speech)
|
add_plugin(speech)
|
||||||
|
add_plugin(now-playing)
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------- #
|
# ---------------------------------------------------------------------------- #
|
||||||
|
|
||||||
|
|||||||
17
plugins/now-playing/CMakeLists.txt
Normal file
17
plugins/now-playing/CMakeLists.txt
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.14)
|
||||||
|
project(advanced-scene-switcher-now-playing)
|
||||||
|
|
||||||
|
if(NOT WIN32)
|
||||||
|
message(WARNING "Now playing condition is only supported on Windows.")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_library(${PROJECT_NAME} MODULE)
|
||||||
|
target_sources(${PROJECT_NAME} PRIVATE macro-condition-now-playing.cpp
|
||||||
|
macro-condition-now-playing.hpp)
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE windowsapp)
|
||||||
|
|
||||||
|
setup_advss_plugin(${PROJECT_NAME})
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
|
||||||
|
install_advss_plugin(${PROJECT_NAME})
|
||||||
338
plugins/now-playing/macro-condition-now-playing.cpp
Normal file
338
plugins/now-playing/macro-condition-now-playing.cpp
Normal file
@@ -0,0 +1,338 @@
|
|||||||
|
#include "macro-condition-now-playing.hpp"
|
||||||
|
#include "layout-helpers.hpp"
|
||||||
|
#include "sync-helpers.hpp"
|
||||||
|
|
||||||
|
#include <util/base.h>
|
||||||
|
|
||||||
|
#include <roapi.h>
|
||||||
|
#include <winrt/Windows.Foundation.h>
|
||||||
|
#include <winrt/Windows.Media.Control.h>
|
||||||
|
|
||||||
|
namespace advss {
|
||||||
|
|
||||||
|
using namespace winrt::Windows::Media::Control;
|
||||||
|
|
||||||
|
const std::string MacroConditionNowPlaying::id = "now_playing";
|
||||||
|
|
||||||
|
bool MacroConditionNowPlaying::_registered = MacroConditionFactory::Register(
|
||||||
|
MacroConditionNowPlaying::id,
|
||||||
|
{MacroConditionNowPlaying::Create, MacroConditionNowPlayingEdit::Create,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying"});
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
struct SessionInfo {
|
||||||
|
bool hasSession = false;
|
||||||
|
std::string title;
|
||||||
|
std::string artist;
|
||||||
|
std::string album;
|
||||||
|
std::string appName;
|
||||||
|
GlobalSystemMediaTransportControlsSessionPlaybackStatus playbackStatus =
|
||||||
|
GlobalSystemMediaTransportControlsSessionPlaybackStatus::Closed;
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool initWinRT()
|
||||||
|
{
|
||||||
|
HRESULT hr = RoInitialize(RO_INIT_MULTITHREADED);
|
||||||
|
// S_OK: initialized, S_FALSE: already initialized with same type,
|
||||||
|
// RPC_E_CHANGED_MODE: thread is STA (OBS UI thread) - WinRT still usable
|
||||||
|
return SUCCEEDED(hr) || hr == RPC_E_CHANGED_MODE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static SessionInfo getCurrentSessionInfo()
|
||||||
|
{
|
||||||
|
thread_local bool initialized = initWinRT();
|
||||||
|
(void)initialized;
|
||||||
|
|
||||||
|
SessionInfo info;
|
||||||
|
|
||||||
|
try {
|
||||||
|
auto manager =
|
||||||
|
GlobalSystemMediaTransportControlsSessionManager::
|
||||||
|
RequestAsync()
|
||||||
|
.get();
|
||||||
|
auto session = manager.GetCurrentSession();
|
||||||
|
if (!session) {
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
|
info.hasSession = true;
|
||||||
|
info.appName = winrt::to_string(session.SourceAppUserModelId());
|
||||||
|
|
||||||
|
auto playbackInfo = session.GetPlaybackInfo();
|
||||||
|
info.playbackStatus = playbackInfo.PlaybackStatus();
|
||||||
|
|
||||||
|
auto props = session.TryGetMediaPropertiesAsync().get();
|
||||||
|
if (props) {
|
||||||
|
info.title = winrt::to_string(props.Title());
|
||||||
|
info.artist = winrt::to_string(props.Artist());
|
||||||
|
info.album = winrt::to_string(props.AlbumTitle());
|
||||||
|
}
|
||||||
|
} catch (const winrt::hresult_error &e) {
|
||||||
|
blog(LOG_WARNING, "now playing: WinRT error 0x%08X",
|
||||||
|
static_cast<uint32_t>(e.code()));
|
||||||
|
}
|
||||||
|
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
|
static std::string PlaybackStatusToString(
|
||||||
|
GlobalSystemMediaTransportControlsSessionPlaybackStatus status)
|
||||||
|
{
|
||||||
|
switch (status) {
|
||||||
|
case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Playing:
|
||||||
|
return "Playing";
|
||||||
|
case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Paused:
|
||||||
|
return "Paused";
|
||||||
|
case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Stopped:
|
||||||
|
return "Stopped";
|
||||||
|
case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Opened:
|
||||||
|
return "Opening";
|
||||||
|
case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Changing:
|
||||||
|
return "Changing";
|
||||||
|
default:
|
||||||
|
return "Closed";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
bool MacroConditionNowPlaying::CheckCondition()
|
||||||
|
{
|
||||||
|
const auto info = getCurrentSessionInfo();
|
||||||
|
|
||||||
|
SetTempVarValue("title", info.title);
|
||||||
|
SetTempVarValue("artist", info.artist);
|
||||||
|
SetTempVarValue("album", info.album);
|
||||||
|
SetTempVarValue("appName", info.appName);
|
||||||
|
SetTempVarValue("playbackStatus",
|
||||||
|
PlaybackStatusToString(info.playbackStatus));
|
||||||
|
|
||||||
|
if (!info.hasSession) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto textMatches = [this](const std::string &field) -> bool {
|
||||||
|
const QString pattern = QString::fromStdString(_matchText);
|
||||||
|
const QString value = QString::fromStdString(field);
|
||||||
|
if (_regex.Enabled()) {
|
||||||
|
return _regex.Matches(value, pattern);
|
||||||
|
}
|
||||||
|
return value == pattern;
|
||||||
|
};
|
||||||
|
|
||||||
|
switch (_checkType) {
|
||||||
|
case CheckType::PLAYBACK_STATE: {
|
||||||
|
using S =
|
||||||
|
GlobalSystemMediaTransportControlsSessionPlaybackStatus;
|
||||||
|
switch (_playbackState) {
|
||||||
|
case PlaybackState::PLAYING:
|
||||||
|
return info.playbackStatus == S::Playing;
|
||||||
|
case PlaybackState::PAUSED:
|
||||||
|
return info.playbackStatus == S::Paused;
|
||||||
|
case PlaybackState::STOPPED:
|
||||||
|
return info.playbackStatus == S::Stopped;
|
||||||
|
case PlaybackState::OPENING:
|
||||||
|
return info.playbackStatus == S::Opened;
|
||||||
|
case PlaybackState::CHANGING:
|
||||||
|
return info.playbackStatus == S::Changing;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case CheckType::TITLE:
|
||||||
|
return textMatches(info.title);
|
||||||
|
case CheckType::ARTIST:
|
||||||
|
return textMatches(info.artist);
|
||||||
|
case CheckType::ALBUM:
|
||||||
|
return textMatches(info.album);
|
||||||
|
case CheckType::APP_NAME:
|
||||||
|
return textMatches(info.appName);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MacroConditionNowPlaying::Save(obs_data_t *obj) const
|
||||||
|
{
|
||||||
|
MacroCondition::Save(obj);
|
||||||
|
obs_data_set_int(obj, "checkType", static_cast<int>(_checkType));
|
||||||
|
obs_data_set_int(obj, "playbackState",
|
||||||
|
static_cast<int>(_playbackState));
|
||||||
|
_matchText.Save(obj, "matchText");
|
||||||
|
_regex.Save(obj);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MacroConditionNowPlaying::Load(obs_data_t *obj)
|
||||||
|
{
|
||||||
|
MacroCondition::Load(obj);
|
||||||
|
_checkType = static_cast<CheckType>(obs_data_get_int(obj, "checkType"));
|
||||||
|
_playbackState = static_cast<PlaybackState>(
|
||||||
|
obs_data_get_int(obj, "playbackState"));
|
||||||
|
_matchText.Load(obj, "matchText");
|
||||||
|
_regex.Load(obj);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlaying::SetupTempVars()
|
||||||
|
{
|
||||||
|
AddTempvar(
|
||||||
|
"title",
|
||||||
|
obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.title"));
|
||||||
|
AddTempvar(
|
||||||
|
"artist",
|
||||||
|
obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.artist"));
|
||||||
|
AddTempvar(
|
||||||
|
"album",
|
||||||
|
obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.album"));
|
||||||
|
AddTempvar(
|
||||||
|
"appName",
|
||||||
|
obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.appName"));
|
||||||
|
AddTempvar(
|
||||||
|
"playbackStatus",
|
||||||
|
obs_module_text(
|
||||||
|
"AdvSceneSwitcher.tempVar.nowPlaying.playbackStatus"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
static void populateCheckTypeSelection(QComboBox *list)
|
||||||
|
{
|
||||||
|
static const std::map<MacroConditionNowPlaying::CheckType, std::string> checkTypes = {
|
||||||
|
{MacroConditionNowPlaying::CheckType::PLAYBACK_STATE,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.checkType.playbackState"},
|
||||||
|
{MacroConditionNowPlaying::CheckType::TITLE,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.checkType.title"},
|
||||||
|
{MacroConditionNowPlaying::CheckType::ARTIST,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.checkType.artist"},
|
||||||
|
{MacroConditionNowPlaying::CheckType::ALBUM,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.checkType.album"},
|
||||||
|
{MacroConditionNowPlaying::CheckType::APP_NAME,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.checkType.appName"},
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const auto &[type, name] : checkTypes) {
|
||||||
|
list->addItem(obs_module_text(name.c_str()),
|
||||||
|
static_cast<int>(type));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void populatePlaybackStateSelection(QComboBox *list)
|
||||||
|
{
|
||||||
|
static const std::map<MacroConditionNowPlaying::PlaybackState, std::string> playbackStates = {
|
||||||
|
{MacroConditionNowPlaying::PlaybackState::PLAYING,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.playbackState.playing"},
|
||||||
|
{MacroConditionNowPlaying::PlaybackState::PAUSED,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.playbackState.paused"},
|
||||||
|
{MacroConditionNowPlaying::PlaybackState::STOPPED,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.playbackState.stopped"},
|
||||||
|
{MacroConditionNowPlaying::PlaybackState::OPENING,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.playbackState.opening"},
|
||||||
|
{MacroConditionNowPlaying::PlaybackState::CHANGING,
|
||||||
|
"AdvSceneSwitcher.condition.nowPlaying.playbackState.changing"},
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const auto &[state, name] : playbackStates) {
|
||||||
|
list->addItem(obs_module_text(name.c_str()),
|
||||||
|
static_cast<int>(state));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MacroConditionNowPlayingEdit::MacroConditionNowPlayingEdit(
|
||||||
|
QWidget *parent, std::shared_ptr<MacroConditionNowPlaying> entryData)
|
||||||
|
: QWidget(parent),
|
||||||
|
_checkType(new QComboBox(this)),
|
||||||
|
_playbackState(new QComboBox(this)),
|
||||||
|
_matchText(new VariableLineEdit(this)),
|
||||||
|
_regex(new RegexConfigWidget(this))
|
||||||
|
{
|
||||||
|
populateCheckTypeSelection(_checkType);
|
||||||
|
populatePlaybackStateSelection(_playbackState);
|
||||||
|
|
||||||
|
connect(_checkType, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||||
|
this, &MacroConditionNowPlayingEdit::CheckTypeChanged);
|
||||||
|
connect(_playbackState,
|
||||||
|
QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||||
|
&MacroConditionNowPlayingEdit::PlaybackStateChanged);
|
||||||
|
connect(_matchText, &VariableLineEdit::textEdited, this,
|
||||||
|
&MacroConditionNowPlayingEdit::MatchTextChanged);
|
||||||
|
connect(_regex, &RegexConfigWidget::RegexConfigChanged, this,
|
||||||
|
&MacroConditionNowPlayingEdit::RegexChanged);
|
||||||
|
|
||||||
|
_layout = new QHBoxLayout();
|
||||||
|
_layout->addWidget(_checkType);
|
||||||
|
_layout->addWidget(_playbackState);
|
||||||
|
_layout->addWidget(_matchText);
|
||||||
|
_layout->addWidget(_regex);
|
||||||
|
setLayout(_layout);
|
||||||
|
|
||||||
|
_entryData = entryData;
|
||||||
|
UpdateEntryData();
|
||||||
|
_loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlayingEdit::UpdateEntryData()
|
||||||
|
{
|
||||||
|
if (!_entryData) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_checkType->setCurrentIndex(
|
||||||
|
_checkType->findData(static_cast<int>(_entryData->_checkType)));
|
||||||
|
_playbackState->setCurrentIndex(_playbackState->findData(
|
||||||
|
static_cast<int>(_entryData->_playbackState)));
|
||||||
|
_matchText->setText(QString::fromStdString(_entryData->_matchText));
|
||||||
|
_regex->SetRegexConfig(_entryData->_regex);
|
||||||
|
|
||||||
|
SetWidgetVisibility();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlayingEdit::CheckTypeChanged(int)
|
||||||
|
{
|
||||||
|
GUARD_LOADING_AND_LOCK();
|
||||||
|
_entryData->_checkType =
|
||||||
|
static_cast<MacroConditionNowPlaying::CheckType>(
|
||||||
|
_checkType->currentData().toInt());
|
||||||
|
SetWidgetVisibility();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlayingEdit::PlaybackStateChanged(int)
|
||||||
|
{
|
||||||
|
GUARD_LOADING_AND_LOCK();
|
||||||
|
_entryData->_playbackState =
|
||||||
|
static_cast<MacroConditionNowPlaying::PlaybackState>(
|
||||||
|
_playbackState->currentData().toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlayingEdit::MatchTextChanged(const QString &text)
|
||||||
|
{
|
||||||
|
GUARD_LOADING_AND_LOCK();
|
||||||
|
_entryData->_matchText = text.toStdString();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlayingEdit::RegexChanged(const RegexConfig ®ex)
|
||||||
|
{
|
||||||
|
GUARD_LOADING_AND_LOCK();
|
||||||
|
_entryData->_regex = regex;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MacroConditionNowPlayingEdit::SetWidgetVisibility()
|
||||||
|
{
|
||||||
|
const bool isStateCheck =
|
||||||
|
_entryData->_checkType ==
|
||||||
|
MacroConditionNowPlaying::CheckType::PLAYBACK_STATE;
|
||||||
|
_playbackState->setVisible(isStateCheck);
|
||||||
|
_matchText->setVisible(!isStateCheck);
|
||||||
|
_regex->setVisible(!isStateCheck);
|
||||||
|
|
||||||
|
if (isStateCheck) {
|
||||||
|
AddStretchIfNecessary(_layout);
|
||||||
|
} else {
|
||||||
|
RemoveStretchIfPresent(_layout);
|
||||||
|
}
|
||||||
|
|
||||||
|
adjustSize();
|
||||||
|
updateGeometry();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace advss
|
||||||
86
plugins/now-playing/macro-condition-now-playing.hpp
Normal file
86
plugins/now-playing/macro-condition-now-playing.hpp
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "macro-condition-edit.hpp"
|
||||||
|
#include "regex-config.hpp"
|
||||||
|
#include "variable-line-edit.hpp"
|
||||||
|
|
||||||
|
#include <QComboBox>
|
||||||
|
|
||||||
|
namespace advss {
|
||||||
|
|
||||||
|
class MacroConditionNowPlaying : public MacroCondition {
|
||||||
|
public:
|
||||||
|
enum class CheckType {
|
||||||
|
PLAYBACK_STATE,
|
||||||
|
TITLE,
|
||||||
|
ARTIST,
|
||||||
|
ALBUM,
|
||||||
|
APP_NAME,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class PlaybackState {
|
||||||
|
PLAYING,
|
||||||
|
PAUSED,
|
||||||
|
STOPPED,
|
||||||
|
OPENING,
|
||||||
|
CHANGING,
|
||||||
|
};
|
||||||
|
|
||||||
|
MacroConditionNowPlaying(Macro *m) : MacroCondition(m) {}
|
||||||
|
bool CheckCondition();
|
||||||
|
bool Save(obs_data_t *obj) const;
|
||||||
|
bool Load(obs_data_t *obj);
|
||||||
|
std::string GetId() const { return id; }
|
||||||
|
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||||
|
{
|
||||||
|
return std::make_shared<MacroConditionNowPlaying>(m);
|
||||||
|
}
|
||||||
|
|
||||||
|
CheckType _checkType = CheckType::PLAYBACK_STATE;
|
||||||
|
PlaybackState _playbackState = PlaybackState::PLAYING;
|
||||||
|
StringVariable _matchText;
|
||||||
|
RegexConfig _regex;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void SetupTempVars();
|
||||||
|
|
||||||
|
static bool _registered;
|
||||||
|
static const std::string id;
|
||||||
|
};
|
||||||
|
|
||||||
|
class MacroConditionNowPlayingEdit : public QWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
MacroConditionNowPlayingEdit(
|
||||||
|
QWidget *parent,
|
||||||
|
std::shared_ptr<MacroConditionNowPlaying> cond = nullptr);
|
||||||
|
void UpdateEntryData();
|
||||||
|
static QWidget *Create(QWidget *parent,
|
||||||
|
std::shared_ptr<MacroCondition> cond)
|
||||||
|
{
|
||||||
|
return new MacroConditionNowPlayingEdit(
|
||||||
|
parent,
|
||||||
|
std::dynamic_pointer_cast<MacroConditionNowPlaying>(
|
||||||
|
cond));
|
||||||
|
}
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void CheckTypeChanged(int);
|
||||||
|
void PlaybackStateChanged(int);
|
||||||
|
void MatchTextChanged(const QString &);
|
||||||
|
void RegexChanged(const RegexConfig &);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void SetWidgetVisibility();
|
||||||
|
|
||||||
|
QHBoxLayout *_layout;
|
||||||
|
QComboBox *_checkType;
|
||||||
|
QComboBox *_playbackState;
|
||||||
|
VariableLineEdit *_matchText;
|
||||||
|
RegexConfigWidget *_regex;
|
||||||
|
|
||||||
|
std::shared_ptr<MacroConditionNowPlaying> _entryData;
|
||||||
|
bool _loading = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace advss
|
||||||
@@ -61,9 +61,14 @@ function(_advss_whisper_suppress_werror dir)
|
|||||||
endif()
|
endif()
|
||||||
target_compile_options(
|
target_compile_options(
|
||||||
${_target}
|
${_target}
|
||||||
PRIVATE $<$<C_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error>
|
PRIVATE $<$<C_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error
|
||||||
$<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error>
|
-Wno-shorten-64-to-32
|
||||||
$<$<C_COMPILER_ID:MSVC>:/WX-> $<$<CXX_COMPILER_ID:MSVC>:/WX->)
|
-Wno-ambiguous-macro>
|
||||||
|
$<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error
|
||||||
|
-Wno-shorten-64-to-32
|
||||||
|
-Wno-ambiguous-macro>
|
||||||
|
$<$<C_COMPILER_ID:MSVC>:/WX->
|
||||||
|
$<$<CXX_COMPILER_ID:MSVC>:/WX->)
|
||||||
endforeach()
|
endforeach()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user