diff options
author | wm4 <wm4@nowhere> | 2014-03-25 01:38:18 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-03-25 01:38:18 +0100 |
commit | 2c693a47328a4faa9581a792c24448407629279b (patch) | |
tree | 4f98655f55f9213ce6258c81cf6ac55b9be06463 /stream/stream_dvdnav.c | |
parent | 7bd3f2648152d41db9a9d3f479358d0d8f38b210 (diff) | |
download | mpv-2c693a47328a4faa9581a792c24448407629279b.tar.bz2 mpv-2c693a47328a4faa9581a792c24448407629279b.tar.xz |
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.
Diffstat (limited to 'stream/stream_dvdnav.c')
-rw-r--r-- | stream/stream_dvdnav.c | 17 |
1 files changed, 0 insertions, 17 deletions
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; |