Changeset 25d2a663a98c0adc49d95e3ad5612f76da954953

Timestamp:

21/08/04 01:37:40 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1093045060 +0000

git-parent:

[235b3bcb3cc58024302fe3eecd8d65efc6bba113]

git-author:

Gildas Bazin <gbazin@videolan.org> 1093045060 +0000

Message:

* src/input/*, include/vlc_input.h: the MRL is now parsed for titles/chapters directly in the core.

• syntax is: [url][@[title-start][,chapter-start][-[title-end][,chapter-end]]]
  
• core also handles start/end boundaries itself (simplifies the access plugins).
  

* modules/access/dvdread.c,dvdnav.c,cdda.c: removed MRL parsing code.

Files:

• include/vlc_input.h (modified) (2 diffs)
• modules/access/cdda.c (modified) (7 diffs)
• modules/access/dvdnav.c (modified) (10 diffs)
• modules/access/dvdread.c (modified) (19 diffs)
• src/input/input.c (modified) (22 diffs)
• src/input/var.c (modified) (3 diffs)

include/vlc_input.h

@@ -202 +202 @@
-    input_title_t **title;
-
+    int i_title_offset;
+    int i_seekpoint_offset;
+
+    int i_title_start;
+    int i_title_end;
+    int i_seekpoint_start;
+    int i_seekpoint_end;
+
-    /* Properties */
-    vlc_bool_t b_can_pace_control;
@@ -253 +261 @@
-    int          i_title;
-    input_title_t **title;
+
+    int i_title_offset;
+    int i_seekpoint_offset;
-
-    /* User bookmarks FIXME won't be easy with multiples input */

modules/access/cdda.c

