diff options
Diffstat (limited to 'stream/stream_dvdnav.c')
| -rw-r--r-- | stream/stream_dvdnav.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 87d18f6d23..5932fd049c 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <string.h> #include <errno.h> +#include "options.h" #include "mp_msg.h" #include "osdep/timer.h" #include "input/input.h" @@ -35,7 +36,6 @@ #include "spudec.h" #include "m_option.h" #include "m_struct.h" -#include "help_mp.h" #include "stream_dvd_common.h" /* state flags */ @@ -380,9 +380,9 @@ static int fill_buffer(stream_t *s, char *but, int len) priv->state &= ~NAV_FLAG_WAIT; if (priv->state & NAV_FLAG_WAIT_READ_AUTO) priv->state |= NAV_FLAG_WAIT_READ; - if(priv->title > 0 && dvd_last_chapter > 0) { + if(priv->title > 0 && s->opts->chapterrange[1] > 0) { int tit=0, part=0; - if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK && part > dvd_last_chapter) { + if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK && part > s->opts->chapterrange[1]) { priv->state |= NAV_FLAG_EOF; return 0; } @@ -557,7 +557,7 @@ static void show_audio_subs_languages(dvdnav_t *nav) if(format == 0xFFFF || format > 6) format = 1; //unknown id = i + base[format]; - mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, i, + mp_tmsg(MSGT_OPEN,MSGL_STATUS,"audio stream: %d format: %s (%s) language: %s aid: %d.\n", i, dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id); if (lang != 0xFFFF && lang && tmp[0]) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", id, tmp); @@ -575,7 +575,7 @@ static void show_audio_subs_languages(dvdnav_t *nav) tmp[1] = lang & 0xFF; tmp[2] = 0; } - mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, lg, tmp); + mp_msg(MSGT_OPEN,MSGL_STATUS,"subtitle ( sid ): %d language: %s\n", lg, tmp); if (lang != 0xFFFF && lang && tmp[0]) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", lg, tmp); } @@ -590,7 +590,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { else if(dvd_device) filename= dvd_device; else filename = DEFAULT_DVD_DEVICE; if(!(priv=new_dvdnav_stream(filename))) { - mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename, strerror(errno)); + mp_tmsg(MSGT_OPEN,MSGL_ERR,"Couldn't open DVD device: %s (%s)\n",filename, strerror(errno)); return STREAM_UNSUPPORTED; } |