libvlc: use vlc_common.h (libvlccore) instead of vlc/vlc.h

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index a081ca421cc71ec7ce355865010269bdc25179c3..983f75950ede440efc10668a9f30d5f656469d2e 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -25,7 +25,11 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
@@ -100,7 +104,7 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
 
     config_PutInt( p_object, "volume", i_volume );
 
-    val.b_bool = VLC_TRUE;
+    val.b_bool = true;
     var_Set( p_object->p_libvlc, "volume-change", val );
 
     if ( p_aout == NULL ) return 0;
@@ -153,6 +157,7 @@ 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;
@@ -165,11 +170,14 @@ 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;
 
+    val.b_bool = true;
+    var_Set( p_object->p_libvlc, "volume-change", val );
+
     if ( p_aout == NULL ) return 0;
 
     vlc_mutex_lock( &p_aout->mixer_lock );
@@ -193,6 +201,7 @@ 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;
@@ -205,10 +214,13 @@ 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;
 
+    val.b_bool = true;
+    var_Set( p_object->p_libvlc, "volume-change", val );
+
     if ( p_aout == NULL ) return 0;
 
     vlc_mutex_lock( &p_aout->mixer_lock );
@@ -238,15 +250,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;
@@ -352,10 +364,10 @@ 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;
+    bool b_error = 0;
 
     vlc_mutex_lock( &p_aout->mixer_lock );
 
@@ -475,14 +487,14 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
  * \param b_add are we adding or removing the filter ?
  */
 void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
-                        vlc_bool_t b_add )
+                        bool b_add )
 {
     char *psz_parser, *psz_string;
     aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
                                                 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" );
 
@@ -531,7 +543,7 @@ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
     {
         var_SetString( p_aout, "audio-filter", psz_string );
         for( int i = 0; i < p_aout->i_nb_inputs; i++ )
-            p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+            p_aout->pp_inputs[i]->b_restart = true;
         vlc_object_release( p_aout );
     }
     free( psz_string );
@@ -544,5 +556,7 @@ 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;
+    msg_Err( p_this, "FIXME: %s (%s %d) isn't implemented.", __func__,
+             __FILE__, __LINE__ );
     return strdup("foobar");
 }