* src/audio_output/dec.c: revert changeset 22216 which doesn't make any sense whatso...

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 24c5c11e37a4dbdb6fbcd25010a0950fbe53231e..0f7407331920c8a03de4e297df032760667a9301 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.c : audio output API towards the interface modules
  *****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -31,10 +31,9 @@
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 #include <string.h>
 
-#include "audio_output.h"
+#include <vlc_aout.h>
 #include "aout_internal.h"
 
-
 /*
  * Volume management
  *
@@ -166,8 +165,8 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
         i_volume = AOUT_VOLUME_MAX;
     }
     config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
-    var_SetInteger( p_object->p_libvlc_global, "saved-volume" ,
+    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+    var_SetInteger( p_object->p_libvlc, "saved-volume" ,
                     (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
@@ -206,8 +205,8 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
         i_volume = AOUT_VOLUME_MIN;
     }
     config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
-    var_SetInteger( p_object->p_libvlc_global, "saved-volume", (audio_volume_t) i_volume );
+    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+    var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
     if ( p_aout == NULL ) return 0;
@@ -239,15 +238,15 @@ int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
     {
         /* Mute */
         i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
-        var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
-        var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume );
+        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+        var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume );
         if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
     }
     else
     {
         /* Un-mute */
-        var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
-        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global,
+        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc,
                                                    "saved-volume" );
         i_result = aout_VolumeSet( p_object, i_volume );
         if ( pi_volume != NULL ) *pi_volume = i_volume;
@@ -286,6 +285,7 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout )
 /* Placeholder for pf_volume_infos(). */
 int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
 {
+    (void)p_aout;
     *pi_soft = 0;
     return 0;
 }
@@ -322,18 +322,21 @@ void aout_VolumeNoneInit( aout_instance_t * p_aout )
 /* Placeholder for pf_volume_infos(). */
 int aout_VolumeNoneInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
 {
+    (void)p_aout; (void)pi_soft;
     return -1;
 }
 
 /* Placeholder for pf_volume_get(). */
 int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
 {
+    (void)p_aout; (void)pi_volume;
     return -1;
 }
 
 /* Placeholder for pf_volume_set(). */
 int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume )
 {
+    (void)p_aout; (void)i_volume;
     return -1;
 }
 
@@ -349,7 +352,7 @@ int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume )
  * This function is used whenever the parameters of the output plug-in are
  * changed (eg. selecting S/PDIF or PCM).
  *****************************************************************************/
-int aout_Restart( aout_instance_t * p_aout )
+static int aout_Restart( aout_instance_t * p_aout )
 {
     int i;
     vlc_bool_t b_error = 0;
@@ -420,11 +423,12 @@ int aout_Restart( aout_instance_t * p_aout )
  * rebuilding the audio-device and audio-channels variables.
  *****************************************************************************/
 int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
-                         vlc_value_t oldval, vlc_value_t val, void *p_data )
+                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
 
+    (void)psz_name; (void)oldval; (void)newval; (void)p_data;
     if ( p_aout == NULL ) return VLC_SUCCESS;
 
     if ( var_Type( p_aout, "audio-device" ) != 0 )
@@ -446,10 +450,11 @@ int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
  * aout_ChannelsRestart : change the audio device or channels and restart
  *****************************************************************************/
 int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
-                          vlc_value_t old_value, vlc_value_t new_value,
-                          void * unused )
+                          vlc_value_t oldval, vlc_value_t newval,
+                          void *p_data )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
+    (void)oldval; (void)newval; (void)p_data;
 
     if ( !strcmp( psz_variable, "audio-device" ) )
     {
@@ -477,7 +482,7 @@ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
                                                 FIND_ANYWHERE );
 
     if( p_aout )
-        psz_string = var_GetString( p_aout, "audio-filter" );
+        psz_string = var_GetNonEmptyString( p_aout, "audio-filter" );
     else
         psz_string = config_GetPsz( p_this, "audio-filter" );
 
@@ -538,5 +543,6 @@ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
  */
 char *aout_VisualChange( vlc_object_t *p_this, int i_skip )
 {
+    (void)p_this; (void)i_skip;
     return strdup("foobar");
 }