[vlc-commits] alsa: setup immutable callbacks from Open()

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Mar 13 09:31:49 2019 +0100| [a9ab97d31e6cd3c7ac434d8aedeb1e23c2650927] | committer: Thomas Guillem

alsa: setup immutable callbacks from Open()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9ab97d31e6cd3c7ac434d8aedeb1e23c2650927
---

 modules/audio_output/alsa.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 08067c1338..e507f78241 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -611,8 +611,6 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
     fmt->channel_type = AUDIO_CHANNEL_TYPE_BITMAP;
     sys->format = fmt->i_format;
 
-    aout->time_get = TimeGet;
-    aout->play = Play;
     if (snd_pcm_hw_params_can_pause (hw))
         aout->pause = Pause;
     else
@@ -620,7 +618,6 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
         aout->pause = PauseDummy;
         msg_Warn (aout, "device cannot be paused");
     }
-    aout->flush = Flush;
     aout_SoftVolumeStart (aout);
     return 0;
 
@@ -851,6 +848,10 @@ static int Open(vlc_object_t *obj)
         free (ids);
     }
 
+    aout->time_get = TimeGet;
+    aout->play = Play;
+    aout->flush = Flush;
+
     return VLC_SUCCESS;
 error:
     free (sys);