Reasonably straightforward stuff; main things are adding

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

diff --git a/src/lib/types.h b/src/lib/types.h
index 655aeba095ae29b3cea1a24e89abb39730a40113..33bad1d24455fc03938f175cd3f1bf3be7c06b1c 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,7 +48,6 @@ 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;
@@ -86,6 +83,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.
  */
@@ -115,7 +119,7 @@ struct Crop
                if (s.height < minimum) {
                        s.height = minimum;
                }
-               
+
                return s;
        }
 
@@ -130,7 +134,7 @@ struct CPLSummary
                , cpl_annotation_text (a)
                , cpl_file (f)
        {}
-       
+
        std::string dcp_directory;
        std::string cpl_id;
        std::string cpl_annotation_text;
@@ -148,4 +152,9 @@ enum Resolution {
 std::string resolution_to_string (Resolution);
 Resolution string_to_resolution (std::string);
 
+enum Protocol {
+       PROTOCOL_SCP,
+       PROTOCOL_FTP
+};
+
 #endif