make the previous-chapter "intelligent" seek more general, remove DEMUX_GET_SEEKPOINT...

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 2eefcb8cf855c78b707760e3a4eb406827552711..7c4385ba9b32198a4c269d74f750636f25b31acd 100644 (file)
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -82,7 +82,6 @@ enum demux_query_e
     /* TITLE/SEEKPOINT, only when TITLE_INFO succeed */
     DEMUX_SET_TITLE,            /* arg1= int            can fail */
     DEMUX_SET_SEEKPOINT,        /* arg1= int            can fail */
-    DEMUX_GET_SEEKPOINT_TIME,   /* arg1= int arg2 = mtime_t *  res = can fail   */
 
     /* DEMUX_SET_GROUP only a hit for demuxer (mainly DVB) to allow not
      * reading everything (you should not use this to call es_out_Control)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 29c5287c89e1615851717208227f7e81d01c3d1e..78e272075aca2504c50a24794ea9691b14cf0765 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -176,7 +176,7 @@ static inline seekpoint_t *vlc_seekpoint_New( void )
 {
     seekpoint_t *point = (seekpoint_t*)malloc( sizeof( seekpoint_t ) );
     point->i_byte_offset =
-    point->i_time_offset = 0;
+    point->i_time_offset = -1;
     point->i_level = 0;
     point->psz_name = NULL;
     return point;

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index c7225a3c46dfb95802e0ea314dfec51b656274a3..858e5dc3cd8a7698cb2d0fd2122b70af87ff5a1d 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -1197,16 +1197,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             }
             return VLC_EGENERIC;
 
-        case DEMUX_GET_SEEKPOINT_TIME:
-            i_skp = (int)va_arg( args, int );
-            i_sk_time = (mtime_t *)va_arg( args, mtime_t * );
-            if( p_sys->title && i_skp < p_sys->title->i_seekpoint)
-            {
-                *i_sk_time = p_sys->title->seekpoint[i_skp]->i_time_offset;
-                return VLC_SUCCESS;
-            }
-            return VLC_EGENERIC;
-
         case DEMUX_SET_TIME:
         case DEMUX_GET_FPS:
         default:

diff --git a/src/input/control.c b/src/input/control.c
index 25f5052c307aaa397aa71a68a33514c545a21c68..9ae07321e8d51d52295af4b6ac89cc6a01690266 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -384,12 +384,12 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
                 vlc_value_t pos;
                 int i_ret;
 
-                if( p_input->bookmark[i_bkmk]->i_time_offset )
+                if( p_input->bookmark[i_bkmk]->i_time_offset != -1 )
                 {
                     pos.i_time = p_input->bookmark[i_bkmk]->i_time_offset;
                     i_ret = var_Set( p_input, "time", pos );
                 }
-                else if( p_input->bookmark[i_bkmk]->i_byte_offset )
+                else if( p_input->bookmark[i_bkmk]->i_byte_offset != -1 )
                 {
                     // don't crash on bookmarks in live streams
                     if( stream_Size( p_input->input.p_stream ) == 0 )

diff --git a/src/input/input.c b/src/input/input.c
index 6211177bd3f576d33c8aa14af1f7da48db8a6dfa..bb0eef492d668e14c45e757ede3f2ed6e25f9340 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -183,7 +183,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
         psz_parser = val.psz_string;
         while( (psz_start = strchr( psz_parser, '{' ) ) )
         {
-            seekpoint_t seekpoint;
+            seekpoint_t *p_seekpoint = vlc_seekpoint_New();
             char backup;
             psz_start++;
             psz_end = strchr( psz_start, '}' );
@@ -193,30 +193,28 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
             *psz_parser = 0;
             *psz_end = ',';
 
-            seekpoint.psz_name = 0;
-            seekpoint.i_byte_offset = 0;
-            seekpoint.i_time_offset = 0;
             while( (psz_end = strchr( psz_start, ',' ) ) )
             {
                 *psz_end = 0;
                 if( !strncmp( psz_start, "name=", 5 ) )
                 {
-                    seekpoint.psz_name = psz_start + 5;
+                    p_seekpoint->psz_name = psz_start + 5;
                 }
                 else if( !strncmp( psz_start, "bytes=", 6 ) )
                 {
-                    seekpoint.i_byte_offset = atoll(psz_start + 6);
+                    p_seekpoint->i_byte_offset = atoll(psz_start + 6);
                 }
                 else if( !strncmp( psz_start, "time=", 5 ) )
                 {
-                    seekpoint.i_time_offset = atoll(psz_start + 5) * 1000000;
+                    p_seekpoint->i_time_offset = atoll(psz_start + 5) * 1000000;
                 }
                 psz_start = psz_end + 1;
             }
             msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd,
-                     seekpoint.psz_name, seekpoint.i_byte_offset,
-                     seekpoint.i_time_offset );
-            input_Control( p_input, INPUT_ADD_BOOKMARK, &seekpoint );
+                     p_seekpoint->psz_name, p_seekpoint->i_byte_offset,
+                     p_seekpoint->i_time_offset );
+            input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint );
+            vlc_seekpoint_Delete( p_seekpoint );
             *psz_parser = backup;
         }
         free( val.psz_string );
@@ -1499,7 +1497,8 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
                 if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
                 {
                     i_seekpoint = p_demux->info.i_seekpoint;
-                    if (demux2_Control( p_demux, DEMUX_GET_SEEKPOINT_TIME, p_demux->info.i_seekpoint, &i_seekpoint_time) == VLC_SUCCESS)
+                    i_seekpoint_time = p_input->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+                    if ( i_seekpoint_time != -1 )
                     {
                         demux2_Control( p_demux, INPUT_GET_TIME, &i_input_time );
                         if ( i_input_time < i_seekpoint_time + 3000000 )