Browse Source

libobs: Deprecate obs_get/set_master_volume

These methods were never implemented to do anything.
gxalpha 3 years ago
parent
commit
34e6a5b73f
4 changed files with 12 additions and 22 deletions
  1. 8 6
      docs/sphinx/reference-core.rst
  2. 0 2
      libobs/obs-internal.h
  3. 2 12
      libobs/obs.c
  4. 2 2
      libobs/obs.h

+ 8 - 6
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.

+ 0 - 2
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;

+ 2 - 12
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,

+ 2 - 2
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);