Adjust and move default priorities

New users will be confused if their macros are not executed,
if they are "blocked" by other scene switching methods.
This commit is contained in:
WarmUpTill
2021-12-05 21:39:13 +01:00
committed by WarmUpTill
parent 0a481b3e31
commit 0029977ae1
12 changed files with 12 additions and 11 deletions

View File

@@ -12,7 +12,6 @@
#include <obs-module.h>
constexpr auto macro_func = 10;
constexpr auto default_priority_10 = macro_func;
constexpr auto logic_root_offset = 100;

View File

@@ -14,7 +14,6 @@
#include "volume-control.hpp"
constexpr auto audio_func = 8;
constexpr auto default_priority_8 = audio_func;
typedef enum {
ABOVE,

View File

@@ -10,7 +10,6 @@
#include "switch-generic.hpp"
constexpr auto exe_func = 3;
constexpr auto default_priority_3 = exe_func;
struct ExecutableSwitch : SceneSwitcherEntry {
static bool pause;

View File

@@ -11,7 +11,6 @@
#include <obs-module.h>
constexpr auto read_file_func = 0;
constexpr auto default_priority_0 = read_file_func;
typedef enum {
LOCAL,

View File

@@ -10,7 +10,6 @@
constexpr auto default_idle_time = 60;
constexpr auto idle_func = 2;
constexpr auto default_priority_2 = idle_func;
struct IdleData : SceneSwitcherEntry {
static bool pause;

View File

@@ -9,7 +9,6 @@
#include "switch-generic.hpp"
constexpr auto media_func = 6;
constexpr auto default_priority_6 = media_func;
typedef enum {
TIME_RESTRICTION_NONE,

View File

@@ -10,7 +10,6 @@
#include "switch-generic.hpp"
constexpr auto screen_region_func = 4;
constexpr auto default_priority_4 = screen_region_func;
struct ScreenRegionSwitch : SceneSwitcherEntry {
static bool pause;

View File

@@ -12,7 +12,6 @@
#include "duration-control.hpp"
constexpr auto round_trip_func = 1;
constexpr auto default_priority_1 = round_trip_func;
struct SceneSequenceSwitch : SceneSwitcherEntry {
static bool pause;

View File

@@ -11,7 +11,6 @@
#include "switch-generic.hpp"
constexpr auto time_func = 7;
constexpr auto default_priority_7 = time_func;
typedef enum {
ANY_DAY = 0,

View File

@@ -12,7 +12,6 @@
#include "screenshot-helper.hpp"
constexpr auto video_func = 9;
constexpr auto default_priority_9 = video_func;
enum class videoSwitchType {
MATCH,

View File

@@ -9,7 +9,6 @@
#include "switch-generic.hpp"
constexpr auto window_title_func = 5;
constexpr auto default_priority_5 = window_title_func;
struct WindowSwitch : SceneSwitcherEntry {
static bool pause;

View File

@@ -33,6 +33,18 @@ constexpr auto previous_scene_name = "Previous Scene";
constexpr auto current_transition_name = "Current Transition";
constexpr auto tab_count = 18;
constexpr auto default_priority_0 = macro_func;
constexpr auto default_priority_1 = read_file_func;
constexpr auto default_priority_2 = idle_func;
constexpr auto default_priority_3 = audio_func;
constexpr auto default_priority_4 = media_func;
constexpr auto default_priority_5 = video_func;
constexpr auto default_priority_6 = time_func;
constexpr auto default_priority_7 = screen_region_func;
constexpr auto default_priority_8 = round_trip_func;
constexpr auto default_priority_9 = window_title_func;
constexpr auto default_priority_10 = exe_func;
typedef enum { NO_SWITCH = 0, SWITCH = 1, RANDOM_SWITCH = 2 } NoMatch;
typedef enum { PERSIST = 0, START = 1, STOP = 2 } StartupBehavior;