From 486ce516255475e6ed70404bc6a75163344d8e4e Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 9 Apr 2009 14:23:09 +0000 Subject: Add a -indentify message that indicates if the current DVDNAV title is a menu or a video. Patch by Kevin DeKorte [kdekorte gmail com], approved by Nico. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29156 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_dvdnav.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'stream') diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 85d86713c2..b8b9dcc397 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -205,10 +205,13 @@ static int dvdnav_stream_read(dvdnav_priv_t * priv, unsigned char *buf, int *len if(ev->pgc_length) priv->duration = ev->pgc_length/90; - if (dvdnav_is_domain_vts(priv->dvdnav)) + if (dvdnav_is_domain_vts(priv->dvdnav)) { + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "DVDNAV_TITLE_IS_MOVIE\n"); priv->state &= ~NAV_FLAG_VTS_DOMAIN; - else + } else { + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "DVDNAV_TITLE_IS_MENU\n"); priv->state |= NAV_FLAG_VTS_DOMAIN; + } nextstill = dvdnav_get_next_still_flag (priv->dvdnav); if (nextstill) { -- cgit v1.2.3 From b6225fc8ae3d70448d0deb15ad960f2dd4df2590 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 10 Apr 2009 10:13:41 +0000 Subject: Make tvi_v4l2 print -1 as "Current input" if the ioctl to read it failed. Previously it printed (number of inputs + 1) which is needlessly confusing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29161 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l2.c | 1 + 1 file changed, 1 insertion(+) (limited to 'stream') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index c890d7a51e..5bd654282e 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -1313,6 +1313,7 @@ static int init(priv_t *priv) } mp_msg(MSGT_TV, MSGL_INFO, " %d = %s;", i, input.name); } + i = -1; if (ioctl(priv->video_fd, VIDIOC_G_INPUT, &i) < 0) { mp_msg(MSGT_TV, MSGL_ERR, "%s: ioctl get input failed: %s\n", info.short_name, strerror(errno)); -- cgit v1.2.3 From 4567425051667ca3dd06749ca7b86e78b6073d6f Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 11 Apr 2009 13:51:02 +0000 Subject: Reemit the ID_AID_x_LANG for the track. This allows the identification of the audio track by language code (en or es) rather than by ID (128 or 129). patch by Kevin DeKorte, kdekorte gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29170 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_dvdnav.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'stream') diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index b8b9dcc397..adb0fcb54c 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -74,6 +74,7 @@ static const struct m_struct_st stream_opts = { }; static int seek(stream_t *s, off_t newpos); +static void show_audio_subs_languages(dvdnav_t *nav); static dvdnav_priv_t * new_dvdnav_stream(char * filename) { const char * title_str; @@ -343,6 +344,7 @@ static int fill_buffer(stream_t *s, char *but, int len) priv->state &= ~NAV_FLAG_WAIT; s->end_pos = 0; update_title_len(s); + show_audio_subs_languages(priv->dvdnav); if (priv->state & NAV_FLAG_WAIT_READ_AUTO) priv->state |= NAV_FLAG_WAIT_READ; if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK) { @@ -538,8 +540,12 @@ 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, - dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id); + if (lang != 0xFFFF) { + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, i, + dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id); + if(lang && tmp[0]) + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", id, tmp); + } } for(i=0; i<32; i++) @@ -555,7 +561,8 @@ static void show_audio_subs_languages(dvdnav_t *nav) tmp[1] = lang & 0xFF; } tmp[2] = 0; - mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, i+0x20, tmp); + if (lang != 0xFFFF) + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, i+0x20, tmp); } } -- cgit v1.2.3