Compare commits

..

56 Commits

Author SHA1 Message Date
WarmUpTill
10d3c8c268 add handling of window title of metro apps 2020-10-24 14:43:10 +02:00
WarmUpTill
bc3fcde12d remove unnecessary nullptr checks 2020-10-23 23:57:45 +02:00
WarmUpTill
8b9c93f76c workaround / fixes on media tab
fix memory leaks due to not clearing signal handlers
add workaround for VLC source states during playlists item change
2020-10-23 23:45:04 +02:00
WarmUpTill
89f0449fcd Merge branch 'master' into UI 2020-10-22 22:02:45 +02:00
WarmUpTill
babe8b5c28 rename title tab and only show windows specific hints on windows 2020-10-22 21:25:59 +02:00
WarmUpTill
b1179f4e50 fix mem leaks which could occur with new UI 2020-10-22 21:00:41 +02:00
WarmUpTill
017664b8e0 Merge branch 'master' into UI 2020-10-22 20:02:13 +02:00
WarmUpTill
161588e43b allow WS_EX_TOOLWINDOW as valid window to match 'Task Switching' 2020-10-22 19:40:21 +02:00
WarmUpTill
3dd1138f31 separate idle from file data 2020-10-21 22:15:25 +02:00
WarmUpTill
54aaeed7d7 adjust media switch handling to support vlc source 2020-10-21 21:48:21 +02:00
WarmUpTill
7df6d59c06 more include cleanup 2020-10-20 21:22:24 +02:00
WarmUpTill
b05115a7bb clean up includes 2020-10-19 21:06:35 +02:00
WarmUpTill
58acdb8f79 set process selection editable so processes can be displayed / entered which are not currently running 2020-10-18 22:42:28 +02:00
WarmUpTill
5dd3cf1945 make destructor virtual just in case 2020-10-18 20:12:41 +02:00
WarmUpTill
793e5edf01 add media state 'any' 2020-10-18 20:05:10 +02:00
WarmUpTill
6b1a01de5e move transition warning label and change default transition only once per scene change 2020-10-18 19:21:52 +02:00
WarmUpTill
0b7faee84f fix match log only printing previous scene 2020-10-18 17:43:28 +02:00
WarmUpTill
fd3be07024 fix previous scene handling 2020-10-18 17:37:33 +02:00
WarmUpTill
986422ca83 rename main SceneSwitcher widget to AdvSceneSwitcher 2020-10-18 17:18:21 +02:00
WarmUpTill
6c5c861514 update transitions UI 2020-10-18 16:22:45 +02:00
WarmUpTill
02a8dd87ca adjust log 2020-10-18 16:22:09 +02:00
WarmUpTill
a1266f71f2 fix pulse on sequence and adjust log 2020-10-18 16:21:38 +02:00
WarmUpTill
c7ad2f6ec1 rename sceneSequences widget to sceneSequenceSwitches 2020-10-18 02:03:20 +02:00
WarmUpTill
51612d9e7f do not switch if entry is uninitialized for window, time, region, random 2020-10-18 01:52:19 +02:00
WarmUpTill
491108678e update UI of scene sequence tab 2020-10-18 01:51:07 +02:00
WarmUpTill
3ac795fc72 silence warning 2020-10-18 00:01:44 +02:00
WarmUpTill
96746b3507 update screen region UI and add helper frame 2020-10-17 23:58:08 +02:00
WarmUpTill
7a1104884a change pulse default specifizer to QLabel 2020-10-16 19:42:32 +02:00
WarmUpTill
c6e2c9dcc3 add tooltips to selection entries and do not allow scrolling to them 2020-10-15 21:17:23 +02:00
WarmUpTill
a33c0905c9 allow regex entry for window switch and limit window selection size 2020-10-15 21:16:34 +02:00
WarmUpTill
7f85cdb500 update UI of window tab 2020-10-15 20:59:59 +02:00
WarmUpTill
f643ec10fd add option to disable UI hints 2020-10-14 22:03:12 +02:00
WarmUpTill
abab9f70b5 update Random Tab UI 2020-10-14 21:46:35 +02:00
WarmUpTill
8ecc197805 remove previous scene entry on time tab and unnecessary populate calls 2020-10-14 21:45:42 +02:00
WarmUpTill
0fc6c60d49 add new UI for Time tab 2020-10-14 20:55:11 +02:00
WarmUpTill
255432f3b2 clean up unused signal 2020-10-14 20:18:39 +02:00
WarmUpTill
5c38996d41 add add pulse for media/exec/audio and move inactive pluse to general 2020-10-14 20:17:51 +02:00
WarmUpTill
4d76206452 add generic PulseWidget function to highlight widgets 2020-10-13 22:12:00 +02:00
WarmUpTill
7c561797af clean up setup of audio/exe/media and fix slight leak in media 2020-10-13 20:37:02 +02:00
WarmUpTill
26697faa9f Merge branch 'master' into UI 2020-10-12 21:48:30 +02:00
WarmUpTill
f22da7ff31 fix audio valid(), skip uninit exec switches, skip setting scene and transition for audio / exec as this is done in generic switch 2020-10-12 21:48:08 +02:00
WarmUpTill
5ad820d6cd add new UI for media tab 2020-10-12 21:46:16 +02:00
WarmUpTill
a0a272f49e fix include path and warning 2020-10-11 20:02:37 +02:00
WarmUpTill
5b315d0574 add generic switch widget and setup new UI for exec switching 2020-10-11 19:12:31 +02:00
WarmUpTill
bc3a7cd9be move functions 2020-10-11 15:50:00 +02:00
WarmUpTill
39067f6157 fix up / down audio 2020-10-11 15:18:55 +02:00
WarmUpTill
085225bdcc audio up / down draft (signals still not working) 2020-10-11 00:32:38 +02:00
WarmUpTill
e3dc2c5f26 Merge branch 'master' into UI 2020-10-10 01:58:21 +02:00
WarmUpTill
50545e7f83 audio delete 2020-10-10 01:57:59 +02:00
WarmUpTill
616ce0c737 even more logging 2020-10-10 01:57:38 +02:00
WarmUpTill
ece2d61e0a more logging 2020-10-10 01:50:10 +02:00
WarmUpTill
62d54f7206 slightly adjust logging 2020-10-10 01:43:43 +02:00
WarmUpTill
611c478eb3 adjust audio add to new UI 2020-10-10 00:18:29 +02:00
WarmUpTill
3ff7a848b1 add option to add 'select ...' entry to populate functions 2020-10-10 00:17:19 +02:00
WarmUpTill
36b4d15a17 add edit in place for audio 2020-10-06 21:51:05 +02:00
WarmUpTill
02e797a3db first draft of UI improvements
group settings of the general tab
highlight if the scene switcher is inactive
add draft of allowing editing in place
define additional populate functions for audio and media
2020-10-04 16:28:36 +02:00
4 changed files with 10 additions and 12 deletions

