From 2c693a47328a4faa9581a792c24448407629279b Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 25 Mar 2014 01:38:18 +0100 Subject: stream: remove old chapter handling code Stream-level chapters (like DVD etc.) did potentially not have timestamps for each chapter, so STREAM_CTRL_SEEK_TO_CHAPTER and STREAM_CTRL_GET_CURRENT_CHAPTER were needed to navigate chapters. We've switched everything to use timestamps and that seems to work, so we can simplify the code and remove this old mechanism. --- stream/stream_dvdnav.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'stream/stream_dvdnav.c') diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 9cdc3c027b..c632e039d0 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -466,17 +466,6 @@ static int control(stream_t *stream, int cmd, void *arg) int tit, part; switch (cmd) { - case STREAM_CTRL_SEEK_TO_CHAPTER: { - int chap = *(unsigned int *)arg + 1; - - if (chap < 1) - break; - if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK) - break; - if (dvdnav_part_play(dvdnav, tit, chap) != DVDNAV_STATUS_OK) - break; - return 1; - } case STREAM_CTRL_GET_NUM_CHAPTERS: { if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK) break; @@ -502,12 +491,6 @@ static int control(stream_t *stream, int cmd, void *arg) free(parts); return 1; } - case STREAM_CTRL_GET_CURRENT_CHAPTER: { - if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK) - break; - *(unsigned int *)arg = part - 1; - return 1; - } case STREAM_CTRL_GET_TIME_LENGTH: { if (priv->duration) { *(double *)arg = (double)priv->duration / 1000.0; -- cgit v1.2.3