amem: defer set_volume() before setup()

[vlc] / modules / audio_output / amem.c

diff --git a/modules/audio_output/amem.c b/modules/audio_output/amem.c
index ebac668aaf97347e8190f072b1e55b15e2c60de5..a60a0a79499d5f9c98020b231beb01be417125ca 100644 (file)
--- a/modules/audio_output/amem.c
+++ b/modules/audio_output/amem.c
@@ -10,7 +10,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
@@ -58,7 +58,11 @@ struct aout_sys_t
     int (*setup) (void **, char *, unsigned *, unsigned *);
     union
     {
-        void (*cleanup) (void *opaque);
+        struct
+        {
+            void *setup_opaque;
+            void (*cleanup) (void *opaque);
+        };
         struct
         {
              unsigned rate:18;
@@ -73,6 +77,7 @@ struct aout_sys_t
     int (*set_volume) (void *opaque, float vol, bool mute);
     float volume;
     bool mute;
+    bool ready;
 };
 
 static void Play (audio_output_t *aout, block_t *block)
@@ -107,6 +112,8 @@ static int VolumeSet (audio_output_t *aout, float vol)
     aout_sys_t *sys = aout->sys;
 
     sys->volume = vol;
+    if (sys->ready)
+        return 0; /* sys->opaque is not yet defined... */
     return sys->set_volume (sys->opaque, vol, sys->mute) ? -1 : 0;
 }
 
@@ -115,6 +122,8 @@ static int MuteSet (audio_output_t *aout, bool mute)
     aout_sys_t *sys = aout->sys;
 
     sys->mute = mute;
+    if (!sys->ready)
+        return 0; /* sys->opaque is not yet defined... */
     return sys->set_volume (sys->opaque, sys->volume, mute) ? -1 : 0;
 }
 
@@ -149,6 +158,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *fmt)
     {
         channels = aout_FormatNbChannels(fmt);
 
+        sys->opaque = sys->setup_opaque;
         if (sys->setup (&sys->opaque, format, &fmt->i_rate, &channels))
             return VLC_EGENERIC;
     }
@@ -158,6 +168,11 @@ static int Start (audio_output_t *aout, audio_sample_format_t *fmt)
         channels = sys->channels;
     }
 
+    /* Initialize volume (in case the UI changed volume before setup) */
+    sys->ready = true;
+    if (sys->set_volume != NULL)
+        sys->set_volume(sys->opaque, sys->volume, sys->mute);
+
     if (fmt->i_rate == 0 || fmt->i_rate > 192000
      || channels == 0 || channels > AOUT_CHAN_MAX)
         return VLC_EGENERIC;
@@ -214,6 +229,7 @@ static void Stop (audio_output_t *aout)
 
     if (sys->cleanup != NULL)
         sys->cleanup (sys->opaque);
+    sys->ready = false;
 }
 
 static int Open (vlc_object_t *obj)
@@ -223,13 +239,16 @@ static int Open (vlc_object_t *obj)
     if (unlikely(sys == NULL))
         return VLC_ENOMEM;
 
-    aout->sys = sys;
-    sys->opaque = var_InheritAddress (obj, "amem-data");
+    void *opaque = var_InheritAddress (obj, "amem-data");
     sys->setup = var_InheritAddress (obj, "amem-setup");
     if (sys->setup != NULL)
+    {
+        sys->setup_opaque = opaque;
         sys->cleanup = var_InheritAddress (obj, "amem-cleanup");
+    }
     else
     {
+        sys->opaque = opaque;
         sys->rate = var_InheritInteger (obj, "amem-rate");
         sys->channels = var_InheritInteger (obj, "amem-channels");
     }
@@ -241,12 +260,14 @@ static int Open (vlc_object_t *obj)
     sys->set_volume = var_InheritAddress (obj, "amem-set-volume");
     sys->volume = 1.;
     sys->mute = false;
+    sys->ready = false;
     if (sys->play == NULL)
     {
         free (sys);
         return VLC_EGENERIC;
     }
 
+    aout->sys = sys;
     aout->start = Start;
     aout->stop = Stop;
     aout->time_get = NULL;