mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-09-07 00:56:00 -05:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
465f55d3f3 | ||
|
|
9758c14c33 | ||
|
|
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)
|
||||||
|
|||||||
@@ -973,6 +973,7 @@ AdvSceneSwitcher.action.playAudio.monitorUnavailable="Audio monitoring not avail
|
|||||||
AdvSceneSwitcher.action.playAudio.tracks="Tracks"
|
AdvSceneSwitcher.action.playAudio.tracks="Tracks"
|
||||||
AdvSceneSwitcher.action.playAudio.layout.startOffset="{{useStartOffset}}Start at{{startOffset}}"
|
AdvSceneSwitcher.action.playAudio.layout.startOffset="{{useStartOffset}}Start at{{startOffset}}"
|
||||||
AdvSceneSwitcher.action.playAudio.layout.playbackDuration="{{useDuration}}Play for{{playbackDuration}}(0 = until end)"
|
AdvSceneSwitcher.action.playAudio.layout.playbackDuration="{{useDuration}}Play for{{playbackDuration}}(0 = until end)"
|
||||||
|
AdvSceneSwitcher.action.playAudio.mono="Mono"
|
||||||
AdvSceneSwitcher.action.recording="Recording"
|
AdvSceneSwitcher.action.recording="Recording"
|
||||||
AdvSceneSwitcher.action.recording.type.stop="Stop recording"
|
AdvSceneSwitcher.action.recording.type.stop="Stop recording"
|
||||||
AdvSceneSwitcher.action.recording.type.start="Start recording"
|
AdvSceneSwitcher.action.recording.type.start="Start recording"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -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()
|
||||||
|
|||||||
@@ -2,18 +2,64 @@
|
|||||||
#include "audio-helpers.hpp"
|
#include "audio-helpers.hpp"
|
||||||
#include "layout-helpers.hpp"
|
#include "layout-helpers.hpp"
|
||||||
#include "macro-helpers.hpp"
|
#include "macro-helpers.hpp"
|
||||||
|
#include "plugin-state-helpers.hpp"
|
||||||
#include "sync-helpers.hpp"
|
#include "sync-helpers.hpp"
|
||||||
|
|
||||||
|
#include <obs-frontend-api.h>
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <mutex>
|
||||||
|
#include <set>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
|
|
||||||
namespace advss {
|
namespace advss {
|
||||||
|
|
||||||
// Use a high output channel index that is unlikely to be claimed by OBS or
|
|
||||||
// other plugins. OBS supports channels 0-63; channel 0 is the main scene.
|
|
||||||
static constexpr uint32_t kPlaybackOutputChannel = 63;
|
static constexpr uint32_t kPlaybackOutputChannel = 63;
|
||||||
|
|
||||||
|
// Tracks rawSource handles held by background cleanup threads so they can be
|
||||||
|
// stopped early when OBS begins shutdown, before audio is freed.
|
||||||
|
static std::mutex g_activeSourcesMutex;
|
||||||
|
static std::set<obs_source_t *> g_activeSources;
|
||||||
|
|
||||||
|
static void registerActiveSource(obs_source_t *source)
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(g_activeSourcesMutex);
|
||||||
|
g_activeSources.insert(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unregisterActiveSource(obs_source_t *source)
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(g_activeSourcesMutex);
|
||||||
|
g_activeSources.erase(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void stopAllActiveSources()
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(g_activeSourcesMutex);
|
||||||
|
for (auto *source : g_activeSources) {
|
||||||
|
obs_source_media_stop(source);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleObsEvent(enum obs_frontend_event event, void *)
|
||||||
|
{
|
||||||
|
if (event == OBS_FRONTEND_EVENT_SCRIPTING_SHUTDOWN ||
|
||||||
|
event == OBS_FRONTEND_EVENT_EXIT) {
|
||||||
|
stopAllActiveSources();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool setup()
|
||||||
|
{
|
||||||
|
AddPluginPostLoadStep([]() {
|
||||||
|
obs_frontend_add_event_callback(handleObsEvent, nullptr);
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool setupDone = setup();
|
||||||
|
|
||||||
const std::string MacroActionPlayAudio::id = "play_audio";
|
const std::string MacroActionPlayAudio::id = "play_audio";
|
||||||
|
|
||||||
bool MacroActionPlayAudio::_registered = MacroActionFactory::Register(
|
bool MacroActionPlayAudio::_registered = MacroActionFactory::Register(
|
||||||
@@ -23,6 +69,7 @@ bool MacroActionPlayAudio::_registered = MacroActionFactory::Register(
|
|||||||
|
|
||||||
static void deactivatePlayback(obs_source_t *source, bool wantsOutput)
|
static void deactivatePlayback(obs_source_t *source, bool wantsOutput)
|
||||||
{
|
{
|
||||||
|
obs_source_media_stop(source);
|
||||||
if (wantsOutput) {
|
if (wantsOutput) {
|
||||||
obs_set_output_source(kPlaybackOutputChannel, nullptr);
|
obs_set_output_source(kPlaybackOutputChannel, nullptr);
|
||||||
} else {
|
} else {
|
||||||
@@ -38,8 +85,7 @@ static void waitForPlaybackToEnd(Macro *macro, obs_source_t *source,
|
|||||||
std::unique_lock<std::mutex> lock(*GetMutex());
|
std::unique_lock<std::mutex> lock(*GetMutex());
|
||||||
SetMacroAbortWait(false);
|
SetMacroAbortWait(false);
|
||||||
|
|
||||||
// The media source needs time to open and decode before reaching
|
// Poll until the source starts playing or the macro is stopped.
|
||||||
// PLAYING state. Poll until it starts (or the macro is stopped).
|
|
||||||
while (!MacroWaitShouldAbort() && !MacroIsStopped(macro)) {
|
while (!MacroWaitShouldAbort() && !MacroIsStopped(macro)) {
|
||||||
if (obs_source_media_get_state(source) ==
|
if (obs_source_media_get_state(source) ==
|
||||||
OBS_MEDIA_STATE_PLAYING) {
|
OBS_MEDIA_STATE_PLAYING) {
|
||||||
@@ -48,9 +94,8 @@ static void waitForPlaybackToEnd(Macro *macro, obs_source_t *source,
|
|||||||
GetMacroWaitCV().wait_for(lock, 10ms);
|
GetMacroWaitCV().wait_for(lock, 10ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now wait for playback to end. Require two consecutive non-playing
|
// Wait for playback to end. Two consecutive non-playing samples are
|
||||||
// samples to avoid false positives on brief state transitions.
|
// required to avoid false positives on brief state transitions.
|
||||||
// If maxMs > 0, also stop once that many milliseconds have elapsed.
|
|
||||||
const auto playbackStart = std::chrono::steady_clock::now();
|
const auto playbackStart = std::chrono::steady_clock::now();
|
||||||
static const int kStopThreshold = 2;
|
static const int kStopThreshold = 2;
|
||||||
int stoppedCount = 0;
|
int stoppedCount = 0;
|
||||||
@@ -95,7 +140,6 @@ bool MacroActionPlayAudio::PerformAction()
|
|||||||
obs_data_set_string(settings, "local_file", path.c_str());
|
obs_data_set_string(settings, "local_file", path.c_str());
|
||||||
obs_data_set_bool(settings, "is_local_file", true);
|
obs_data_set_bool(settings, "is_local_file", true);
|
||||||
obs_data_set_bool(settings, "looping", false);
|
obs_data_set_bool(settings, "looping", false);
|
||||||
// Disable automatic restart on activate so we control start explicitly.
|
|
||||||
obs_data_set_bool(settings, "restart_on_activate", false);
|
obs_data_set_bool(settings, "restart_on_activate", false);
|
||||||
obs_data_set_bool(settings, "close_when_inactive", true);
|
obs_data_set_bool(settings, "close_when_inactive", true);
|
||||||
|
|
||||||
@@ -113,10 +157,11 @@ bool MacroActionPlayAudio::PerformAction()
|
|||||||
DecibelToPercent(static_cast<float>(_volumeDB.GetValue()));
|
DecibelToPercent(static_cast<float>(_volumeDB.GetValue()));
|
||||||
obs_source_set_volume(source, vol);
|
obs_source_set_volume(source, vol);
|
||||||
obs_source_set_monitoring_type(source, _monitorType);
|
obs_source_set_monitoring_type(source, _monitorType);
|
||||||
|
if (_mono) {
|
||||||
|
obs_source_set_flags(source, OBS_SOURCE_FLAG_FORCE_MONO);
|
||||||
|
}
|
||||||
|
|
||||||
// Fall back to monitor-only if all output tracks are deselected —
|
// Fall back to monitor-only if all output tracks are deselected.
|
||||||
// there is no point routing through the output channel if the mixer
|
|
||||||
// mask would silence every track.
|
|
||||||
const bool wantsOutput =
|
const bool wantsOutput =
|
||||||
(_monitorType != OBS_MONITORING_TYPE_MONITOR_ONLY) &&
|
(_monitorType != OBS_MONITORING_TYPE_MONITOR_ONLY) &&
|
||||||
(_audioMixers != 0);
|
(_audioMixers != 0);
|
||||||
@@ -128,10 +173,8 @@ bool MacroActionPlayAudio::PerformAction()
|
|||||||
|
|
||||||
if (wantsOutput) {
|
if (wantsOutput) {
|
||||||
obs_source_set_audio_mixers(source, _audioMixers);
|
obs_source_set_audio_mixers(source, _audioMixers);
|
||||||
// Route through a private scene so we can position the scene
|
// Route through a private scene positioned off-screen so the
|
||||||
// item far off-screen. This keeps the item "visible" (so audio
|
// audio mixes into the output without video appearing on screen.
|
||||||
// is still mixed) while ensuring its video never intersects the
|
|
||||||
// output frame.
|
|
||||||
OBSSceneAutoRelease audioScene =
|
OBSSceneAutoRelease audioScene =
|
||||||
obs_scene_create_private("advss_audio_scene");
|
obs_scene_create_private("advss_audio_scene");
|
||||||
obs_sceneitem_t *item = obs_scene_add(audioScene, source);
|
obs_sceneitem_t *item = obs_scene_add(audioScene, source);
|
||||||
@@ -141,8 +184,7 @@ bool MacroActionPlayAudio::PerformAction()
|
|||||||
}
|
}
|
||||||
obs_set_output_source(kPlaybackOutputChannel,
|
obs_set_output_source(kPlaybackOutputChannel,
|
||||||
obs_scene_get_source(audioScene));
|
obs_scene_get_source(audioScene));
|
||||||
// audioScene released here; the output channel holds the
|
// audioScene is released here; the output channel keeps the scene alive.
|
||||||
// remaining reference and keeps the scene alive.
|
|
||||||
} else {
|
} else {
|
||||||
obs_source_set_audio_mixers(source, 0);
|
obs_source_set_audio_mixers(source, 0);
|
||||||
obs_source_inc_active(source);
|
obs_source_inc_active(source);
|
||||||
@@ -167,15 +209,15 @@ bool MacroActionPlayAudio::PerformAction()
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keep the source alive in a background thread that cleans up
|
// Keep the source alive until playback ends via a background thread.
|
||||||
// once playback finishes. Grab an extra strong reference so the
|
|
||||||
// source survives beyond this stack frame.
|
|
||||||
auto rawSource = obs_source_get_ref(source);
|
auto rawSource = obs_source_get_ref(source);
|
||||||
|
registerActiveSource(rawSource);
|
||||||
auto macro = GetMacro();
|
auto macro = GetMacro();
|
||||||
|
|
||||||
std::thread cleanupThread([rawSource, wantsOutput, macro, maxMs]() {
|
std::thread cleanupThread([rawSource, wantsOutput, macro, maxMs]() {
|
||||||
waitForPlaybackToEnd(macro, rawSource, maxMs);
|
waitForPlaybackToEnd(macro, rawSource, maxMs);
|
||||||
deactivatePlayback(rawSource, wantsOutput);
|
deactivatePlayback(rawSource, wantsOutput);
|
||||||
|
unregisterActiveSource(rawSource);
|
||||||
obs_source_release(rawSource);
|
obs_source_release(rawSource);
|
||||||
});
|
});
|
||||||
AddMacroHelperThread(macro, std::move(cleanupThread));
|
AddMacroHelperThread(macro, std::move(cleanupThread));
|
||||||
@@ -204,6 +246,7 @@ bool MacroActionPlayAudio::Save(obs_data_t *obj) const
|
|||||||
obs_data_set_bool(obj, "useDuration", _useDuration);
|
obs_data_set_bool(obj, "useDuration", _useDuration);
|
||||||
_playbackDuration.Save(obj, "playbackDuration");
|
_playbackDuration.Save(obj, "playbackDuration");
|
||||||
obs_data_set_bool(obj, "waitForCompletion", _waitForCompletion);
|
obs_data_set_bool(obj, "waitForCompletion", _waitForCompletion);
|
||||||
|
obs_data_set_bool(obj, "mono", _mono);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,6 +264,7 @@ bool MacroActionPlayAudio::Load(obs_data_t *obj)
|
|||||||
_useDuration = obs_data_get_bool(obj, "useDuration");
|
_useDuration = obs_data_get_bool(obj, "useDuration");
|
||||||
_playbackDuration.Load(obj, "playbackDuration");
|
_playbackDuration.Load(obj, "playbackDuration");
|
||||||
_waitForCompletion = obs_data_get_bool(obj, "waitForCompletion");
|
_waitForCompletion = obs_data_get_bool(obj, "waitForCompletion");
|
||||||
|
_mono = obs_data_get_bool(obj, "mono");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -262,7 +306,9 @@ MacroActionPlayAudioEdit::MacroActionPlayAudioEdit(
|
|||||||
_useDuration(new QCheckBox(this)),
|
_useDuration(new QCheckBox(this)),
|
||||||
_playbackDuration(new DurationSelection(this, true, 0.0)),
|
_playbackDuration(new DurationSelection(this, true, 0.0)),
|
||||||
_waitForCompletion(new QCheckBox(
|
_waitForCompletion(new QCheckBox(
|
||||||
obs_module_text("AdvSceneSwitcher.action.playAudio.wait")))
|
obs_module_text("AdvSceneSwitcher.action.playAudio.wait"))),
|
||||||
|
_mono(new QCheckBox(
|
||||||
|
obs_module_text("AdvSceneSwitcher.action.playAudio.mono")))
|
||||||
{
|
{
|
||||||
_volumeDB->setMinimum(-100.0);
|
_volumeDB->setMinimum(-100.0);
|
||||||
_volumeDB->setMaximum(0.0);
|
_volumeDB->setMaximum(0.0);
|
||||||
@@ -303,6 +349,8 @@ MacroActionPlayAudioEdit::MacroActionPlayAudioEdit(
|
|||||||
SLOT(PlaybackDurationChanged(const Duration &)));
|
SLOT(PlaybackDurationChanged(const Duration &)));
|
||||||
QWidget::connect(_waitForCompletion, SIGNAL(stateChanged(int)), this,
|
QWidget::connect(_waitForCompletion, SIGNAL(stateChanged(int)), this,
|
||||||
SLOT(WaitChanged(int)));
|
SLOT(WaitChanged(int)));
|
||||||
|
QWidget::connect(_mono, SIGNAL(stateChanged(int)), this,
|
||||||
|
SLOT(MonoChanged(int)));
|
||||||
|
|
||||||
auto tracksLayout = new QHBoxLayout;
|
auto tracksLayout = new QHBoxLayout;
|
||||||
tracksLayout->setContentsMargins(0, 0, 0, 0);
|
tracksLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
@@ -346,6 +394,7 @@ MacroActionPlayAudioEdit::MacroActionPlayAudioEdit(
|
|||||||
mainLayout->addLayout(startOffsetLayout);
|
mainLayout->addLayout(startOffsetLayout);
|
||||||
mainLayout->addLayout(playbackDurationLayout);
|
mainLayout->addLayout(playbackDurationLayout);
|
||||||
mainLayout->addWidget(_waitForCompletion);
|
mainLayout->addWidget(_waitForCompletion);
|
||||||
|
mainLayout->addWidget(_mono);
|
||||||
setLayout(mainLayout);
|
setLayout(mainLayout);
|
||||||
|
|
||||||
_entryData = entryData;
|
_entryData = entryData;
|
||||||
@@ -375,6 +424,7 @@ void MacroActionPlayAudioEdit::UpdateEntryData()
|
|||||||
_playbackDuration->SetDuration(_entryData->_playbackDuration);
|
_playbackDuration->SetDuration(_entryData->_playbackDuration);
|
||||||
_playbackDuration->setEnabled(_entryData->_useDuration);
|
_playbackDuration->setEnabled(_entryData->_useDuration);
|
||||||
_waitForCompletion->setChecked(_entryData->_waitForCompletion);
|
_waitForCompletion->setChecked(_entryData->_waitForCompletion);
|
||||||
|
_mono->setChecked(_entryData->_mono);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MacroActionPlayAudioEdit::FilePathChanged(const QString &path)
|
void MacroActionPlayAudioEdit::FilePathChanged(const QString &path)
|
||||||
@@ -443,4 +493,10 @@ void MacroActionPlayAudioEdit::WaitChanged(int value)
|
|||||||
_entryData->_waitForCompletion = value;
|
_entryData->_waitForCompletion = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MacroActionPlayAudioEdit::MonoChanged(int value)
|
||||||
|
{
|
||||||
|
GUARD_LOADING_AND_LOCK();
|
||||||
|
_entryData->_mono = value;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace advss
|
} // namespace advss
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ public:
|
|||||||
bool _useDuration = false;
|
bool _useDuration = false;
|
||||||
Duration _playbackDuration;
|
Duration _playbackDuration;
|
||||||
bool _waitForCompletion = false;
|
bool _waitForCompletion = false;
|
||||||
|
bool _mono = false;
|
||||||
|
|
||||||
static bool _registered;
|
static bool _registered;
|
||||||
static const std::string id;
|
static const std::string id;
|
||||||
@@ -68,6 +69,7 @@ private slots:
|
|||||||
void UseDurationChanged(int);
|
void UseDurationChanged(int);
|
||||||
void PlaybackDurationChanged(const Duration &);
|
void PlaybackDurationChanged(const Duration &);
|
||||||
void WaitChanged(int value);
|
void WaitChanged(int value);
|
||||||
|
void MonoChanged(int value);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void HeaderInfoChanged(const QString &);
|
void HeaderInfoChanged(const QString &);
|
||||||
@@ -83,6 +85,7 @@ private:
|
|||||||
QCheckBox *_useDuration;
|
QCheckBox *_useDuration;
|
||||||
DurationSelection *_playbackDuration;
|
DurationSelection *_playbackDuration;
|
||||||
QCheckBox *_waitForCompletion;
|
QCheckBox *_waitForCompletion;
|
||||||
|
QCheckBox *_mono;
|
||||||
|
|
||||||
std::shared_ptr<MacroActionPlayAudio> _entryData;
|
std::shared_ptr<MacroActionPlayAudio> _entryData;
|
||||||
bool _loading = true;
|
bool _loading = true;
|
||||||
|
|||||||
@@ -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