Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-07-08 20:55:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,317 Commits 22 Branches 104 Tags 45 MiB
8c0ba112e2
Commit Graph

1004 Commits

Author SHA1 Message Date
WarmUpTill
0c6a7b140e add comment about use of 'matched' 2020-11-02 19:00:50 +01:00
WarmUpTill
d279b35086 fix crash on importing scene sequence 
This crash could occur when a scene sequence was currently in progress and the entries were changed while in the 'wait for ...' state.
 2020-11-02 18:38:26 +01:00
WarmUpTill
8e26148255
fix media states being retriggered multiple times (#54) 2020-11-01 18:53:48 +01:00
WarmUpTill
1a3ed0d09c
add clang format check to CI and adjust formatting (#55) 2020-11-01 12:39:14 +01:00
WarmUpTill
214821b69f
UI rework (#44) 
* rework general tab UI

* rework audio tab UI

* rework media tab UI

* rework time tab UI

* rework random tab UI

* rework window tab UI

* rework sreen region tab UI

* rework sequence tab UI

* rework transition tab UI

* adjust log messages to new format

* fix include path and warning

* highlight widgets to guide users (can be disabled)

* add helper frame for screen region tab

* rename main SceneSwitcher widget to AdvSceneSwitcher to resolve naming conflicts with the frontend tools on certain platforms (e.g. Debian 10)

* add media state 'any'

* adjust media switch handling to support vlc source
 2020-10-31 16:25:44 +01:00
WarmUpTill
7edb6eb6c1 add handling of window title of metro apps 2020-10-24 15:23:08 +02:00
WarmUpTill
8aed15f3a8 allow WS_EX_TOOLWINDOW as valid windows to match 'Task Switching' 2020-10-22 19:44:23 +02:00
WarmUpTill
1e6a022787
improve hotkey handling (#49) 2020-10-12 20:55:51 +02:00
WarmUpTill
fb1eac5268
fix crash on exit when on autoStart scene (#47) 2020-10-10 01:56:08 +02:00
WarmUpTill
787b664d29
Add vlc source to media tab (#42) 2020-09-30 19:07:40 +02:00
WarmUpTill
dd63ff846c
Refactor, fixes and maximized option for title tab (#40) 
* move definitions of switcher structs to separate files

* remove useless comment

* cleanup and silence warnings

* add generic switch

* removed delay on main thread startup as it served no purpose

* clean up ultility.hpp

* do not save switchStr to file as it could cause issues when scenes are renamed

* rename sceneRoundTrip to sceneSequence

* add option to switch if window is maximized to title tab
 2020-09-25 21:42:58 +02:00
WarmUpTill
8d023ee385
Add audio tab (#36) 
* add volumemeter widget

* add audio tab UI

* add checkAudioSwitch functionality

* use constexpr instead of preprocessing
 2020-09-21 00:52:42 +02:00
WarmUpTill
3fd3801e56
load libcurl at runtime (#33) 
* load libcurl at runtime

* add warning to file tab if curl cant be loaded
 2020-09-13 09:13:09 +02:00
WarmUpTill
21a788b48b
Improve time tab (#34) 
* add support for weekdays and allow reordering on time tab

* add option to use time relative to streaming/recording start on time tab
 2020-09-13 00:03:38 +02:00
WarmUpTill
a5c8d776f3 only try auto start streaming/recording once on scene chagne 2020-08-24 20:55:54 +02:00
WarmUpTill
95261ce9bb add first draft of auto start of recording / streaming 2020-08-16 19:48:54 +02:00
WarmUpTill
255d10e603 fix auto fill not wokring for modified entries on time tab 2020-08-09 20:48:49 +02:00
WarmUpTill
ab3e93ab84 add fallback to old format for sequence import 2020-08-02 20:22:13 +02:00
WarmUpTill
3b5f88c14f do not sort sequence and region on add 2020-08-02 19:38:32 +02:00
WarmUpTill
2f33b6bdc3 fix data loss for sequence delay 2020-08-02 19:37:37 +02:00
WarmUpTill
3c1e240722 add option to set startup behavior 2020-08-02 18:45:44 +02:00
WarmUpTill
91831a1075 fix autoStop not being persisted 2020-08-02 18:00:50 +02:00
WarmUpTill
ccc824abc1 fix loading of old delay values 2020-08-02 17:46:36 +02:00
WarmUpTill
6f39d4648b add included 'thread' and 'QAction' for Linux and macOS build 2020-08-01 20:34:12 +02:00
WarmUpTill
910b1dde99 set sceneRoundTripDelayUnits 2020-08-01 16:19:57 +02:00
WarmUpTill
e462d7f420 fix sequence not stopping when manually switching scene 2020-08-01 16:11:54 +02:00
WarmUpTill
0cdd8bf1d0 move UI init of tabs to respective source files 2020-08-01 11:14:54 +02:00
WarmUpTill
f8ad8c31be scene sequence adjustments 
use double internally instead of two ints
rework save / load to file to reuse existing functionality
add option to select between seconds / minutes / hours
 2020-08-01 10:12:32 +02:00
WarmUpTill
f8b505fa4e silence warnings 2020-07-31 22:05:55 +02:00
WarmUpTill
1516263d2a save and load tab order 2020-07-31 21:58:17 +02:00
WarmUpTill
cd54cc17c0 fix switch priority falling back to default values on startup 2020-07-09 19:57:55 +02:00
WarmUpTill
098159dc0f increase window size on mac 
currently the general tab will be compressed to an almost unusable level due to the differences in Windows and Macintosh styles
 2020-06-30 20:11:44 +02:00
WarmUpTill
a4418996f4 disable mediaTime selection if restriction is set to none 2020-06-19 19:52:43 +02:00
WarmUpTill
340cb559ee add option to override transitionOverrides 2020-06-17 22:16:47 +02:00
WarmUpTill
eeefd8279f allow reordering of file/media/sequence/region 2020-06-16 20:25:25 +02:00
WarmUpTill
e62dc91cd7 fix linux/mac build error 2020-06-15 21:46:58 +02:00
WarmUpTill
d3ab9e01c5 add support for remote file using libcurl 2020-06-15 21:19:34 +02:00
WarmUpTill
2a92df4f3c add draft of remote file support 2020-06-14 20:35:02 +02:00
WarmUpTill
560044bbbf implement export/import of settings 2020-06-14 15:22:34 +02:00
WarmUpTill
4bd8cdf5a0 move auto start/stop to gernal.cpp 2020-06-14 14:17:03 +02:00
WarmUpTill
c17cbb66d9 write to OBS log if verbose logging is enabled 2020-06-14 14:14:00 +02:00
WarmUpTill
bf70bd7c60 move saving and loading to separate files 2020-06-13 21:56:26 +02:00
WarmUpTill
6810ba71e8 remove using namespace std 2020-06-12 21:40:06 +02:00
WarmUpTill
3151a7542f return true in isFullscreen() if window maximized 2020-06-11 16:25:17 +02:00
Myned
7bfde0a39b
Add regex matching to fullscreen check 2020-06-10 04:06:04 -04:00
Myned
7347be370e
Fix type error 
Pushed a little too soon
 2020-06-09 17:14:22 -04:00
Myned
66d847c047
Fix ignored switches not directly matching last window 2020-06-09 17:10:14 -04:00
Myned
c9f1f9624b
Use actual window titles and fix fullscreen check on macOS 
Fallback to window owner if title does not exist
Remove duplicate entries from list
 2020-06-09 07:49:39 -04:00
Myned
8e4a8b7e9d
Use QString::fromStdString() instead of c_str() 2020-06-09 07:10:30 -04:00
Myned
e693794549
Add sorting of window lists for UI 2020-06-09 07:09:08 -04:00
Myned
7a924438bc
Add .clang-format and apply to src/ files 2020-06-08 14:58:44 -04:00
Myned
9f7ca3e4c7
Merge remote-tracking branch 'WarmUpTill/master' 2020-06-07 14:15:08 -04:00
WarmUpTill
2f77d99161
Undo "Revert "do not use QThread::create"" 
This reverts commit 4b86849356.
 2020-06-07 14:15:01 -04:00
WarmUpTill
acd2e2863a adjust win isFullscreen() to use GetMonitorInfo() 
only tested on a single monitor setup but should work on secondary monitors also as MONITOR_DEFAULTTONEAREST is set
 2020-06-07 13:25:51 +02:00
WarmUpTill
513fe0728c initialize SwitcherThread to nullptr 2020-06-07 10:43:52 +02:00
Myned
cba39633aa
Add ability to reorder Window and Executable switches with arrows 2020-06-06 23:23:02 -04:00
WarmUpTill
4b86849356
Revert "do not use QThread::create" 
This reverts commit 98c3131017.
 2020-06-06 22:38:22 -04:00
Myned
8fd263f44a
Merge remote-tracking branch 'WarmUpTill/master' 2020-06-06 18:40:17 -04:00
Myned
5590e97f4f
Fix fullscreen check only returning true if window is focused on Windows 
by @WarmUpTill
 2020-06-06 18:39:57 -04:00
WarmUpTill
98c3131017 do not use QThread::create 
there might still be versions of QT in use which do not yet have this functionality (see Linux build fail of f03fca8)
 2020-06-06 18:51:26 +02:00
WarmUpTill
f03fca85aa add thread priority option (using QThread) 2020-06-06 17:05:49 +02:00
WarmUpTill
7fef29dafb fix media delete button deleting wrong entry 
the mediaSwitches UI is sorted alphabetically while the switches data strucutre is not
the previous implementation of the delete function was just using the index of the currently selected row to delete  this index of the switches data structure
the new implementation will try to find the correct entry and delete it
 2020-06-06 08:59:03 +02:00
WarmUpTill
9f03264672 fix memory leak in check for media switch 2020-06-04 20:35:36 +02:00
WarmUpTill
5082f5944e prune media switches if invalid 2020-06-03 19:56:18 +02:00
WarmUpTill
b981a446b6 fix for times switch not saving when using previous scene 2020-06-03 19:55:06 +02:00
WarmUpTill
5ab8199e03 add log on start / stop of switcher thread 2020-06-02 20:53:26 +02:00
WarmUpTill
e6a3f98ab7 use source_id to identify meida sources 2020-06-02 20:45:46 +02:00
WarmUpTill
5e60cefd1c update current selection on media tab when selecting a different row 2020-06-02 19:34:15 +02:00
Myned
fabb7406bd
Merge remote-tracking branch 'WarmUpTill/master' 2020-06-02 00:48:01 -04:00
Myned
78ed7415f5
Fix allocation error 2020-06-02 00:39:14 -04:00
Myned
d6380b865e
Fix some windows (Steam) not being found on Linux 
Reverts part of commit e61905d02f

Fallback to WM_NAME if _NET_WM_NAME does not exist

Also fixes some BadWindow errors that were due to some apps like Steam only populating WM_NAME, and only for certain windows (tooltips count as windows due to the odd way the GUI works on Linux, so they don't have either property)
 2020-06-02 00:38:35 -04:00
WarmUpTill
2e475b8059 add first draft of thread priority 2020-06-01 14:54:08 +02:00
WarmUpTill
99b5c16406 add Time scene switching 2020-05-31 12:43:34 +02:00
Myned
55d8303ecf
Fix isFullscreen() logic error for Linux 
Not sure why this arose in the first place
 2020-05-26 02:44:12 -04:00
Myned
23201100fa
Fix macOS build error (again) 
Adds to f0cf5a5c19

Forgot to remove vestigial code
 2020-05-23 00:34:40 -04:00
Myned
3959e41e88
Add clearing of passed window list like with other platforms 2020-05-23 00:27:19 -04:00
Myned
f0cf5a5c19
Fix Windows and macOS build errors 
Adds to e4b640903d and de5b6f8eb4
 2020-05-23 00:25:30 -04:00
Myned
87da123c19
Change default focus value to true 2020-05-23 00:00:04 -04:00
Myned
a7a8adb91b
Remove whitespace 2020-05-21 00:54:49 -04:00
Myned
e61905d02f
Change window title property on Linux to align with freedesktop spec 
Freedesktop recommends using _NET_WM_NAME instead of WM_NAME, and on KDE, for example, the difference between them is including the application name for some windows (e.g. "freedesktop - Google Search - Vivaldi" compared to "freedesktop - Google Search")
 2020-05-21 00:53:47 -04:00
Myned
f00c244bfa
Change wording slightly 2020-05-21 00:52:41 -04:00
Myned
463b54f1fb
Remove sorting when adding switches 2020-05-21 00:52:11 -04:00
Myned
70894f9302
Add regex matching to reverted isInFocus() for Windows 
Reverts part of a4de8c0c59
 2020-05-21 00:42:58 -04:00
Myned
de5b6f8eb4
Fix fullscreen check only returning true if window is focused on Linux 2020-05-21 00:40:37 -04:00
Myned
e4b640903d
Add ability to choose focus state to window title switcher 2020-05-21 00:34:22 -04:00
Myned
a4de8c0c59
Change isInFocus() check to be OS-agnostic 
isInFocus() can utilize the platform-dependent GetCurrentWindowTitle() instead of re-implementing the same functionality.

Tested on Linux and macOS without issues
 2020-05-18 00:11:07 -04:00
Myned
ac051a42a8
Remove unnecessary spaces 2020-05-18 00:06:19 -04:00
Myned
d5052c94ca
Add direct matching to window, executable, and ignored switches 
Reverts part of commit 5f87a61177

Direct matching occurs in the same loop as regex in order to allow the list order to function as indicated in the UI
 2020-05-17 13:44:50 -04:00
Myned
a2543f1b85
Add ability to use existing window ignore for executable switching 
Also cleaned up some logic
 2020-05-17 00:24:24 -04:00
Myned
5f87a61177
Remove direct match from window switcher and reorganize 
Direct matching before regex has the potential to interfere with some usecases. For example, if a user wants to enter regex syntax such as `shell[1]`, a direct match would return a window matching `shell[1]` exactly instead of `shell1`. Granted, the odds of the two conflicting each other are slim, but the core logic shouldn't prevent a user from utilizing regex to its full potential. One can always escape reserved characters if they want to match it directly. I have also added a warning and link to https://regexr.com in the UI should this be accepted.

The rest of what has changed is simply to align with the executable switcher's matching, namely the use of `QRegularExpression` to drop the need for a try/catch block and moving the check for fullscreen to the if statement in order to remove the possibility of a race condition.
 2020-05-17 00:18:28 -04:00
Myned
451bb6518c
Revert "Move forms/advanced-scene-switcher.ui to src/headers/" 
This reverts commit 318502d8d0.
 2020-05-16 23:42:26 -04:00
Myned
318502d8d0
Move forms/advanced-scene-switcher.ui to src/headers/ 
Out-of-tree building (at least) fails without this file in this location, and builds successfully without it under forms
 2020-05-14 19:11:04 -04:00
Myned
3654f39247
Fix scene not switching with multiple executables 2020-05-14 18:56:39 -04:00
Myned
b45b38cf6a
Add ability to use regex for executable switching 
Previously, only exact matches to a window title would switch scenes
 2020-05-14 18:56:39 -04:00
WarmUpTill
228a18eb77 fix media switch not saving when using previous scene as target 2020-04-27 20:51:58 +02:00
WarmUpTill
4ed12db12b add support for previous scene on media tab 2020-04-27 20:20:50 +02:00
Exeldro
38bd59c1fd add media 2020-04-25 13:55:53 +02:00
WarmUpTill
115a90196c fix deadlock when rapidly switching scenes 2020-04-12 21:26:45 +02:00
WarmUpTill
5e92a7bcdf use std::shuffle instead of std::random_shuffle 2020-04-12 21:25:11 +02:00
WarmUpTill
922cf95119 support both in- and out-of-tree builds 2020-04-12 21:23:30 +02:00
WarmUpTill
05540b61a1 add separate hotkey (fix for out of tree builds) 2020-02-16 20:47:55 +01:00
WarmUpTill
218ad13160
add separate hotkeys for start and stop 2020-02-16 20:35:12 +01:00
Cephas Reis
7665bf8872 Platform-specific commits. Basically fixes for the directories. 2019-02-09 01:35:46 -06:00
c3r1c3
14d78100c1 Most files: Move files into subdirectories 
Almost all the files have been moved into folders and subfolders to keep everything organized and clean.
 2019-02-09 01:35:46 -06:00