View File

@@ -221,6 +221,13 @@ bool isInFocus(const QString &executable);
/********************************************************************************
* Sceneswitch helper
********************************************************************************/
struct obs_weak_source;
typedef struct obs_weak_source obs_weak_source_t;
typedef struct transitionData {
std::string name = "";
int duration = 0;
} transitionData;
void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
OBSWeakSource &transition,

View File

@@ -30,12 +30,6 @@ typedef enum {
RECORINDGSTREAMING = 2
} AutoStartType;
typedef struct transitionData {
std::string name = "";
int duration = 0;
} transitionData;
class SwitcherThread;
/********************************************************************************

View File

@@ -17,9 +17,8 @@ void SceneSwitcherEntry::logMatch()
{
const char *sceneName = previous_scene_name;
if (!usePreviousScene) {
obs_source_t *s = obs_weak_source_get_source(scene);
OBSSource s = obs_weak_source_get_source(scene);
sceneName = obs_source_get_name(s);
obs_source_release(s);
}
blog(LOG_INFO, "match for '%s' - switch to scene '%s'", getType(),
sceneName);
@@ -75,8 +74,6 @@ void SwitchWidget::SceneChanged(const QString &text)
return;
std::lock_guard<std::mutex> lock(switcher->m);
switchData->usePreviousScene = text.compare(previous_scene_name) == 0;
if (switchData->usePreviousScene)
return;
switchData->scene = GetWeakSourceByQString(text);
}

View File

@@ -333,9 +333,9 @@ MediaSwitch::MediaSwitch(MediaSwitch &&other)
other.usePreviousScene),
source(other.source),
state(other.state),
anyState(other.anyState),
restriction(other.restriction),
time(other.time)
time(other.time),
anyState(other.anyState)
{
}