Subtitle rearrangements.

[dcpomatic.git] / src / lib / types.h

diff --git a/src/lib/types.h b/src/lib/types.h
index e7017a2950c7b79fdfe20ee89d724badf53f4a23..2bc6fa3a42894821042ca2109eda9e0165cfb5c1 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
-#include "dcpomatic_time.h"
 #include "position.h"
 #include "rect.h"
 #include <dcp/util.h>
@@ -33,7 +32,6 @@ class VideoContent;
 class AudioContent;
 class SubtitleContent;
 class FFmpegContent;
-class AudioBuffers;
 
 namespace cxml {
        class Node;
@@ -50,13 +48,10 @@ namespace xmlpp {
 #define SERVER_LINK_VERSION (64+0)
 
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
-typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList;
 typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
-typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
 typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
 
-typedef int64_t VideoFrame;
-typedef int64_t AudioFrame;
+typedef int64_t Frame;
 
 enum VideoFrameType
 {
@@ -87,6 +82,13 @@ enum Part
        PART_WHOLE
 };
 
+enum ReelType
+{
+       REELTYPE_SINGLE,
+       REELTYPE_BY_VIDEO_CONTENT,
+       REELTYPE_BY_LENGTH
+};
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -116,7 +118,7 @@ struct Crop
                if (s.height < minimum) {
                        s.height = minimum;
                }
-               
+
                return s;
        }
 
@@ -131,7 +133,7 @@ struct CPLSummary
                , cpl_annotation_text (a)
                , cpl_file (f)
        {}
-       
+
        std::string dcp_directory;
        std::string cpl_id;
        std::string cpl_annotation_text;
@@ -149,4 +151,9 @@ enum Resolution {
 std::string resolution_to_string (Resolution);
 Resolution string_to_resolution (std::string);
 
+enum Protocol {
+       PROTOCOL_SCP,
+       PROTOCOL_FTP
+};
+
 #endif