input: add access & stream controls for current title and seekpoint

diff --git a/include/vlc_access.h b/include/vlc_access.h
index c9121435793c461277b515f72ee40c5cf7cc1e10..0a1f5895001ad5824d5c287fc0881e7385554339 100644 (file)
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -47,15 +47,14 @@ enum access_query_e
 
     /* */
     ACCESS_GET_PTS_DELAY = 0x101,/* arg1= int64_t*       cannot fail */
-    /* */
-    ACCESS_GET_TITLE_INFO,  /* arg1=input_title_t*** arg2=int*      res=can fail */
-    /* Meta data */
-    ACCESS_GET_META,        /* arg1= vlc_meta_t **                  res=can fail */
+    ACCESS_GET_TITLE_INFO,  /* arg1=input_title_t*** arg2=int*  res=can fail */
+    ACCESS_GET_TITLE,       /* arg1=unsigned * res=can fail */
+    ACCESS_GET_SEEKPOINT,   /* arg1=unsigned * res=can fail */
 
-    /* */
-    ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type                       res=can fail */
+    /* Meta data */
+    ACCESS_GET_META,        /* arg1= vlc_meta_t ** res=can fail */
+    ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type res=can fail */
 
-    /* */
     ACCESS_GET_SIGNAL,      /* arg1=double *pf_quality, arg2=double *pf_strength   res=can fail */
 
     /* */

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 50a42c38093858ffc8f263d9b0d3aeb9b00ebd65..077255357fc702df6cf2809c28bfcf8d508a445c 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -105,6 +105,8 @@ enum stream_query_e
 
     /* */
     STREAM_GET_TITLE_INFO = 0x102, /**< arg1=input_title_t*** arg2=int* res=can fail */
+    STREAM_GET_TITLE,       /**< arg1=unsigned * res=can fail */
+    STREAM_GET_SEEKPOINT,   /**< arg1=unsigned * res=can fail */
     STREAM_GET_META,        /**< arg1= vlc_meta_t **       res=can fail */
     STREAM_GET_CONTENT_TYPE,    /**< arg1= char **         res=can fail */
     STREAM_GET_SIGNAL,      /**< arg1=double *pf_quality, arg2=double *pf_strength   res=can fail */

diff --git a/src/input/stream.c b/src/input/stream.c
index 9236f056c82e890e9987eb1cbcd81d5bcc1d9c40..4e29dea10596dd5c776c2542034166ed9f058894 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -555,6 +555,8 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
     static_control_match(CAN_PAUSE);
     static_control_match(CAN_CONTROL_PACE);
     static_control_match(GET_TITLE_INFO);
+    static_control_match(GET_TITLE);
+    static_control_match(GET_SEEKPOINT);
     static_control_match(GET_META);
     static_control_match(GET_CONTENT_TYPE);
     static_control_match(GET_SIGNAL);
@@ -572,6 +574,8 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
         case STREAM_CAN_PAUSE:
         case STREAM_CAN_CONTROL_PACE:
         case STREAM_GET_TITLE_INFO:
+        case STREAM_GET_TITLE:
+        case STREAM_GET_SEEKPOINT:
         case STREAM_GET_META:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_GET_SIGNAL:

diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c
index fbfa2d0a3a64caac4f0d93514cc9ecba0a7d09c5..ad3e97347e0cab9035f24cd1bb992ae817efcc8e 100644 (file)
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -297,6 +297,8 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
         }
 
         case STREAM_GET_TITLE_INFO:
+        case STREAM_GET_TITLE:
+        case STREAM_GET_SEEKPOINT:
         case STREAM_GET_META:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_GET_SIGNAL:

diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index daefe302e4f1b5cce07c87fb84ed4d35b0868234..ef3025bcc9f5a007ee85db52634fc721a2a56b13 100644 (file)
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -123,6 +123,8 @@ static int Control( stream_t *s, int i_query, va_list args )
             break;
 
         case STREAM_GET_TITLE_INFO:
+        case STREAM_GET_TITLE:
+        case STREAM_GET_SEEKPOINT:
         case STREAM_GET_META:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_GET_SIGNAL: