diff options
Diffstat (limited to 'stream/stream_bluray.c')
| -rw-r--r-- | stream/stream_bluray.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 8ee69aaa80..81fd882f86 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -50,12 +50,10 @@ char *bluray_device = NULL; int bluray_angle = 0; -int bluray_chapter = 0; struct bluray_priv_s { BLURAY *bd; int current_angle; - int current_chapter; int current_title; }; @@ -135,7 +133,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg) } case STREAM_CTRL_GET_CURRENT_CHAPTER: { - *((unsigned int *) arg) = b->current_chapter; + *((unsigned int *) arg) = bd_get_current_chapter(b->bd); return 1; } @@ -247,9 +245,8 @@ static int bluray_stream_open(stream_t *s, int mode, 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; @@ -328,16 +325,6 @@ static int bluray_stream_open(stream_t *s, int mode, 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); @@ -358,10 +345,8 @@ err_no_info: b = calloc(1, sizeof(struct bluray_priv_s)); b->bd = bd; b->current_angle = angle; - b->current_chapter = chapter; 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; |