mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

UI: Use native ObjectiveC methods to generate data file paths

Browse Source
This commit is contained in:
PatTheMav 2023-04-02 18:56:44 +02:00 committed by Jim
parent 9581ebe7fd
commit d2ea998f49
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
UI/platform-osx.mm
View File

@ -40,38 +40,22 @@ bool isInBundle()
bool GetDataFilePath(const char *data, string &output)
{
NSRunningApplication *app = [NSRunningApplication currentApplication];
NSURL *bundleURL = [app bundleURL];
NSString *path = [NSString
stringWithFormat:@"Contents/Resources/%@",
[NSString stringWithUTF8String:data]];
NSURL *dataURL = [bundleURL URLByAppendingPathComponent:path];
output = [[dataURL path] UTF8String];
NSURL *bundleUrl = [[NSBundle mainBundle] bundleURL];
NSString *path = [[bundleUrl path]
stringByAppendingFormat:@"/%@/%s", @"Contents/Resources", data];
output = path.UTF8String;
return !access(output.c_str(), R_OK);
}
void CheckIfAlreadyRunning(bool &already_running)
{
try {
NSBundle *bundle = [NSBundle mainBundle];
if (!bundle)
throw "Could not find main bundle";
NSString *bundleId = [[NSBundle mainBundle] bundleIdentifier];
NSString *bundleID = [bundle bundleIdentifier];
if (!bundleID)
throw "Could not find bundle identifier";
NSUInteger appCount = [[NSRunningApplication
runningApplicationsWithBundleIdentifier:bundleId] count];
int app_count =
[NSRunningApplication
runningApplicationsWithBundleIdentifier:bundleID]
.count;
already_running = app_count > 1;
} catch (const char *error) {
blog(LOG_ERROR, "CheckIfAlreadyRunning: %s", error);
}
already_running = appCount > 1;
}
string GetDefaultVideoSavePath()
@ -143,12 +127,10 @@ void SetAlwaysOnTop(QWidget *window, bool enable)
Qt::WindowFlags flags = window->windowFlags();
if (enable) {
/* Force the level of the window high so it sits on top of
* full-screen applications like Keynote */
NSView *nsv = (__bridge NSView *)reinterpret_cast<void *>(
NSView *view = (__bridge NSView *)reinterpret_cast<void *>(
window->winId());
NSWindow *nsw = nsv.window;
[nsw setLevel:1024];
[[view window] setLevel:NSScreenSaverWindowLevel];
flags |= Qt::WindowStaysOnTopHint;
} else {