htcpcp: handle 418 I'm a teapot

[vlc] / src / input / vlm.c

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 8bae04d0cd37d7cacb323b72fa0898e7890544d4..83990ed61ef8f59f0b6b1e018b222885fa1966b5 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -317,13 +317,40 @@ static int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media,
     switch( i_query )
     {
     case VOD_MEDIA_PLAY:
+    {
         psz = (const char *)va_arg( args, const char * );
+        int64_t *i_time = (int64_t *)va_arg( args, int64_t *);
+        bool b_retry = false;
+        if (*i_time < 0)
+        {
+            /* No start time requested: return the current NPT */
+            i_ret = vlm_ControlInternal( vlm, VLM_GET_MEDIA_INSTANCE_TIME, id, psz_id, i_time );
+            /* The instance is not running yet, it will start at 0 */
+            if (i_ret)
+                *i_time = 0;
+        }
+        else
+        {
+            /* We want to seek before unpausing, but it won't
+             * work if the instance is not running yet. */
+            b_retry = vlm_ControlInternal( vlm, VLM_SET_MEDIA_INSTANCE_TIME, id, psz_id, *i_time );
+        }
+
         i_ret = vlm_ControlInternal( vlm, VLM_START_MEDIA_VOD_INSTANCE, id, psz_id, 0, psz );
+
+        if (!i_ret && b_retry)
+            i_ret = vlm_ControlInternal( vlm, VLM_SET_MEDIA_INSTANCE_TIME, id, psz_id, *i_time );
         break;
+    }
 
     case VOD_MEDIA_PAUSE:
+    {
+        int64_t *i_time = (int64_t *)va_arg( args, int64_t *);
         i_ret = vlm_ControlInternal( vlm, VLM_PAUSE_MEDIA_INSTANCE, id, psz_id );
+        if (!i_ret)
+            i_ret = vlm_ControlInternal( vlm, VLM_GET_MEDIA_INSTANCE_TIME, id, psz_id, i_time );
         break;
+    }
 
     case VOD_MEDIA_STOP:
         i_ret = vlm_ControlInternal( vlm, VLM_STOP_MEDIA_INSTANCE, id, psz_id );
@@ -445,7 +472,7 @@ static void* Manage( void* p_object )
         {
             mtime_t i_real_date = vlm->schedule[i]->i_date;
 
-            if( vlm->schedule[i]->b_enabled == true )
+            if( vlm->schedule[i]->b_enabled )
             {
                 if( vlm->schedule[i]->i_date == 0 ) // now !
                 {
@@ -736,7 +763,7 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id
         p_vlm->p_vod = vlc_custom_create( VLC_OBJECT(p_vlm), sizeof( vod_t ),
                                           VLC_OBJECT_GENERIC, "vod server" );
         vlc_object_attach( p_vlm->p_vod, p_vlm->p_libvlc );
-        p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", NULL, false );
+        p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", "$vod-server", false );
         if( !p_vlm->p_vod->p_module )
         {
             msg_Err( p_vlm, "cannot find vod server" );
@@ -876,6 +903,8 @@ static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char
 
     p_instance->i_index = 0;
     p_instance->b_sout_keep = false;
+    p_instance->p_parent = vlc_object_create( p_vlm, sizeof (vlc_object_t) );
+    vlc_object_attach( p_instance->p_parent, p_vlm->p_libvlc );
     p_instance->p_input = NULL;
     p_instance->p_input_resource = NULL;
 
@@ -899,6 +928,7 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc
         input_resource_Terminate( p_instance->p_input_resource );
         input_resource_Release( p_instance->p_input_resource );
     }
+    vlc_object_release( p_instance->p_parent );
 
     TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance );
     vlc_gc_decref( p_instance->p_item );
@@ -934,6 +964,15 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
         if( !p_instance )
             return VLC_ENOMEM;
 
+        if ( p_cfg->b_vod )
+        {
+            var_Create( p_instance->p_parent, "vod-media", VLC_VAR_ADDRESS );
+            var_SetAddress( p_instance->p_parent, "vod-media",
+                            p_media->vod.p_media );
+            var_Create( p_instance->p_parent, "vod-session", VLC_VAR_STRING );
+            var_SetString( p_instance->p_parent, "vod-session", psz_id );
+        }
+
         if( p_cfg->psz_output != NULL || psz_vod_output != NULL )
         {
             char *psz_buffer;
@@ -994,21 +1033,15 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
 
     if( asprintf( &psz_log, _("Media: %s"), p_media->cfg.psz_name ) != -1 )
     {
-        vlc_object_t *p_parent = p_media->cfg.b_vod ?
-                                     VLC_OBJECT(p_vlm->p_vod) :
-                                     VLC_OBJECT(p_vlm->p_libvlc);
         if( !p_instance->p_input_resource )
-            p_instance->p_input_resource = input_resource_New( VLC_OBJECT( p_vlm->p_libvlc ) );
-        p_instance->p_input = input_Create( p_parent, p_instance->p_item,
-                                            psz_log, p_instance->p_input_resource );
+            p_instance->p_input_resource = input_resource_New( p_instance->p_parent );
+
+        p_instance->p_input = input_Create( p_instance->p_parent,
+                                            p_instance->p_item, psz_log,
+                                            p_instance->p_input_resource );
         if( p_instance->p_input )
         {
             var_AddCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
-            var_Create( p_instance->p_input, "vod-media", VLC_VAR_ADDRESS );
-            var_SetAddress( p_instance->p_input, "vod-media",
-                            p_media->vod.p_media );
-            var_Create( p_instance->p_input, "vod-session", VLC_VAR_STRING );
-            var_SetString( p_instance->p_input, "vod-session", psz_id );
 
             if( input_Start( p_instance->p_input ) != VLC_SUCCESS )
             {