LibVLC audio: take a player object for most functions, remove exceptions

[vlc] / src / control / media_player.c

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 86be29dc93c7a89dcb74c43ba7ac431856d980a2..d9d17f3ca550553cee002a18cc1297042aee65c5 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -132,6 +132,8 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi )
     p_input_thread = p_mi->p_input_thread;
     if( p_input_thread )
         vlc_object_hold( p_input_thread );
+    else
+        libvlc_printerr( "No active input" );
     unlock(p_mi);
 
     return p_input_thread;
@@ -354,6 +356,9 @@ libvlc_media_player_new( libvlc_instance_t *instance )
     var_SetBool (mp, "keyboard-events", true);
     var_Create (mp, "mouse-events", VLC_VAR_BOOL);
 
+    /* Audio */
+    var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+
     mp->p_md = NULL;
     mp->state = libvlc_NothingSpecial;
     mp->p_libvlc_instance = instance;