X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftypes.h;h=d0f4ec1f8955d20421aecabda5a1b720849be6eb;hb=dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d;hp=655aeba095ae29b3cea1a24e89abb39730a40113;hpb=f188128e2577942f030374631d3cf1324a00624a;p=dcpomatic.git diff --git a/src/lib/types.h b/src/lib/types.h index 655aeba09..d0f4ec1f8 100644 --- 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 @@ -33,7 +32,6 @@ class VideoContent; class AudioContent; class SubtitleContent; class FFmpegContent; -class AudioBuffers; namespace cxml { class Node; @@ -115,7 +113,7 @@ struct Crop if (s.height < minimum) { s.height = minimum; } - + return s; } @@ -130,7 +128,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 +146,9 @@ enum Resolution { std::string resolution_to_string (Resolution); Resolution string_to_resolution (std::string); +enum Protocol { + PROTOCOL_SCP, + PROTOCOL_FTP +}; + #endif