aout: use aout_RequestRestart() where applicable

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index ed459e2defe5f002d8c54a72963454765fe09f3c..de9986a9427ad8d31b80de940123acfb0b723f87 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -334,7 +334,16 @@ static inline void aout_RestartRequest(audio_output_t *aout, unsigned mode)
     aout->event.restart_request(aout, mode);
 }
 
-VLC_API int aout_ChannelsRestart( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * );
+static inline int aout_ChannelsRestart (vlc_object_t *obj, const char *varname,
+                            vlc_value_t oldval, vlc_value_t newval, void *data)
+{
+    audio_output_t *aout = (audio_output_t *)obj;
+    (void)varname; (void)oldval; (void)newval; (void)data;
+
+    aout_RestartRequest (aout, AOUT_RESTART_OUTPUT);
+    return 0;
+}
+
 
 /* */
 VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) VLC_USED;

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 8e3861c282438816b4404b0eed6d96080211e98a..45d4945fbd03dcecf0c14921a02eb13b24c3c96b 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -792,9 +792,8 @@ static int DeviceSelect (audio_output_t *aout, const char *id)
         var_Create (aout, "alsa-audio-device", VLC_VAR_STRING);
     var_SetString (aout, "alsa-audio-device", id);
 
-    vlc_value_t dummy;
-    return aout_ChannelsRestart (VLC_OBJECT(aout), "audio-device",
-                                 dummy, dummy, NULL);
+    aout_RestartRequest (aout, AOUT_RESTART_OUTPUT);
+    return 0;
 }
 
 static int Open(vlc_object_t *obj)

diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index 6499c2074a7ea992a0a9c18dc5e820cb44cbcabb..30ab642402d30a38c9233dfdbebac958053a7740 100644 (file)
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -104,10 +104,7 @@ static int vlc_FromHR(audio_output_t *aout, HRESULT hr)
 {
     /* Restart on unplug */
     if (unlikely(hr == AUDCLNT_E_DEVICE_INVALIDATED))
-    {
-        vlc_value_t d;
-        aout_ChannelsRestart(VLC_OBJECT(aout), "audio-device", d, d, NULL);
-    }
+        aout_RestartRequest(aout, AOUT_RESTART_OUTPUT);
     return SUCCEEDED(hr) ? 0 : -1;
 }
 
@@ -652,11 +649,8 @@ static int DeviceSelect(audio_output_t *aout, const char *id)
     LeaveMTA();
 
     if (sys->stream != NULL)
-    {
-        vlc_value_t d;
         /* Request restart of stream with the new device */
-        aout_ChannelsRestart(VLC_OBJECT(aout), "audio-device", d, d, NULL);
-    }
+        aout_RestartRequest(aout, AOUT_RESTART_OUTPUT);
     return FAILED(hr) ? -1 : 0;
 }
 

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index e3070d61001cdd04678e7805cd230d496f97dc82..408bf76d8502be1d3fdd9ca9d064b69cbda1c1e8 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -86,11 +86,10 @@ static int MuteSet (audio_output_t *, bool);
 static int DeviceChanged (vlc_object_t *obj, const char *varname,
                           vlc_value_t prev, vlc_value_t cur, void *data)
 {
-    aout_ChannelsRestart (obj, varname, prev, cur, data);
-
     if (!var_Type (obj, "oss-audio-device"))
         var_Create (obj, "oss-audio-device", VLC_VAR_STRING);
     var_SetString (obj, "oss-audio-device", cur.psz_string);
+    aout_RestartRequest ((audio_output_t *)aout, AOUT_RESTART_OUTPUT);
     return VLC_SUCCESS;
 }
 

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 5176151045d9850d70a152c90a8a39600b13add8..fbf9a85e2cf73eb8309e9caba76c468b9bce7378 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -315,8 +315,7 @@ static void stream_event_cb(pa_stream *s, const char *name, pa_proplist *pl,
         vlc_value_t dummy = { .i_int = 0 };
 
         msg_Dbg (aout, "format lost");
-        aout_ChannelsRestart (VLC_OBJECT(aout), "audio-device",
-                              dummy, dummy, NULL);
+        aout_RestartRequest (aout, AOUT_RESTART_OUTPUT);
     } else
 #endif
         msg_Warn (aout, "unhandled stream event \"%s\"", name);

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 6f2c06ca7c57a97a1d5aef3058b8adfe88f5565a..746c6809ce0a4f138575fe3b7e02de181dbed12a 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -169,16 +169,6 @@ void aout_RequestRestart (audio_output_t *aout, unsigned mode)
     atomic_fetch_or (&owner->restart, mode);
 }
 
-int aout_ChannelsRestart (vlc_object_t *obj, const char *varname,
-                          vlc_value_t oldval, vlc_value_t newval, void *data)
-{
-    audio_output_t *aout = (audio_output_t *)obj;
-    (void)oldval; (void)newval; (void)data;
-
-    aout_RequestRestart (aout, AOUT_RESTART_OUTPUT);
-    return 0;
-}
-
 /*
  * Buffer management
  */

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index b4c03a6028cc0d6d1eb2dc893a2ec29cec688c9e..8c5be173c0cee93add34c541f2dc95330fe4ef67 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -3,7 +3,6 @@ AddMD5
 aout_BitsPerSample
 aout_ChannelExtract
 aout_ChannelReorder
-aout_ChannelsRestart
 aout_CheckChannelExtraction
 aout_CheckChannelReorder
 aout_filter_RequestVout