diff options
author | 2002-08-11 17:14:41 +0000 | |
---|---|---|
committer | 2002-08-11 17:14:41 +0000 | |
commit | ef16ae58c9f4b051891077d3e83c8d5638ea7394 (patch) | |
tree | 740a93448774f5fae02c5e9ff07317d8b5420443 /mplayer.c | |
parent | fac4fa6bf63a973ec8c73f1253c13f2d249d2bf6 (diff) |
dvdnav api changed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6972 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -2692,7 +2692,24 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) break; } 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", stream_change->physical, @@ -2705,12 +2722,16 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) d_dvdsub->id=dvdsub_id=stream_change->physical; if (vo_spudec) spudec_reset(vo_spudec); } - +#endif break; } case DVDNAV_AUDIO_STREAM_CHANGE: { 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); +#endif printf("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n", stream_change->physical, |