From 969757baa0af99d905a9b8c99f0c92efa4e0fb33 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 2 Nov 2014 17:20:04 +0100
Subject: 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.
---
 player/core.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'player/core.h')

diff --git a/player/core.h b/player/core.h
index 445c0c7105..ae0a5c5dbb 100644
--- a/player/core.h
+++ b/player/core.h
@@ -47,11 +47,6 @@ struct timeline_part {
     struct demuxer *source;
 };
 
-struct chapter {
-    double start;
-    char *name;
-};
-
 enum mp_osd_seek_info {
     OSD_SEEK_INFO_BAR           = 1,
     OSD_SEEK_INFO_TEXT          = 2,
@@ -195,7 +190,7 @@ typedef struct MPContext {
     struct timeline_part *timeline;
     int num_timeline_parts;
     int timeline_part;
-    struct chapter *chapters;
+    struct demux_chapter *chapters;
     int num_chapters;
     double video_offset;
 
-- 
cgit v1.2.3