Also add support for x-playNow in RtspCallback.

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index df930c2c500d214fd6d5a8f6eec2890457f2342f..302926ab5654d2adb4f1477742fc531e6ba47648 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -623,6 +623,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
     vod_media_t *p_media = (vod_media_t*)p_args;
     vod_t *p_vod = p_media->p_vod;
     char *psz_transport = NULL;
+    char *psz_playnow = NULL; /* support option: x-playNow */
     char *psz_session = NULL;
     rtsp_client_t *p_rtsp;
 
@@ -638,6 +639,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
     {
         case HTTPD_MSG_SETUP:
         {
+            psz_playnow = httpd_MsgGet( query, "x-playNow" );
             psz_transport = httpd_MsgGet( query, "Transport" );
             msg_Dbg( p_vod, "HTTPD_MSG_SETUP: transport=%s", psz_transport );
 
@@ -681,6 +683,9 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     }
                 }
 
+                if( psz_playnow ) /* support option: x-playNow */
+                    goto rtsp_play_now;
+
                 answer->i_status = 200;
                 answer->psz_status = strdup( "OK" );
                 answer->i_body = 0;
@@ -724,6 +729,8 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
         }
 
         case HTTPD_MSG_PLAY:
+
+rtsp_play_now: /* This avoids code duplications although it is ugly. */
         {
             char *psz_output, ip[NI_MAXNUMERICHOST];
             int i, i_port_audio = 0, i_port_video = 0;