RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
Code Issues Releases Wiki Activity

dvdnav api changed

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6972 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
jonas 2002-08-11 17:14:41 +00:00
parent fac4fa6bf6
commit ef16ae58c9
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -3101,6 +3101,10 @@ if test "$_dvdnav" = yes ; then
else else
_ld_css="$_ld_css -ldvdnav" _ld_css="$_ld_css -ldvdnav"
fi fi
if test -n "$_dvdnavconfig" ; then
_dvdnav_version=`$_dvdnavconfig --version | sed "s/\.//g"`
_def_dvdnav_version="#define DVDNAVVERSION $_dvdnav_version"
fi
if test -n "$_dvdnavdir" ; then if test -n "$_dvdnavdir" ; then
_inc_extra="$_inc_extra -I$_dvdnavdir" _inc_extra="$_inc_extra -I$_dvdnavdir"
fi fi
@ -4412,6 +4416,7 @@ $_def_css
/* DVD navigation support using libdvdnav */ /* DVD navigation support using libdvdnav */
$_def_dvdnav $_def_dvdnav
$_def_dvdnav_version
/* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */ /* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */
#define MPEG12_POSTPROC 1 #define MPEG12_POSTPROC 1

25
mplayer.c
View File

@ -2692,7 +2692,24 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
break; break;
} }
case DVDNAV_SPU_STREAM_CHANGE: { case DVDNAV_SPU_STREAM_CHANGE: {
dvdnav_stream_change_event_t * stream_change=(dvdnav_stream_change_event_t*)(dvdnav_event->details); #if DVDNAVVERSION > 012
dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t*)(dvdnav_event->details);
printf("DVDNAV Event: Nav SPU Stream Change: phys: %d/%d/%d logical: %d\n",
stream_change->physical_wide,
stream_change->physical_letterbox,
stream_change->physical_pan_scan,
stream_change->logical);
if (vo_spudec && dvdsub_id!=stream_change->physical_wide) {
mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n",
d_dvdsub->id,stream_change->physical_wide);
// FIXME: need a better way to change SPU id
d_dvdsub->id=dvdsub_id=stream_change->physical_wide;
if (vo_spudec) spudec_reset(vo_spudec);
}
#else
dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
printf("DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n", printf("DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n",
stream_change->physical, stream_change->physical,
@ -2705,12 +2722,16 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
d_dvdsub->id=dvdsub_id=stream_change->physical; d_dvdsub->id=dvdsub_id=stream_change->physical;
if (vo_spudec) spudec_reset(vo_spudec); if (vo_spudec) spudec_reset(vo_spudec);
} }
#endif
break; break;
} }
case DVDNAV_AUDIO_STREAM_CHANGE: { case DVDNAV_AUDIO_STREAM_CHANGE: {
int aid_temp; int aid_temp;
#if DVDNAVVERSION > 012
dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t*)(dvdnav_event->details);
#else
dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details); dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
#endif
printf("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n", printf("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n",
stream_change->physical, stream_change->physical,