summaryrefslogtreecommitdiff
path: root/src/mediadata.h
diff options
context:
space:
mode:
authorMaia Kozheva <sikon@ubuntu.com>2012-04-09 13:30:23 +0700
committerMaia Kozheva <sikon@ubuntu.com>2012-04-09 13:30:23 +0700
commit69d32924ffbfe2bb05d881a23af13b6070b9a9bd (patch)
tree15d9f808ef672e21bcf2da9b6c9fc8e48e157eff /src/mediadata.h
parent65a64d260e05c7bf8d3bdf82e796637dc820e574 (diff)
Imported Upstream version 0.8.0
Diffstat (limited to 'src/mediadata.h')
-rw-r--r--src/mediadata.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mediadata.h b/src/mediadata.h
index 6849e31..3e202e8 100644
--- a/src/mediadata.h
+++ b/src/mediadata.h
@@ -24,6 +24,7 @@
#include "tracks.h"
#include "subtracks.h"
#include "titletracks.h"
+#include "chapters.h"
#include "config.h"
#include <QString>
@@ -74,14 +75,9 @@ public:
SubTracks subs;
-#if GENERIC_CHAPTER_SUPPORT
- int chapters;
-#else
- //int chapters, angles; // for DVDs
+ Chapters chapters;
- // Matroshka chapters
- int mkv_chapters;
-#endif
+ int n_chapters;
// Clip info
QString clip_name;