@@ -73 +73 @@
-    input_title_t *title[99];         /* No more that 99 track in a cd-audio */
-
-    int i_title_start;
-    int i_title_end;
-
-    /* Current position */
-    int         i_sector;                                  /* Current Sector */
@@ -91 +88 @@
-/*****************************************************************************
- * Open: open cdda
- * MRL syntax: [dev_path][@[title-start][-[title-end]]]
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
@@ -98 +94 @@
-    access_sys_t *p_sys;
-
-    char *psz_dup, *psz;
-    int  i, i_title_start = -1, i_title_end = -1;
-    vcddev_t *vcddev;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            return VLC_EGENERIC;
-        }
-    }
+    else psz_name = strdup( p_access->psz_path );
-
-    /* Open CDDA */
-dup
-
-dup
-dup
+name
+
+name
+name
-        return VLC_EGENERIC;
-    }
-dup
+name
-
-    /* Set up p_access */
@@ -185 +166 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    /* Build a WAV header for the output data */
@@ -267 +239 @@
-    while( p_sys->i_sector >= p_sys->p_sectors[p_access->info.i_title + 1] )
-    {
-
-
-
+
-        {
-            p_access->info.b_eof = VLC_TRUE;
@@ -372 +342 @@
-            ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
-            pi_int    = (int*)va_arg( args, int* );
+        *((int*)va_arg( args, int* )) = 1; /* Title offset */
-
-            /* Duplicate title infos */
@@ -395 +366 @@
-                /* Next sector to read */
-                p_sys->i_sector = p_sys->p_sectors[i];
-
-                /* User tries to access another title so better reset
-                 * the end title */
-                p_sys->i_title_end = -1;
-            }
-            break;

modules/access/dvdnav.c

@@ -53 +53 @@
- * Module descriptor
- *****************************************************************************/
+#define ANGLE_TEXT N_("DVD angle")
+#define ANGLE_LONGTEXT N_( \
+    "Allows you to select the default DVD angle." )
+
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
@@ -67 +71 @@
-vlc_module_begin();
-    set_description( _("DVDnav Input") );
+    add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT,
+        ANGLE_LONGTEXT, VLC_FALSE );
-    add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-        CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
@@ -83 +89 @@
- * Local prototypes
- *****************************************************************************/
-static char *ParseCL( vlc_object_t *, char *, vlc_bool_t, int *, int *, int *);
-
-typedef struct
-{
@@ -147 +151 @@
-    demux_sys_t *p_sys;
-    dvdnav_t    *p_dvdnav;
-title, i_chapter, i_
+
-    char        *psz_name;
-    vlc_value_t val;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Try some simple probing to avoid going through dvdnav_open too often */
@@ -164 +180 @@
-        return VLC_EGENERIC;
-    }
-
-    msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d",
-             psz_name, i_title, i_chapter, i_angle );
-
-    /* Open dvdnav */
@@ -228 +241 @@
-    DemuxTitles( p_demux );
-
-    /* Set forced title/chapter */
-    if( i_title > 0 )
-    {
-        if( dvdnav_title_play( p_sys->dvdnav, i_title ) != DVDNAV_STATUS_OK )
-        {
-            msg_Warn( p_demux, "cannot set title" );
-            i_title = 0;
-        }
-        else
-        {
-            p_demux->info.i_update |= INPUT_UPDATE_TITLE;
-            p_demux->info.i_title = i_title;
-        }
-    }
-
-    if( i_chapter > 1 && i_title > 0 )
-    {
-        if( dvdnav_part_play( p_sys->dvdnav, i_title, i_chapter ) !=
-            DVDNAV_STATUS_OK )
-        {
-            msg_Warn( p_demux, "cannot set chapter" );
-            i_chapter = 1;
-        }
-        else
-        {
-            p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
-            p_demux->info.i_seekpoint = i_chapter;
-        }
-    }
-
-    var_Create( p_demux, "dvdnav-menu", VLC_VAR_BOOL|VLC_VAR_DOINHERIT );
-    var_Get( p_demux, "dvdnav-menu", &val );
-(i_title < 0 && val.b_bool) || i_title == 0
+val.b_bool
-    {
-        msg_Dbg( p_demux, "trying to go to dvd menu" );
@@ -274 +257 @@
-            msg_Warn( p_demux, "cannot go to dvd menu" );
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    /* Update default_pts to a suitable value for dvdnav access */
@@ -427 +407 @@
-            ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
-            pi_int    = (int*)va_arg( args, int* );
+        *((int*)va_arg( args, int* )) = 0; /* Title offset */
+        *((int*)va_arg( args, int* )) = 1; /* Chapter offset */
-
-            /* Duplicate title infos */
@@ -733 +715 @@
-}
-
-/*****************************************************************************
- * ParseCL: parse command line.
- * Titles start from 0 (menu), chapters and angles start from 1.
- *****************************************************************************/
-static char *ParseCL( vlc_object_t *p_this, char *psz_name, vlc_bool_t b_force,
-                      int *i_title, int *i_chapter, int *i_angle )
-{
-    char *psz_parser, *psz_source, *psz_next;
-
-    psz_source = strdup( psz_name );
-    if( psz_source == NULL ) return NULL;
-
-    *i_title = -1;
-    *i_chapter = 1;
-    *i_angle = 1;
-
-    /* Start with the end, because you could have :
-     * dvdnav:/Volumes/my@toto/VIDEO_TS@1,1
-     * (yes, this is kludgy). */
-    for( psz_parser = psz_source + strlen(psz_source) - 1;
-         psz_parser >= psz_source && *psz_parser != '@';
-         psz_parser-- );
-
-    if( psz_parser >= psz_source && *psz_parser == '@' )
-    {
-        /* Found options */
-        *psz_parser = '\0';
-        ++psz_parser;
-
-        *i_title = (int)strtol( psz_parser, &psz_next, 10 );
-        if( *psz_next )
-        {
-            psz_parser = psz_next + 1;
-            *i_chapter = (int)strtol( psz_parser, &psz_next, 10 );
-            if( *psz_next )
-            {
-                *i_angle = (int)strtol( psz_next + 1, NULL, 10 );
-            }
-        }
-    }
-
-    *i_title   = *i_title >= 0 ? *i_title : -1;
-    *i_chapter = *i_chapter > 0 ? *i_chapter : 1;
-    *i_angle   = *i_angle > 0 ? *i_angle : 1;
-
-    if( !*psz_source )
-    {
-        free( psz_source );
-        if( !b_force )
-        {
-            return NULL;
-        }
-        psz_source = config_GetPsz( p_this, "dvd" );
-        if( !psz_source ) return NULL;
-    }
-
-#ifdef WIN32
-    if( psz_source[0] && psz_source[1] == ':' &&
-        psz_source[2] == '\\' && psz_source[3] == '\0' )
-    {
-        psz_source[2] = '\0';
-    }
-#endif
-
-    return psz_source;
-}
-
-static void DemuxTitles( demux_t *p_demux )
-{
@@ -856 +771 @@
-        {
-            s = vlc_seekpoint_New();
-            s->psz_name = malloc( strlen( _("Chapter %i") ) + 20 );
-            sprintf( s->psz_name, _("Chapter %i"), j + 1 );
-            TAB_APPEND( t->i_seekpoint, t->seekpoint, s );
-        }

modules/access/dvdread.c

@@ -55 +55 @@
- * Module descriptor
- *****************************************************************************/
+#define ANGLE_TEXT N_("DVD angle")
+#define ANGLE_LONGTEXT N_( \
+    "Allows you to select the default DVD angle." )
+
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
@@ -85 +89 @@
-vlc_module_begin();
-    set_description( _("DVDRead Input") );
+    add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
+        ANGLE_LONGTEXT, VLC_FALSE );
-    add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-        CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
@@ -91 +97 @@
-        change_string_list( psz_css_list, psz_css_list_text, 0 );
-    set_capability( "access_demux", 0 );
-//
+
-    add_shortcut( "dvdread" );
-    add_shortcut( "dvdsimple" );
@@ -151 +157 @@
-};
-
-static char *ParseCL( vlc_object_t *, char *, vlc_bool_t, int *, int *, int *);
-
-static int Control   ( demux_t *, int, va_list );
-static int Demux     ( demux_t * );
-static int DemuxBlock( demux_t *, uint8_t *, int );
-
-, int *, int *
+
-static void ESNew( demux_t *, int, int );
-
@@ -172 +176 @@
-    demux_t      *p_demux = (demux_t*)p_this;
-    demux_sys_t  *p_sys;
-    int          i_title, i_chapter, i_angle;
-    char         *psz_name;
-    char         *psz_dvdcss_env;
-    dvd_reader_t *p_dvdread;
-    ifo_handle_t *p_vmg_file;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Override environment variable DVDCSS_METHOD with config option
@@ -194 +210 @@
-        psz_env = malloc( strlen("DVDCSS_METHOD=") +
-                          strlen( psz_dvdcss_env ) + 1 );
-
-        if( !psz_env )
-        {
@@ -240 +255 @@
-
-    p_sys->i_title = p_sys->i_chapter = -1;
-
-
-
-
-
+
+
+
+
+
+
+
-
-    /* Update default_pts to a suitable value for dvdread access */
@@ -351 +368 @@
-            ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
-            pi_int    = (int*)va_arg( args, int* );
+            *((int*)va_arg( args, int* )) = 1; /* Title offset */
+            *((int*)va_arg( args, int* )) = 1; /* Chapter offset */
-
-            /* Duplicate title infos */
@@ -434 +453 @@
-        if( p_sys->i_next_vobu > p_sys->i_title_end_block )
-        {
-
+
+
+
+
-
-            DvdReadSetArea( p_demux, p_sys->i_title + 1, 0, -1 );
@@ -441 +463 @@
-        if( p_sys->i_pack_len >= 1024 )
-        {
-
+
+
-            return 0; /* EOF */
-        }
@@ -455 +478 @@
-    if( p_sys->i_cur_block > p_sys->i_title_end_block )
-    {
-
+
+
+
+
-
-        DvdReadSetArea( p_demux, p_sys->i_title + 1, 0, -1 );
@@ -902 +928 @@
-     */
-
-=
+
-    {
-        pgc_id = p_vts->vts_ptt_srpt->title[
@@ -1053 +1079 @@
-     */
-    p_sys->i_cur_block = p_sys->dsi_pack.dsi_gi.nv_pck_lbn;
+    p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
-
-    /*
@@ -1061 +1088 @@
-     * really happy.
-     */
-
+
+
+
+
+
+
-    {
-        switch( ( p_sys->dsi_pack.sml_pbi.category & 0xf000 ) >> 12 )
@@ -1077 +1109 @@
-                p_sys->i_next_vobu = p_sys->i_cur_block +
-                    p_sys->dsi_pack.dsi_gi.vobu_ea + 1;
-                p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
-            }
-            break;
@@ -1101 +1132 @@
-            p_sys->i_next_vobu = p_sys->i_cur_block +
-                ( p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff );
-            p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
-            break;
-        }
-    }
-
+ if( p_sys->dsi_pack.vobu_sri.next_vobu == SRI_END_OF_CELL )
-    {
-        p_sys->i_cur_cell = p_sys->i_next_cell;
-        DvdReadFindCell( p_demux );
-
-        p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
-        p_sys->i_next_vobu =
-            p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].first_sector;
@@ -1188 +1217 @@
- * DemuxTitles: get the titles/chapters structure
- *****************************************************************************/
-
-
+
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
@@ -1212 +1240 @@
-
-        t = vlc_input_title_New();
-        t->psz_name = malloc( strlen( _("Title %i") ) + 20 );
-        sprintf( t->psz_name, _("Title %i"), i + 1 );
-
-        for( j = 0; j < __MAX( i_chapters, 1 ); j++ )
-        {
-            s = vlc_seekpoint_New();
-            s->psz_name = malloc( strlen( _("Chapter %i") ) + 20 );
-            sprintf( s->psz_name, _("Chapter %i"), j + 1 );
-            TAB_APPEND( t->i_seekpoint, t->seekpoint, s );
-        }
@@ -1225 +1249 @@
-        TAB_APPEND( p_sys->i_titles, p_sys->titles, t );
-    }
-
-    /* Set forced title/chapter/angle */
-    *pi_title = (*pi_title >= 0 && *pi_title < i_titles) ? *pi_title : 0;
-    *pi_chapter = (*pi_chapter >= 0 && *pi_chapter <
-        tt_srpt->title[*pi_title].nr_of_ptts) ? *pi_chapter : 0;
-
-#undef tt_srpt
-}
-
-/*****************************************************************************
- * ParseCL: parse command line. Titles, chapters and angles start from 1.
- *****************************************************************************/
-static char *ParseCL( vlc_object_t *p_this, char *psz_name, vlc_bool_t b_force,
-                      int *i_title, int *i_chapter, int *i_angle )
-{
-    char *psz_parser, *psz_source, *psz_next;
-
-    psz_source = strdup( psz_name );
-    if( psz_source == NULL ) return NULL;
-
-    *i_title = 1;
-    *i_chapter = 1;
-    *i_angle = 1;
-
-    /* Start with the end, because you could have :
-     * dvdnav:/Volumes/my@toto/VIDEO_TS@1,1
-     * (yes, this is kludgy). */
-    for( psz_parser = psz_source + strlen(psz_source) - 1;
-         psz_parser >= psz_source && *psz_parser != '@';
-         psz_parser-- );
-
-    if( psz_parser >= psz_source && *psz_parser == '@' )
-    {
-        /* Found options */
-        *psz_parser = '\0';
-        ++psz_parser;
-
-        *i_title = (int)strtol( psz_parser, &psz_next, 10 );
-        if( *psz_next )
-        {
-            psz_parser = psz_next + 1;
-            *i_chapter = (int)strtol( psz_parser, &psz_next, 10 );
-            if( *psz_next )
-            {
-                *i_angle = (int)strtol( psz_next + 1, NULL, 10 );
-            }
-        }
-    }
-
-    *i_title   = *i_title > 0 ? *i_title : 1;
-    *i_chapter = *i_chapter > 0 ? *i_chapter : 1;
-    *i_angle   = *i_angle > 0 ? *i_angle : 1;
-
-    if( !*psz_source )
-    {
-        free( psz_source );
-        if( !b_force )
-        {
-            return NULL;
-        }
-        psz_source = config_GetPsz( p_this, "dvd" );
-        if( !psz_source ) return NULL;
-    }
-
-#ifdef WIN32
-    if( psz_source[0] && psz_source[1] == ':' &&
-        psz_source[2] == '\\' && psz_source[3] == '\0' )
-    {
-        psz_source[2] = '\0';
-    }
-#endif
-
-    msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d",
-             psz_source, *i_title, *i_chapter, *i_angle );
-
-    /* Get back to a 0-based offset */
-    (*i_title)--;
-    (*i_chapter)--;
-
-    return psz_source;
-}

