Compare commits

..

1 Commits

Author SHA1 Message Date
WarmUpTill
29e07ce63a CI: Include Ubuntu 26 artifacts in release draft 2026-08-07 19:14:28 +02:00
5 changed files with 1539 additions and 2322 deletions

View File

@@ -191,21 +191,14 @@ function(_check_dependencies)
foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
file(DOWNLOAD "${url}" "${dependencies_dir}/${file}"
STATUS download_status)
file(
DOWNLOAD "${url}" "${dependencies_dir}/${file}"
STATUS download_status
EXPECTED_HASH SHA256=${hash})
list(GET download_status 0 error_code)
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)
message(STATUS "Downloading ${url} - success on attempt ${i}")
set(download_success TRUE)

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,6 @@
#include "websocket-api.hpp"
#include "obs-websocket-api.h"
#include "plugin-state-helpers.hpp"
#include "version.h"
// Must be after "obs-websocket-api.h" to avoid logging function conflict
#include "log-helper.hpp"
@@ -16,7 +15,6 @@ static constexpr char VendorName[] = "AdvancedSceneSwitcher";
static constexpr char VendorRequestStart[] = "AdvancedSceneSwitcherStart";
static constexpr char VendorRequestStop[] = "AdvancedSceneSwitcherStop";
static constexpr char VendorRequestStatus[] = "IsAdvancedSceneSwitcherRunning";
static constexpr char VendorRequestVersion[] = "AdvancedSceneSwitcherVersion";
static obs_websocket_vendor vendor;
static void registerWebsocketVendor();
@@ -84,12 +82,6 @@ static void registerWebsocketVendor()
obs_data_set_bool(response, "isRunning",
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()

View File

@@ -1,9 +1,7 @@
#include "macro-action-scene-collection.hpp"
#include "layout-helpers.hpp"
#include "plugin-state-helpers.hpp"
#include "selection-helpers.hpp"
#include "ui-helpers.hpp"
#include <obs-frontend-api.h>
@@ -17,20 +15,6 @@ bool MacroActionSceneCollection::_registered = MacroActionFactory::Register(
MacroActionSceneCollectionEdit::Create,
"AdvSceneSwitcher.action.sceneCollection"});
template<typename F> void QueueUITaskLambda(F &&func)
{
using FnType = std::decay_t<F>;
auto *heapFunc = new FnType(std::forward<F>(func));
QueueUITask(
[](void *param) {
std::unique_ptr<FnType> fn(
static_cast<FnType *>(param));
(*fn)();
},
heapFunc);
}
bool MacroActionSceneCollection::PerformAction()
{
// Changing the scene collection will also reload the settings of the
@@ -39,13 +23,7 @@ bool MacroActionSceneCollection::PerformAction()
if (SettingsWindowIsOpened()) {
return false;
}
const auto collectionName = _sceneCollection;
QueueUITaskLambda([collectionName]() {
obs_frontend_set_current_scene_collection(
collectionName.c_str());
});
obs_frontend_set_current_scene_collection(_sceneCollection.c_str());
// It does not make sense to continue as the current settings will be
// invalid after switching scene collection.
return false;

View File

@@ -61,14 +61,9 @@ function(_advss_whisper_suppress_werror dir)
endif()
target_compile_options(
${_target}
PRIVATE $<$<C_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error
-Wno-shorten-64-to-32
-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->)
PRIVATE $<$<C_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error>
$<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error>
$<$<C_COMPILER_ID:MSVC>:/WX-> $<$<CXX_COMPILER_ID:MSVC>:/WX->)
endforeach()
endfunction()