From 34e6a5b73fc76c12617cd01ae2843a0c8efbbb15 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Thu, 20 Oct 2022 18:47:11 +0200 Subject: [PATCH] libobs: Deprecate obs_get/set_master_volume These methods were never implemented to do anything. --- docs/sphinx/reference-core.rst | 14 ++++++++------ libobs/obs-internal.h | 2 -- libobs/obs.c | 14 ++------------ libobs/obs.h | 4 ++-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/docs/sphinx/reference-core.rst b/docs/sphinx/reference-core.rst index dbbdb32b0..f366db7c1 100644 --- a/docs/sphinx/reference-core.rst +++ b/docs/sphinx/reference-core.rst @@ -479,13 +479,19 @@ Video, Audio, and Graphics .. function:: void obs_set_master_volume(float volume) - Sets the master user volume. + No-op, only exists to keep ABI compatibility. + + .. deprecated:: 29.0 --------------------- .. function:: float obs_get_master_volume(void) - :return: The master user volume + No-op, only exists to keep ABI compatibility. + + :return: Always returns 1 + + .. deprecated:: 29.0 --------------------- @@ -646,10 +652,6 @@ Core OBS Signals Called when :c:func:`obs_set_output_source()` has been called. -**master_volume** (in out float volume) - - Called when the master volume has changed. - **hotkey_layout_change** () Called when the hotkey layout has changed. diff --git a/libobs/obs-internal.h b/libobs/obs-internal.h index 8b552b77b..185dad4eb 100644 --- a/libobs/obs-internal.h +++ b/libobs/obs-internal.h @@ -361,8 +361,6 @@ struct obs_core_audio { int max_buffering_ticks; bool fixed_buffer; - float user_volume; - pthread_mutex_t monitoring_mutex; DARRAY(struct audio_monitor *) monitors; char *monitoring_device_name; diff --git a/libobs/obs.c b/libobs/obs.c index 2b170f2af..7b0fd0f1d 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -827,8 +827,6 @@ static bool obs_init_audio(struct audio_output_info *ai) struct obs_task_info audio_init = {.task = set_audio_thread}; circlebuf_push_back(&audio->tasks, &audio_init, sizeof(audio_init)); - audio->user_volume = 1.0f; - audio->monitoring_device_name = bstrdup("Default"); audio->monitoring_device_id = bstrdup("default"); @@ -984,7 +982,6 @@ static const char *obs_signals[] = { "void source_transition_stop(ptr source)", "void channel_change(int channel, in out ptr source, ptr prev_source)", - "void master_volume(in out float volume)", "void hotkey_layout_change()", "void hotkey_register(ptr hotkey)", @@ -2087,19 +2084,12 @@ gs_texture_t *obs_get_main_texture(void) void obs_set_master_volume(float volume) { - struct calldata data = {0}; - - calldata_set_float(&data, "volume", volume); - signal_handler_signal(obs->signals, "master_volume", &data); - volume = (float)calldata_float(&data, "volume"); - calldata_free(&data); - - obs->audio.user_volume = volume; + UNUSED_PARAMETER(volume); } float obs_get_master_volume(void) { - return obs->audio.user_volume; + return 1.f; } static obs_source_t *obs_load_source_type(obs_data_t *source_data, diff --git a/libobs/obs.h b/libobs/obs.h index 25c88f993..1e56cc384 100644 --- a/libobs/obs.h +++ b/libobs/obs.h @@ -754,10 +754,10 @@ EXPORT void obs_render_main_texture_src_color_only(void); EXPORT gs_texture_t *obs_get_main_texture(void); /** Sets the master user volume */ -EXPORT void obs_set_master_volume(float volume); +OBS_DEPRECATED EXPORT void obs_set_master_volume(float volume); /** Gets the master user volume */ -EXPORT float obs_get_master_volume(void); +OBS_DEPRECATED EXPORT float obs_get_master_volume(void); /** Saves a source to settings data */ EXPORT obs_data_t *obs_save_source(obs_source_t *source);