lib: allow media player volume to be set before playing media

This is based on similar initialisation as is already done in the
playlist_Create() function.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 4098e6b6559c0ddbbd565ca441dc3d0b29592a66..176bf51ce0b8bb69ba79a0b19a22beb62f6a2790 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -653,4 +653,14 @@ VLC_API void input_resource_Terminate( input_resource_t * );
  */
 VLC_API audio_output_t *input_resource_HoldAout( input_resource_t * );
 
+/**
+ * This function creates or recycles an audio output.
+ */
+VLC_API audio_output_t *input_resource_GetAout( input_resource_t * );
+
+/**
+ * This function retains or destroys an audio output.
+ */
+VLC_API void input_resource_PutAout( input_resource_t *, audio_output_t * );
+
 #endif

diff --git a/lib/media_player.c b/lib/media_player.c
index daa9def3dadf6bdd3cea84e020e58513356ceb8c..868aefe627d816ba7e376f85c2cf78f287a22539 100644 (file)
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -501,6 +501,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
         vlc_object_release(mp);
         return NULL;
     }
+    audio_output_t *aout = input_resource_GetAout(mp->input.p_resource);
+    if( aout != NULL )
+        input_resource_PutAout(mp->input.p_resource, aout);
+
     vlc_mutex_init (&mp->input.lock);
     mp->i_refcount = 1;
     mp->p_event_manager = libvlc_event_manager_new(mp, instance);

diff --git a/src/input/resource.h b/src/input/resource.h
index f1ae4ef5dd18f22beab0f2e0081f8b89599496ad..4c24c749c56cb1a5fc48834f7591877c916e4120 100644 (file)
--- a/src/input/resource.h
+++ b/src/input/resource.h
@@ -36,16 +36,6 @@ void input_resource_SetInput( input_resource_t *, input_thread_t * );
  */
 sout_instance_t *input_resource_RequestSout( input_resource_t *, sout_instance_t *, const char *psz_sout );
 
-/**
- * This function creates or recycles an audio output.
- */
-audio_output_t *input_resource_GetAout( input_resource_t * );
-
-/**
- * This function retains or destroys an audio output.
- */
-void input_resource_PutAout( input_resource_t *, audio_output_t * );
-
 /**
  * This function handles vout request.
  */

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index f6f83002c59142e009e3883dd516f35c1f7d406b..3858e43437121fffda2e17519a25910712be2e55 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -217,7 +217,9 @@ input_resource_New
 input_resource_Release
 input_resource_TerminateVout
 input_resource_Terminate
+input_resource_GetAout
 input_resource_HoldAout
+input_resource_PutAout
 input_Start
 input_Stop
 input_vaControl