diff -u -r MPlayer-20021022/libmpdemux/open.c MPlayer-new/libmpdemux/open.c --- MPlayer-20021022/libmpdemux/open.c Sun Oct 6 21:03:12 2002 +++ MPlayer-new/libmpdemux/open.c Tue Oct 22 19:11:28 2002 @@ -564,6 +564,34 @@ } #ifdef USE_DVDREAD +int dvd_chapter_from_cell(dvd_priv_t* dvd,int title,int cell) +{ + pgc_t * cur_pgc; + ptt_info_t* ptt; + int chapter = cell; + int pgc_id,pgn; + if(title < 0 || cell < 0){ + return 0; + } + /* for most DVD's chapter == cell */ + /* but there are more complecated cases... */ + if(chapter >= dvd->vmg_file->tt_srpt->title[title].nr_of_ptts){ + chapter = dvd->vmg_file->tt_srpt->title[title].nr_of_ptts-1; + } + title = dvd->tt_srpt->title[title].vts_ttn-1; + ptt = dvd->vts_file->vts_ptt_srpt->title[title].ptt; + while(chapter >= 0){ + pgc_id = ptt[chapter].pgcn; + pgn = ptt[chapter].pgn; + cur_pgc = dvd->vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc; + if(cell >= cur_pgc->program_map[pgn-1]-1){ + return chapter; + } + --chapter; + } + /* didn't find a chapter ??? */ + return chapter; +} int dvd_aid_from_lang(stream_t *stream, unsigned char* lang){ dvd_priv_t *d=stream->priv; diff -u -r MPlayer-20021022/libmpdemux/stream.h MPlayer-new/libmpdemux/stream.h --- MPlayer-20021022/libmpdemux/stream.h Sun Oct 6 21:03:12 2002 +++ MPlayer-new/libmpdemux/stream.h Tue Oct 22 19:12:27 2002 @@ -258,6 +258,7 @@ int dvd_aid_from_lang(stream_t *stream, unsigned char* lang); int dvd_sid_from_lang(stream_t *stream, unsigned char* lang); +int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); #endif diff -u -r MPlayer-20021022/mplayer.c MPlayer-new/mplayer.c --- MPlayer-20021022/mplayer.c Sat Oct 19 22:26:02 2002 +++ MPlayer-new/mplayer.c Tue Oct 22 19:13:10 2002 @@ -2565,7 +2565,10 @@ if ( stream->type == STREAMTYPE_DVD ) { dvd_priv_t * dvdp = stream->priv; - guiIntfStruct.DVD.current_chapter=dvdp->cur_cell + 1; + /*guiIntfStruct.DVD.current_chapter=dvdp->cur_cell + 1;*/ + guiIntfStruct.DVD.current_chapter= + dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, + dvdp->cur_cell)+1; } #endif }