fix next/previous chapter in disc mode

[vlc] / modules / access / cdda / access.c

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 919e0e9a145b0f71b27ea52b3fe21c28f758f822..c64ac30e8b1f28ed1e194ae439f34657edacd5f1 100644 (file)
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -501,6 +501,8 @@ CDDASeek( access_t * p_access, int64_t i_pos )
 
 /*
   Set up internal state so that we play a given track.
+  If we are using audio-ctl mode we also activate CD-ROM
+  to play.
  */
 static bool
 cdda_play_track( access_t *p_access, track_t i_track ) 
@@ -726,6 +728,8 @@ CDDAOpen( vlc_object_t *p_this )
     i_rc = CDDAInit( p_access, p_cdda );
     if ( VLC_SUCCESS != i_rc ) goto error;
 
+    cdda_play_track( p_access, i_track );
+
     CDDAFixupPlaylist( p_access, p_cdda, b_single_track );
 
 #if LIBCDIO_VERSION_NUM >= 72
@@ -789,8 +793,6 @@ CDDAOpen( vlc_object_t *p_this )
     p_cdda->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
     p_cdda->waveheader.DataLength  = 0;    /* we just don't know */
 
-    cdda_play_track( p_access, i_track );
-
     /* PTS delay */
     var_Create( p_access, MODULE_STRING "-caching",
                 VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
@@ -985,7 +987,7 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
            dbg_print( INPUT_DBG_EVENT, "set title %d", i );
             if( i != p_access->info.i_title )
             {
-               const track_t i_track = p_cdda->i_track + i;
+               const track_t i_track = p_cdda->i_first_track + i;
                 /* Update info */
                 p_access->info.i_title = i;
                if ( p_cdda->b_nav_mode)