summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2014-04-24 18:44:46 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2014-05-04 02:46:11 +0200
commit48bd03dd912321b8bfa12b8b201d2f0b3aa43ae0 (patch)
tree56178a31524ea7276dc1a26a83a678917a783249 /stream
parent81c076b2f8c8b0da0ebcf1c8aadf4c7dfb5e5d22 (diff)
downloadmpv-48bd03dd912321b8bfa12b8b201d2f0b3aa43ae0.tar.bz2
mpv-48bd03dd912321b8bfa12b8b201d2f0b3aa43ae0.tar.xz
options: remove deprecated --identify
Also remove MSGL_SMODE and friends. Note: The indent in options.rst was added to work around a bug in ReportLab that causes the PDF manual build to fail.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_bluray.c11
-rw-r--r--stream/stream_dvd.c61
-rw-r--r--stream/stream_dvdnav.c4
3 files changed, 1 insertions, 75 deletions
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index 3300777658..f2b741e941 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -747,11 +747,9 @@ static int bluray_stream_open(stream_t *s, int mode)
b->num_titles = disc_info->num_hdmv_titles + disc_info->num_bdj_titles;
++b->num_titles; // for BLURAY_TITLE_TOP_MENU
++b->num_titles; // for BLURAY_TITLE_FIRST_PLAY
- MP_SMODE(s, "ID_BLURAY_TITLES=%d\n", b->num_titles);
} else {
/* check for available titles on disc */
b->num_titles = bd_get_titles(bd, TITLES_RELEVANT, 0);
- MP_SMODE(s, "ID_BLURAY_TITLES=%d\n", b->num_titles);
if (!b->num_titles) {
MP_ERR(s, "Can't find any Blu-ray-compatible title here.\n");
destruct(b);
@@ -768,10 +766,6 @@ static int bluray_stream_open(stream_t *s, int mode)
const int sec = ti->duration / 90000;
const int msec = (ti->duration - sec) % 1000;
- MP_SMODE(s, "ID_BLURAY_TITLE_%d_CHAPTERS=%d\n", i, ti->chapter_count);
- MP_SMODE(s, "ID_BLURAY_TITLE_%d_ANGLE=%d\n", i, ti->angle_count);
- MP_SMODE(s, "ID_BLURAY_TITLE_%d_LENGTH=%d.%03d\n", i, sec, msec);
-
/* try to guess which title may contain the main movie */
if (ti->duration > max_duration) {
max_duration = ti->duration;
@@ -801,11 +795,6 @@ static int bluray_stream_open(stream_t *s, int mode)
select_initial_title(s, title_guess);
select_initial_angle(s);
- if (b->current_title >= 0)
- MP_SMODE(s, "ID_BLURAY_CURRENT_TITLE=%d\n", b->current_title);
- if (b->current_angle >= 0)
- MP_SMODE(s, "ID_BLURAY_CURRENT_ANGLE=%d\n", b->current_angle + 1);
-
if (b->use_nav)
s->fill_buffer = bdnav_stream_fill_buffer;
else
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index c724832c1b..0394a2640c 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -345,32 +345,6 @@ static int mp_get_titleset_length(ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, in
}
-static int mp_describe_titleset(stream_t *stream, dvd_reader_t *dvd, tt_srpt_t *tt_srpt, int vts_no)
-{
- ifo_handle_t *vts_file;
- int title_no, msec=0;
-
- vts_file = ifoOpen(dvd, vts_no);
- if(!vts_file)
- return 0;
-
- if(!vts_file->vtsi_mat || !vts_file->vts_pgcit)
- {
- ifoClose(vts_file);
- return 0;
- }
-
- for(title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++)
- {
- if (tt_srpt->title[title_no].title_set_nr != vts_no)
- continue;
- msec = mp_get_titleset_length(vts_file, tt_srpt, title_no);
- MP_SMODE(stream, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no, msec / 1000, msec % 1000);
- }
- ifoClose(vts_file);
- return 1;
-}
-
static int get_num_chapter(ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, int title_no)
{
if(!vts_file || !tt_srpt)
@@ -768,34 +742,6 @@ static int open_s(stream_t *stream, int mode)
return STREAM_UNSUPPORTED;
}
tt_srpt = vmg_file->tt_srpt;
- if (mp_msg_test(stream->log, MSGL_SMODE))
- {
- int title_no; ///< title number
- MP_SMODE(stream, "ID_DVD_TITLES=%d\n", tt_srpt->nr_of_srpts);
- for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++)
- {
- MP_SMODE(stream, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title_no, tt_srpt->title[title_no].nr_of_ptts);
- MP_SMODE(stream, "ID_DVD_TITLE_%d_ANGLES=%d\n", title_no, tt_srpt->title[title_no].nr_of_angles);
- }
- }
- if (mp_msg_test(stream->log, MSGL_SMODE))
- {
- char volid[32];
- unsigned char discid [16]; ///< disk ID, a 128 bit MD5 sum
- int vts_no; ///< video title set number
- for (vts_no = 1; vts_no <= vmg_file->vts_atrt->nr_of_vtss; vts_no++)
- mp_describe_titleset(stream, dvd, tt_srpt, vts_no);
- if (DVDDiscID(dvd, discid) >= 0)
- {
- int i;
- MP_SMODE(stream, "ID_DVD_DISC_ID=");
- for (i = 0; i < 16; i ++)
- MP_SMODE(stream, "%02X", discid[i]);
- MP_SMODE(stream, "\n");
- }
- if (DVDUDFVolumeInfo(dvd, volid, sizeof(volid), NULL, 0) >= 0 || DVDISOVolumeInfo(dvd, volid, sizeof(volid), NULL, 0) >= 0)
- MP_SMODE(stream, "ID_DVD_VOLUME_ID=%s\n", volid);
- }
/**
* Make sure our title number is valid.
*/
@@ -806,7 +752,6 @@ static int open_s(stream_t *stream, int mode)
DVDClose( dvd );
return STREAM_UNSUPPORTED;
}
- MP_SMODE(stream, "ID_DVD_CURRENT_TITLE=%d\n", dvd_title);
--dvd_title; // remap 1.. -> 0..
/**
* Make sure the angle number is valid for this title.
@@ -897,9 +842,6 @@ static int open_s(stream_t *stream, int mode)
tmp,
audio_stream->id
);
- MP_SMODE(stream, "ID_AUDIO_ID=%d\n", audio_stream->id);
- if(language && tmp[0])
- MP_SMODE(stream, "ID_AID_%d_LANG=%s\n", audio_stream->id, tmp);
d->nr_of_channels++;
}
@@ -937,9 +879,6 @@ static int open_s(stream_t *stream, int mode)
sub_stream->id = pgc->subp_control[i] >> 8 & 31;
MP_INFO(stream, "subtitle ( sid ): %d language: %s\n", sub_stream->id, tmp);
- MP_SMODE(stream, "ID_SUBTITLE_ID=%d\n", sub_stream->id);
- if(language && tmp[0])
- MP_SMODE(stream, "ID_SID_%d_LANG=%s\n", sub_stream->id, tmp);
d->nr_of_subtitles++;
}
MP_INFO(stream, "number of subtitles on disk: %d\n",d->nr_of_subtitles);
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 5a08e22c6f..504aa065e1 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -659,8 +659,7 @@ static struct priv *new_dvdnav_stream(stream_t *stream, char *filename)
if (dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK)
MP_ERR(stream, "stream_dvdnav, failed to set PGC positioning\n");
/* report the title?! */
- if (dvdnav_get_title_string(priv->dvdnav, &title_str) == DVDNAV_STATUS_OK)
- MP_SMODE(stream, "ID_DVD_VOLUME_ID=%s\n", title_str);
+ dvdnav_get_title_string(priv->dvdnav, &title_str);
return priv;
}
@@ -712,7 +711,6 @@ static int open_s(stream_t *stream, int mode)
p->track, dvdnav_err_to_string(priv->dvdnav));
return STREAM_UNSUPPORTED;
}
- MP_SMODE(stream, "ID_DVD_CURRENT_TITLE=%d\n", p->track);
} else {
if (dvdnav_menu_call(priv->dvdnav, DVD_MENU_Root) != DVDNAV_STATUS_OK)
dvdnav_menu_call(priv->dvdnav, DVD_MENU_Title);