Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ci/test_hotkey_register_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ def test_isolated_cores_compile_registration_in_the_same_translation_unit(self):
self.assertIn(EXTRACTED, target["sources"])
self.assertEqual(target.get("pch"), "libobs/build/libobs.pch.h")
groups = list(target.get("unity_groups", {}).values())
self.assertIn([EXTRACTED, ORIGINAL], groups)
self.assertIn(
[EXTRACTED, "libobs/obs-hotkey-background-state.c.h", ORIGINAL], groups
)
self.assertCountEqual(
[source for group in groups for source in group], target["sources"]
)
Expand Down
1 change: 1 addition & 0 deletions libobs/build/libobs.core+.h.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "libobs/obs-hotkey-background-enum-fields.c.h"
#include "libobs/obs-hotkey-background-error-fields.c.h"
#include "libobs/obs-hotkey-background-press-fields.c.h"
#include "libobs/obs-hotkey-background-state.c.h"
#include "libobs/obs-hotkey-background-trigger-fields.c.h"
#include "libobs/obs-hotkey-enum-fields.c.h"
#include "libobs/obs-hotkey-identity-fields.c.h"
Expand Down
19 changes: 19 additions & 0 deletions libobs/obs-hotkey-background-state.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "libobs/build/libobs.pch.h"

/* Defined in obs-hotkey.c.h, later in the same unity group. */
static inline bool lock(void);
static inline void unlock(void);

enum obs_hotkeys_background_state obs_hotkeys_get_background_state(uint32_t *flags)
{
if (flags)
*flags = 0;
if (!lock())
return OBS_HOTKEYS_BACKGROUND_NATIVE;

enum obs_hotkeys_background_state state = obs->hotkeys.background.state;
if (flags)
*flags = obs->hotkeys.background.flags;
unlock();
return state;
}
14 changes: 0 additions & 14 deletions libobs/obs-hotkey.c.h
Original file line number Diff line number Diff line change
Expand Up @@ -475,20 +475,6 @@ void obs_hotkeys_background_status_changed(void)
signal_handler_signal(obs->hotkeys.signals, "hotkey_background_status_changed", NULL);
}

enum obs_hotkeys_background_state obs_hotkeys_get_background_state(uint32_t *flags)
{
if (flags)
*flags = 0;
if (!lock())
return OBS_HOTKEYS_BACKGROUND_NATIVE;

enum obs_hotkeys_background_state state = obs->hotkeys.background.state;
if (flags)
*flags = obs->hotkeys.background.flags;
unlock();
return state;
}

char *obs_hotkey_combination_get_background_id(obs_key_combination_t combo)
{
if (!lock())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -74,6 +75,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -158,6 +159,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -59,6 +60,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -59,6 +60,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -59,6 +60,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -57,6 +58,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -55,6 +56,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -54,6 +55,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -57,6 +58,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -57,6 +58,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"libobs/obs-hotkey-background-query.c.h",
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -56,6 +57,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister_entry": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -79,6 +80,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-control-fields.c.h",
"libobs/obs-hotkey-unregister.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h",
"libobs/obs-hotkey-unregister-entry-fields.c.h",
"libobs/obs-hotkey-inject-entry-fields.c.h",
Expand Down Expand Up @@ -68,6 +69,7 @@
],
"hotkey_registration": [
"libobs/obs-hotkey-register.c.h",
"libobs/obs-hotkey-background-state.c.h",
"libobs/obs-hotkey.c.h"
],
"hotkey_unregister": [
Expand Down
Loading
Loading