projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rest of src/lib/*.h tidying.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index 655aeba095ae29b3cea1a24e89abb39730a40113..d0f4ec1f8955d20421aecabda5a1b720849be6eb 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-20,7
+20,6
@@
#ifndef DCPOMATIC_TYPES_H
#define DCPOMATIC_TYPES_H
#ifndef DCPOMATIC_TYPES_H
#define DCPOMATIC_TYPES_H
-#include "dcpomatic_time.h"
#include "position.h"
#include "rect.h"
#include <dcp/util.h>
#include "position.h"
#include "rect.h"
#include <dcp/util.h>
@@
-33,7
+32,6
@@
class VideoContent;
class AudioContent;
class SubtitleContent;
class FFmpegContent;
class AudioContent;
class SubtitleContent;
class FFmpegContent;
-class AudioBuffers;
namespace cxml {
class Node;
namespace cxml {
class Node;
@@
-115,7
+113,7
@@
struct Crop
if (s.height < minimum) {
s.height = minimum;
}
if (s.height < minimum) {
s.height = minimum;
}
-
+
return s;
}
return s;
}
@@
-130,7
+128,7
@@
struct CPLSummary
, cpl_annotation_text (a)
, cpl_file (f)
{}
, cpl_annotation_text (a)
, cpl_file (f)
{}
-
+
std::string dcp_directory;
std::string cpl_id;
std::string cpl_annotation_text;
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);
std::string resolution_to_string (Resolution);
Resolution string_to_resolution (std::string);
+enum Protocol {
+ PROTOCOL_SCP,
+ PROTOCOL_FTP
+};
+
#endif
#endif