LGPL

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 4c9e117ce760010a5a03caa682d57e2528c3e359..e8fff115b27c63579ad0651c3200a08c4bfd34e1 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * intf.c : audio output API towards the interface modules
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * 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
- * GNU General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -68,11 +68,14 @@ static void prepareVolume (vlc_object_t *obj, audio_output_t **aoutp,
     /* FIXME: we need interlocking even if aout does not exist! */
     *aoutp = aout;
     if (aout != NULL)
+    {
+        obj = VLC_OBJECT(aout); /* use aout volume if aout exists */
         aout_lock_volume (aout);
+    }
     if (volp != NULL)
-        *volp = var_GetInteger (obj, "volume");
+        *volp = var_InheritInteger (obj, "volume");
     if (mutep != NULL)
-        *mutep = var_GetBool (obj, "mute");
+        *mutep = var_InheritBool (obj, "mute");
 }
 
 /** Commit a volume change transaction. */
@@ -81,6 +84,7 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
 {
     int ret = 0;
 
+    /* update caller (input manager) volume */
     var_SetInteger (obj, "volume", volume);
     var_SetBool (obj, "mute", mute);
 
@@ -89,10 +93,15 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
         aout_owner_t *owner = aout_owner (aout);
         float vol = volume / (float)AOUT_VOLUME_DEFAULT;
 
+        /* apply volume to the pipeline */
         aout_lock (aout);
         if (owner->module != NULL)
             ret = aout->pf_volume_set (aout, vol, mute);
         aout_unlock (aout);
+
+        /* update aout volume if it maintains its own */
+        var_SetInteger (aout, "volume", volume);
+        var_SetBool (aout, "mute", mute);
         aout_unlock_volume (aout);
 
         if (ret == 0)
@@ -102,7 +111,6 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
     return ret;
 }
 
-#if 0
 /** Cancel a volume change transaction. */
 static void cancelVolume (vlc_object_t *obj, audio_output_t *aout)
 {
@@ -113,7 +121,6 @@ static void cancelVolume (vlc_object_t *obj, audio_output_t *aout)
         vlc_object_release (aout);
     }
 }
-#endif
 
 #undef aout_VolumeGet
 /**
@@ -121,16 +128,12 @@ static void cancelVolume (vlc_object_t *obj, audio_output_t *aout)
  */
 audio_volume_t aout_VolumeGet (vlc_object_t *obj)
 {
-#if 0
     audio_output_t *aout;
     audio_volume_t volume;
 
     prepareVolume (obj, &aout, &volume, NULL);
     cancelVolume (obj, aout);
-    return 0;
-#else
-    return var_GetInteger (obj, "volume");
-#endif
+    return volume;
 }
 
 #undef aout_VolumeSet
@@ -201,16 +204,12 @@ int aout_ToggleMute (vlc_object_t *obj, audio_volume_t *volp)
  */
 bool aout_IsMuted (vlc_object_t *obj)
 {
-#if 0
     audio_output_t *aout;
     bool mute;
 
     prepareVolume (obj, &aout, NULL, &mute);
     cancelVolume (obj, aout);
     return mute;
-#else
-    return var_GetBool (obj, "mute");
-#endif
 }
 
 /**
@@ -234,20 +233,6 @@ int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
  * Pipelines management
  */
 
-/**
- * Marks the audio output for restart, to update any parameter of the output
- * plug-in (e.g. output device or channel mapping).
- */
-static void aout_Restart (audio_output_t *aout)
-{
-    aout_owner_t *owner = aout_owner (aout);
-
-    aout_lock (aout);
-    if (owner->input != NULL)
-        owner->need_restart = true;
-    aout_unlock (aout);
-}
-
 /*****************************************************************************
  * aout_ChannelsRestart : change the audio device or channels and restart
  *****************************************************************************/
@@ -264,7 +249,7 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
          * rebuilding the channel choices. */
         var_Destroy( p_aout, "audio-channels" );
     }
-    aout_Restart( p_aout );
+    aout_RequestRestart (p_aout);
     return 0;
 }
 
@@ -279,10 +264,10 @@ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
 {
     audio_output_t *p_aout = findAout( p_this );
 
-    if( aout_ChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) )
+    if( aout_ChangeFilterString( p_this, VLC_OBJECT(p_aout), "audio-filter", psz_name, b_add ) )
     {
         if( p_aout )
-            AoutInputsMarkToRestart( p_aout );
+            aout_InputRequestRestart( p_aout );
     }
 
     if( p_aout )