player: always use demux_chapter

Instead of defining a separate data structure in the core.

For some odd reason, demux_chapter exported the chapter time in
nano-seconds. Change that to the usual timestamps (rename the field
to make any code relying on this to fail compilation), and also remove
the unused chapter end time.

1 files changed, 4 insertions, 3 deletions

diff --git a/player/command.c b/player/command.c
index dbe81bff15..2995f094a0 100644
--- a/player/command.c
+++ b/player/command.c
@@ -1081,12 +1081,13 @@ static int mp_property_chapter_metadata(void *ctx, struct m_property *prop,
                                         int action, void *arg)
 {
     MPContext *mpctx = ctx;
-    struct demuxer *demuxer = mpctx->master_demuxer;
     int chapter = get_current_chapter(mpctx);
-    if (!demuxer || chapter < 0 || chapter >= demuxer->num_chapters)
+    if (chapter < 0 || chapter >= mpctx->num_chapters)
+        return M_PROPERTY_UNAVAILABLE;
+    if (!mpctx->chapters[chapter].metadata)
         return M_PROPERTY_UNAVAILABLE;
 
-    return tag_property(action, arg, demuxer->chapters[chapter].metadata);
+    return tag_property(action, arg, mpctx->chapters[chapter].metadata);
 }
 
 static int mp_property_vf_metadata(void *ctx, struct m_property *prop,