src/input/input.c

@@ -54 +54 @@
-
-
-void
-void
+int 
+int 
-
-static void UpdateItemLength( input_thread_t *, int64_t i_length );
@@ -63 +63 @@
-static void DecodeUrl  ( char * );
-static void MRLSplit( input_thread_t *, char *, char **, char **, char ** );
+static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
-
-static input_source_t *InputSourceNew( input_thread_t *);
@@ -124 +125 @@
-    p_input->i_title = 0;
-    p_input->title   = NULL;
+    p_input->i_title_offset = p_input->i_seekpoint_offset = 0;
-    p_input->i_state = INIT_S;
-    p_input->i_rate  = INPUT_RATE_DEFAULT;
@@ -133 +135 @@
-    p_input->i_pts_delay = 0;
-
-
-    /* Init Input fields */
-    p_input->input.p_item = p_item;
@@ -142 +143 @@
-    p_input->input.i_title  = 0;
-    p_input->input.title    = NULL;
+    p_input->input.i_title_offset = p_input->input.i_seekpoint_offset = 0;
-    p_input->input.b_can_pace_control = VLC_TRUE;
-    p_input->input.b_eof = VLC_FALSE;
@@ -345 +347 @@
-                    p_input->input.p_demux->info.i_update )
-                {
-
+i_ret = 
-                    b_force_update = VLC_TRUE;
-                }
@@ -352 +354 @@
-                          p_input->input.p_access->info.i_update )
-                {
-
+i_ret = 
-                    b_force_update = VLC_TRUE;
-                }
-            }
-
+
+
-            {
-                vlc_value_t repeat;
@@ -378 +381 @@
-                    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    if( p_input->i_start > 0 )
-                    {
@@ -422 +437 @@
-        vlc_mutex_unlock( &p_input->lock_control );
-
-
-
+
-        {
-            vlc_value_t val;
@@ -530 +544 @@
-    p_input->i_title = p_input->input.i_title;
-    p_input->title   = p_input->input.title;
+    p_input->i_title_offset = p_input->input.i_title_offset;
+    p_input->i_seekpoint_offset = p_input->input.i_seekpoint_offset;
-    if( p_input->i_title > 0 )
-    {
@@ -548 +564 @@
-     * cache more data. */
-    var_Get( p_input, "audio-desync", &val );
-
-
+
-
-    /* Load master infos */
@@ -560 +575 @@
-        UpdateItemLength( p_input, val.i_time );
-    }
+
+    /* Start title/chapter */
+    val.i_int = p_input->input.i_title_start -
+        p_input->input.i_title_offset;
+    if( val.i_int > 0 && val.i_int < p_input->input.i_title )
+        input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
+    val.i_int = p_input->input.i_seekpoint_start -
+        p_input->input.i_seekpoint_offset;
+    if( val.i_int > 0 /* TODO: check upper boundary */ )
+        input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
+
-    /* Start time*/
-    /* Set start time */
@@ -1345 +1371 @@
- * UpdateFromDemux:
- *****************************************************************************/
-void
+int
-{
-    demux_t *p_demux = p_input->input.p_demux;
@@ -1367 +1393 @@
-    }
-    p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
+
+    /* Hmmm only works with master input */
+    if( p_input->input.p_demux == p_demux )
+    {
+        int i_title_end = p_input->input.i_title_end -
+            p_input->input.i_title_offset;
+        int i_seekpoint_end = p_input->input.i_seekpoint_end -
+            p_input->input.i_seekpoint_offset;
+
+        if( i_title_end >= 0 && i_seekpoint_end >=0 )
+        {
+            if( p_demux->info.i_title > i_title_end ||
+                ( p_demux->info.i_title == i_title_end &&
+                  p_demux->info.i_seekpoint > i_seekpoint_end ) ) return 0;
+        }
+        else if( i_seekpoint_end >=0 )
+        {
+            if( p_demux->info.i_seekpoint > i_seekpoint_end ) return 0;
+        }
+        else if( i_title_end >= 0 )
+        {
+            if( p_demux->info.i_title > i_title_end ) return 0;
+        }
+    }
+
+    return 1;
-}
-
@@ -1372 +1424 @@
- * UpdateFromAccess:
- *****************************************************************************/
-void
+int
-{
-    access_t *p_access = p_input->input.p_access;
@@ -1396 +1448 @@
-    }
-    p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
+
+    /* Hmmm only works with master input */
+    if( p_input->input.p_access == p_access )
+    {
+        int i_title_end = p_input->input.i_title_end -
+            p_input->input.i_title_offset;
+        int i_seekpoint_end = p_input->input.i_seekpoint_end -
+            p_input->input.i_seekpoint_offset;
+
+        if( i_title_end >= 0 && i_seekpoint_end >=0 )
+        {
+            if( p_access->info.i_title > i_title_end ||
+                ( p_access->info.i_title == i_title_end &&
+                  p_access->info.i_seekpoint > i_seekpoint_end ) ) return 0;
+        }
+        else if( i_seekpoint_end >=0 )
+        {
+            if( p_access->info.i_seekpoint > i_seekpoint_end ) return 0;
+        }
+        else if( i_title_end >= 0 )
+        {
+            if( p_access->info.i_title > i_title_end ) return 0;
+        }
+    }
+
+    return 1;
-}
-
@@ -1453 +1531 @@
-             psz_mrl, psz_access, psz_demux, psz_path );
-
+    /* Find optional titles and seekpoints */
+    MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
+                 &in->i_seekpoint_start, &in->i_seekpoint_end );
+
-    if( psz_forced_demux && *psz_forced_demux )
-        psz_demux = psz_forced_demux;
@@ -1473 +1555 @@
-
-        in->b_title_demux = VLC_TRUE;
-
-DEMUX_GET_TITLE_INFO
-title, &in->i_title
+ DEMUX_GET_TITLE_INFO,
+&in->title, &in->i_title
+i_title_offset, &in->i_seekpoint_offset
-        {
-            in->i_title = 0;
@@ -1538 +1620 @@
-
-        in->b_title_demux = VLC_FALSE;
-
-
-
+
+
+
+
-        {
-            in->i_title = 0;
@@ -1579 +1662 @@
-        {
-            if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
-
+
+
-            {
-                in->i_title = 0;
@@ -1872 +1956 @@
-}
-
+/*****************************************************************************
+ * MRLSplit: parse the access, demux and url part of the
+ *           Media Resource Locator.
+ *****************************************************************************/
-static void MRLSplit( input_thread_t *p_input, char *psz_dup,
-                      char **ppsz_access, char **ppsz_demux, char **ppsz_path )
@@ -1929 +2017 @@
-        *ppsz_path = psz_path;
-}
+
+/*****************************************************************************
+ * MRLSections: parse title and seekpoint info from the Media Resource Locator.
+ *
+ * Syntax:
+ * [url][@[title-start][,chapter-start][-[title-end][,chapter-end]]]
+ *****************************************************************************/
+static void MRLSections( input_thread_t *p_input, char *psz_source,
+                         int *pi_title_start, int *pi_title_end,
+                         int *pi_chapter_start, int *pi_chapter_end )
+{
+    char *psz, *psz_end, *psz_next;
+
+    *pi_title_start = *pi_title_end = -1;
+    *pi_chapter_start = *pi_chapter_end = -1;
+
+    /* Start by parsing titles and chapters */
+    if( !psz_source || !( psz = strrchr( psz_source, '@' ) ) ) return;
+
+    *psz++ = 0;
+
+    /* Separate start and end */
+    if( ( psz_end = strchr( psz, '-' ) ) ) *psz_end++ = 0;
+
+    /* Look for the start title */
+    *pi_title_start = strtol( psz, &psz_next, 0 );
+    if( !*pi_title_start && psz == psz_next ) *pi_title_start = -1;
+    *pi_title_end = *pi_title_start;
+    psz = psz_next;
+
+    /* Look for the start chapter */
+    if( *psz ) psz++;
+    *pi_chapter_start = strtol( psz, &psz_next, 0 );
+    if( !*pi_chapter_start && psz == psz_next ) *pi_chapter_start = -1;
+    *pi_chapter_end = *pi_chapter_start;
+
+    if( psz_end )
+    {
+        /* Look for the end title */
+        *pi_title_end = strtol( psz_end, &psz_next, 0 );
+        if( !*pi_title_end && psz_end == psz_next ) *pi_title_end = -1;
+        psz_end = psz_next;
+
+        /* Look for the end chapter */
+        if( *psz_end ) psz_end++;
+        *pi_chapter_end = strtol( psz_end, &psz_next, 0 );
+        if( !*pi_chapter_end && psz_end == psz_next ) *pi_chapter_end = -1;
+    }
+
+    msg_Dbg( p_input,