From 5098f68db06fc3feed1ac3b011be2a3d145269de Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 3 Jan 2016 15:12:58 -0800 Subject: [PATCH] libobs: Move obs_source_dosignal to obs-internal.h Allows using it in multiple source files --- libobs/obs-internal.h | 15 +++++++++++++++ libobs/obs-source.c | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libobs/obs-internal.h b/libobs/obs-internal.h index 4ae6b17b3..1e63d1d4a 100644 --- a/libobs/obs-internal.h +++ b/libobs/obs-internal.h @@ -613,6 +613,21 @@ enum view_type { AUX_VIEW }; +static inline void obs_source_dosignal(struct obs_source *source, + const char *signal_obs, const char *signal_source) +{ + struct calldata data; + + calldata_init(&data); + calldata_set_ptr(&data, "source", source); + if (signal_obs) + signal_handler_signal(obs->signals, signal_obs, &data); + if (signal_source) + signal_handler_signal(source->context.signals, signal_source, + &data); + calldata_free(&data); +} + extern void obs_source_activate(obs_source_t *source, enum view_type type); extern void obs_source_deactivate(obs_source_t *source, enum view_type type); extern void obs_source_video_tick(obs_source_t *source, float seconds); diff --git a/libobs/obs-source.c b/libobs/obs-source.c index 0e9ef36db..ee321aae6 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -265,21 +265,6 @@ static void obs_source_init_audio_hotkeys(struct obs_source *source) obs_source_hotkey_push_to_talk, source); } -static inline void obs_source_dosignal(struct obs_source *source, - const char *signal_obs, const char *signal_source) -{ - struct calldata data; - - calldata_init(&data); - calldata_set_ptr(&data, "source", source); - if (signal_obs) - signal_handler_signal(obs->signals, signal_obs, &data); - if (signal_source) - signal_handler_signal(source->context.signals, signal_source, - &data); - calldata_free(&data); -} - obs_source_t *obs_source_create(const char *id, const char *name, obs_data_t *settings, obs_data_t *hotkey_data) {