Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixed osascript error

Browse Source
This commit is contained in:
WarmUpTill 2016-06-29 01:06:04 +02:00 committed by GitHub
parent c538fc48e1
commit a2c03d73b9
2 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SceneSwitcher.cpp
View File

@ -95,7 +95,7 @@ const char *sceneSwitcherOptionsGetName(void *type_data)
void *sceneSwitcherOptionsCreate(obs_data_t *settings, obs_source_t *source) {
UNUSED_PARAMETER(settings);
UNUSED_PARAMETER(source);
return "";
return (void*)"";
}
void sceneSwitcherOptionsDestroy(void *data) {
UNUSED_PARAMETER(data);
@ -161,7 +161,7 @@ obs_properties_t *sceneSwitcherOptionsSourceGetProperties(void *data)
obs_properties_t *props = obs_properties_create();
obs_properties_add_editable_list(props,
"WindowList", "Window Name",
false, "",
(enum obs_editable_list_type)0, "",
NULL);
obs_properties_add_button(props, "LoadOldSettings", "Load settings from old version", &loadOldSettings);
return props;

68
switcher.cpp
View File

@ -164,24 +164,38 @@ bool Switcher::isWindowFullscreen() {
#ifdef __APPLE__
bool Switcher::isWindowFullscreen() {
//TODO: implement the MAC OS version
string cmd = "osascript -e
'global frontApp, frontAppName, windowTitle
set windowTitle to ""
tell application \"System Events\"
set frontApp to first application process whose frontmost is true
set frontAppName to name of frontApp
tell process frontAppName
tell (1st window whose value of attribute \"AXMain\" is true)
set windowTitle to value of attribute \"AXTitle\"
end tell
end tell
end tell
//get screen resolution
string cmd = "osascript -e 'tell application \"Finder\" to get the bounds of the window of the desktop'";
char resolution[256];
FILE * f1 = popen(cmd.c_str(), "r");
fgets(resolution, 255, f1);
pclose(f1);
tell application frontAppName
get bounds of front window
end tell'";
return false;
//get window resolution
cmd = "osascript "
"-e 'global frontApp, frontAppName, windowTitle, boundsValue' "
"-e 'set windowTitle to \"\"' "
"-e 'tell application \"System Events\"' "
"-e 'set frontApp to first application process whose frontmost is true' "
"-e 'set frontAppName to name of frontApp' "
"-e 'tell process frontAppName' "
"-e 'tell (1st window whose value of attribute \"AXMain\" is true)' "
"-e 'set windowTitle to value of attribute \"AXTitle\"' "
"-e 'end tell' "
"-e 'end tell' "
"-e 'end tell' "
"-e 'tell application frontAppName' "
"-e 'set boundsValue to bounds of front window' "
"-e 'end tell' "
"-e 'return boundsValue' ";
char bounds[256];
FILE * f2 = popen(cmd.c_str(), "r");
fgets(bounds, 255, f2);
pclose(f2);
return string(resolution).compare(string(bounds)) == 0;
}
#endif
@ -200,12 +214,28 @@ string Switcher::GetActiveWindowTitle()
#ifdef __APPLE__
string Switcher::GetActiveWindowTitle()
{
string cmd = "osascript -e 'tell application \"System Events\"' -e 'set frontApp to name of first application process whose frontmost is true' -e 'end tell'";
string cmd = "osascript "
"-e 'global frontApp, frontAppName, windowTitle' "
"-e 'set windowTitle to \"\"' "
"-e 'tell application \"System Events\"' "
"-e 'set frontApp to first application process whose frontmost is true' "
"-e 'set frontAppName to name of frontApp' "
"-e 'tell process frontAppName' "
"-e 'tell (1st window whose value of attribute \"AXMain\" is true)' "
"-e 'set windowTitle to value of attribute \"AXTitle\"' "
"-e 'end tell' "
"-e 'end tell' "
"-e 'end tell' "
"-e 'return windowTitle' ";
char buffer[256];
FILE * f = popen(cmd.c_str(), "r");
fgets(buffer, 255, f);
pclose(f);
return buffer;
//osascript adds carriage return that we need to remove
string windowname = string(buffer);
windowname.pop_back();
return windowname;
}
#endif