Merge branch '1.0-bugfix'

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 5bec5b9894a57f2dc2ec0cc94e7007fcd086c60f..a780db6b251674f3bad957e405cf6c4b9ce5aad6 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -78,7 +78,7 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
         return 0;
     }
 
-    vlc_mutex_lock( &p_aout->mixer_lock );
+    aout_lock_mixer( p_aout );
     if ( !p_aout->mixer.b_error )
     {
         i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
@@ -87,7 +87,7 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
     {
         *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
     }
-    vlc_mutex_unlock( &p_aout->mixer_lock );
+    aout_unlock_mixer( p_aout );
 
     vlc_object_release( p_aout );
     return i_result;
@@ -98,25 +98,22 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
  *****************************************************************************/
 int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
 {
-    vlc_value_t val;
     aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE );
     int i_result = 0;
 
     config_PutInt( p_object, "volume", i_volume );
-
-    val.b_bool = true;
-    var_Set( p_object->p_libvlc, "volume-change", val );
+    var_SetBool( p_object->p_libvlc, "volume-change", true );
 
     if ( p_aout == NULL ) return 0;
 
-    vlc_mutex_lock( &p_aout->mixer_lock );
+    aout_lock_mixer( p_aout );
     if ( !p_aout->mixer.b_error )
     {
         i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
     }
-    vlc_mutex_unlock( &p_aout->mixer_lock );
+    aout_unlock_mixer( p_aout );
 
-    var_Set( p_aout, "intf-change", val );
+    var_SetBool( p_aout, "intf-change", true );
     vlc_object_release( p_aout );
     return i_result;
 }
@@ -132,7 +129,7 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
 
     if ( p_aout == NULL ) return 0;
 
-    vlc_mutex_lock( &p_aout->mixer_lock );
+    aout_lock_mixer( p_aout );
     if ( p_aout->mixer.b_error )
     {
         /* The output module is destroyed. */
@@ -142,7 +139,7 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
     {
         i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
     }
-    vlc_mutex_unlock( &p_aout->mixer_lock );
+    aout_unlock_mixer( p_aout );
 
     vlc_object_release( p_aout );
     return i_result;
@@ -157,7 +154,6 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
 int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
                    audio_volume_t * pi_volume )
 {
-    vlc_value_t val;
     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
@@ -175,18 +171,17 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
                     (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
-    val.b_bool = true;
-    var_Set( p_object->p_libvlc, "volume-change", val );
+    var_SetBool( p_object->p_libvlc, "volume-change", true );
 
     if ( p_aout == NULL ) return 0;
 
-    vlc_mutex_lock( &p_aout->mixer_lock );
+    aout_lock_mixer( p_aout );
     if ( !p_aout->mixer.b_error )
     {
         i_result = p_aout->output.pf_volume_set( p_aout,
                                                 (audio_volume_t) i_volume );
     }
-    vlc_mutex_unlock( &p_aout->mixer_lock );
+    aout_unlock_mixer( p_aout );
 
     vlc_object_release( p_aout );
     return i_result;
@@ -201,7 +196,6 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
 int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
                      audio_volume_t * pi_volume )
 {
-    vlc_value_t val;
     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
@@ -218,17 +212,16 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
     var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
-    val.b_bool = true;
-    var_Set( p_object->p_libvlc, "volume-change", val );
+    var_SetBool( p_object->p_libvlc, "volume-change", true );
 
     if ( p_aout == NULL ) return 0;
 
-    vlc_mutex_lock( &p_aout->mixer_lock );
+    aout_lock_mixer( p_aout );
     if ( !p_aout->mixer.b_error )
     {
         i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t) i_volume );
     }
-    vlc_mutex_unlock( &p_aout->mixer_lock );
+    aout_unlock_mixer( p_aout );
 
     vlc_object_release( p_aout );
     return i_result;
@@ -369,21 +362,21 @@ static int aout_Restart( aout_instance_t * p_aout )
     int i;
     bool b_error = 0;
 
-    vlc_mutex_lock( &p_aout->mixer_lock );
+    aout_lock_mixer( p_aout );
 
     if ( p_aout->i_nb_inputs == 0 )
     {
-        vlc_mutex_unlock( &p_aout->mixer_lock );
+        aout_unlock_mixer( p_aout );
         msg_Err( p_aout, "no decoder thread" );
         return -1;
     }
 
     /* Lock all inputs. */
-    vlc_mutex_lock( &p_aout->input_fifos_lock );
+    aout_lock_input_fifos( p_aout );
 
     for ( i = 0; i < p_aout->i_nb_inputs; i++ )
     {
-        vlc_mutex_lock( &p_aout->pp_inputs[i]->lock );
+        aout_lock_input( p_aout, p_aout->pp_inputs[i] );
         aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
     }
 
@@ -399,8 +392,8 @@ static int aout_Restart( aout_instance_t * p_aout )
         {
             vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
         }
-        vlc_mutex_unlock( &p_aout->input_fifos_lock );
-        vlc_mutex_unlock( &p_aout->mixer_lock );
+        aout_unlock_input_fifos( p_aout );
+        aout_unlock_mixer( p_aout );
         return -1;
     }
 
@@ -411,8 +404,8 @@ static int aout_Restart( aout_instance_t * p_aout )
         {
             vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
         }
-        vlc_mutex_unlock( &p_aout->input_fifos_lock );
-        vlc_mutex_unlock( &p_aout->mixer_lock );
+        aout_unlock_input_fifos( p_aout );
+        aout_unlock_mixer( p_aout );
         return -1;
     }
 
@@ -420,14 +413,13 @@ static int aout_Restart( aout_instance_t * p_aout )
     for ( i = 0; i < p_aout->i_nb_inputs; i++ )
     {
         aout_input_t * p_input = p_aout->pp_inputs[i];
-
-        b_error |= aout_InputNew( p_aout, p_input );
+        b_error |= aout_InputNew( p_aout, p_input, &p_input->request_vout );
         p_input->b_changed = 1;
-        vlc_mutex_unlock( &p_input->lock );
+        aout_unlock_input( p_aout, p_input );
     }
 
-    vlc_mutex_unlock( &p_aout->input_fifos_lock );
-    vlc_mutex_unlock( &p_aout->mixer_lock );
+    aout_unlock_input_fifos( p_aout );
+    aout_unlock_mixer( p_aout );
 
     return b_error;
 }