Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / control / audio.c

diff --git a/src/control/audio.c b/src/control/audio.c
index 4fc9b2200b91c56f9a187ebd5feb0d0a7db817ce..6088750d9b7ec584854c30d067f25f76e785a13f 100644 (file)
--- a/src/control/audio.c
+++ b/src/control/audio.c
@@ -35,6 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_aout.h>
+#include <vlc_modules.h>
 
 #include "libvlc_internal.h"
 #include "media_player_internal.h"
@@ -305,7 +306,6 @@ void libvlc_audio_output_set_device_type( libvlc_media_player_t *mp,
  *****************************************************************************/
 void libvlc_audio_toggle_mute( libvlc_media_player_t *mp )
 {
-#warning FIXME: no playlist
     aout_ToggleMute( mp, NULL );
 }
 
@@ -316,10 +316,7 @@ int libvlc_audio_get_mute( libvlc_media_player_t *mp )
 
 void libvlc_audio_set_mute( libvlc_media_player_t *mp, int mute )
 {
-#warning Not quite thread-safe
-    if ( !mute != !libvlc_audio_get_mute( mp ) )
-#warning FIXME: no playlist
-        aout_ToggleMute( mp, NULL );
+    aout_SetMute( VLC_OBJECT(mp), NULL, !!mute );
 }
 
 /*****************************************************************************
@@ -329,7 +326,6 @@ int libvlc_audio_get_volume( libvlc_media_player_t *mp )
 {
     audio_volume_t i_volume;
 
-#warning FIXME: no playlist
     aout_VolumeGet( mp, &i_volume );
 
     return (i_volume*200+AOUT_VOLUME_MAX/2)/AOUT_VOLUME_MAX;
@@ -348,7 +344,6 @@ int libvlc_audio_set_volume( libvlc_media_player_t *mp, int i_volume )
     }
 
     i_volume = (i_volume * AOUT_VOLUME_MAX + 100) / 200;
-#warning FIXME: no playlist
     aout_VolumeSet( mp, i_volume );
     return 0;
 }
@@ -484,3 +479,37 @@ int libvlc_audio_set_channel( libvlc_media_player_t *mp, int channel )
     vlc_object_release( p_aout );
     return ret;
 }
+
+/*****************************************************************************
+ * libvlc_audio_get_delay : Get the current audio delay
+ *****************************************************************************/
+int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi )
+{
+    input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
+    int64_t val = 0;
+    if( p_input_thread != NULL )
+    {
+      val = var_GetTime( p_input_thread, "audio-delay" );
+      vlc_object_release( p_input_thread );
+    }
+    return val;
+}
+
+/*****************************************************************************
+ * libvlc_audio_set_delay : Set the current audio delay
+ *****************************************************************************/
+int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay )
+{
+    input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
+    int ret = 0;
+    if( p_input_thread != NULL )
+    {
+      var_SetTime( p_input_thread, "audio-delay", i_delay );
+      vlc_object_release( p_input_thread );
+    }
+    else
+    {
+      ret = -1;
+    }
+    return ret;
+}