From 4e767826303567f3ccd70c84b462b5dd0c140f6c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 10 Jul 2015 12:11:14 +0200
Subject: player: refactor chapter seek code

mp_seek_chapter() had only 1 caller. Also the code was rather
roundabout; the entire function can be compressed to 5 lines of code.
(The new code is functionally the same - "mpctx->last_chapter_seek =
-2;" was effectively a dead assingment.)
---
 player/command.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'player/command.c')

diff --git a/player/command.c b/player/command.c
index fb06cf1b33..c16f804883 100644
--- a/player/command.c
+++ b/player/command.c
@@ -762,7 +762,12 @@ static int mp_property_chapter(void *ctx, struct m_property *prop,
                     mpctx->stop_play = PT_NEXT_ENTRY;
             }
         } else {
-            mp_seek_chapter(mpctx, chapter);
+            double pts = chapter_start_time(mpctx, chapter);
+            if (pts != MP_NOPTS_VALUE) {
+                queue_seek(mpctx, MPSEEK_ABSOLUTE, pts, MPSEEK_DEFAULT, true);
+                mpctx->last_chapter_seek = chapter;
+                mpctx->last_chapter_pts = pts;
+            }
         }
         return M_PROPERTY_OK;
     }
-- 
cgit v1.2.3