mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 09:39:15 +00:00
23bfb625ce
The current code assumes that a display UUID can be created with the stored ID, but that's not always the case, e.g. when the user doesn't have the display connected. As such, we need to null check this, and fall back to the invalid ID (0) when the ID cannot be migrated. The current code also only migrates on source creation, which yields weird behaviour where if the user opens properties and then cancels it would still show the first display, but only for the session. This is why the code was factored out of the creation function and now is always used when an ID needs to be acquired from OBS Data settings, including when the source is updated.
39 lines
1.1 KiB
Objective-C
39 lines
1.1 KiB
Objective-C
#import <CoreGraphics/CGWindow.h>
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include <util/threading.h>
|
|
#include <obs-module.h>
|
|
|
|
struct cocoa_window {
|
|
CGWindowID window_id;
|
|
int owner_pid;
|
|
|
|
pthread_mutex_t name_lock;
|
|
NSString *owner_name;
|
|
NSString *window_name;
|
|
|
|
uint64_t next_search_time;
|
|
};
|
|
typedef struct cocoa_window *cocoa_window_t;
|
|
|
|
NSArray *enumerate_cocoa_windows(void);
|
|
|
|
bool find_window(cocoa_window_t cw, obs_data_t *settings, bool force);
|
|
|
|
void init_window(cocoa_window_t cw, obs_data_t *settings);
|
|
|
|
void destroy_window(cocoa_window_t cw);
|
|
|
|
void update_window(cocoa_window_t cw, obs_data_t *settings);
|
|
|
|
void window_defaults(obs_data_t *settings);
|
|
|
|
void add_window_properties(obs_properties_t *props);
|
|
|
|
void show_window_properties(obs_properties_t *props, bool show);
|
|
|
|
/** Get the display ID of a display and simultaneously migrate pre-30.0 display IDs to 30.0 UUIDs.
|
|
- Parameter settings: Pointer to `obs_data_t` object containing `display` int and/or `display_uuid` string
|
|
- Returns: `CGDirectDisplayID` of the display the user selected. May be 0 if the display cannot be found. */
|
|
CGDirectDisplayID get_display_migrate_settings(obs_data_t *settings);
|