[MPlayer-cvslog] r36175 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h stream/stream_bluray.c

[reimar]

Author: reimar
Date: Fri Apr 26 21:50:19 2013
New Revision: 36175

Log:
Remove the broken -bluray-chapter option.

Modified:
   trunk/cfg-common.h
   trunk/stream/stream_bluray.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Fri Apr 26 21:43:01 2013	(r36174)
+++ trunk/cfg-common.h	Fri Apr 26 21:50:19 2013	(r36175)
@@ -340,10 +340,9 @@ const m_option_t common_opts[] = {
     {"bluray-device",  &bluray_device,  CONF_TYPE_STRING, 0,          0,  0, NULL},
 #ifdef CONFIG_LIBBLURAY
     {"bluray-angle",   &bluray_angle,   CONF_TYPE_INT,    CONF_RANGE, 0, 999, NULL},
-    {"bluray-chapter", &bluray_chapter, CONF_TYPE_INT,    CONF_RANGE, 0, 999, NULL},
+    {"bluray-chapter", "The -bluray-chapter option was broken and thus removed, use -chapter instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #else
     {"bluray-angle",   "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-    {"bluray-chapter", "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIBBLURAY */
     {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},

Modified: trunk/stream/stream_bluray.c
==============================================================================
--- trunk/stream/stream_bluray.c	Fri Apr 26 21:43:01 2013	(r36174)
+++ trunk/stream/stream_bluray.c	Fri Apr 26 21:50:19 2013	(r36175)
@@ -47,7 +47,6 @@
 #define BLURAY_DEFAULT_TITLE      0
 
 int   bluray_angle   = 0;
-int   bluray_chapter = 0;
 
 struct bluray_priv_s {
     BLURAY *bd;
@@ -244,9 +243,8 @@ static int bluray_stream_open(stream_t *
     int title, title_guess, title_count;
     uint64_t title_size;
 
-    unsigned int chapter = 0, angle = 0;
+    unsigned int angle = 0;
     uint64_t max_duration = 0;
-    int64_t chapter_pos = 0;
 
     char *device = NULL;
     int i;
@@ -322,16 +320,6 @@ static int bluray_stream_open(stream_t *
     if (!info)
         goto err_no_info;
 
-    /* Select chapter */
-    chapter = bluray_chapter ? bluray_chapter : BLURAY_DEFAULT_CHAPTER;
-    chapter = FFMIN(chapter, info->chapter_count);
-
-    if (chapter)
-        chapter_pos = bd_chapter_pos(bd, chapter);
-
-    mp_msg(MSGT_IDENTIFY, MSGL_INFO,
-           "ID_BLURAY_CURRENT_CHAPTER=%d\n", chapter + 1);
-
     /* Select angle */
     angle = bluray_angle ? bluray_angle : BLURAY_DEFAULT_ANGLE;
     angle = FFMIN(angle, info->angle_count);
@@ -354,7 +342,6 @@ err_no_info:
     b->current_angle   = angle;
     b->current_title   = title;
 
-    s->start_pos   = chapter_pos;
     s->end_pos     = title_size;
     s->sector_size = BLURAY_SECTOR_SIZE;
     s->flags       = mode | MP_STREAM_SEEK;