#ifndef DCPOMATIC_TYPES_H
#define DCPOMATIC_TYPES_H
-#include <vector>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <dcp/util.h>
#include "dcpomatic_time.h"
#include "position.h"
+#include "rect.h"
+#include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <stdint.h>
class Content;
class VideoContent;
/** The version number of the protocol used to communicate
* with servers. Intended to be bumped when incompatibilities
- * are introduced.
+ * are introduced. v2 uses 64+n
*/
-#define SERVER_LINK_VERSION 2
+#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<SubtitleContent> > SubtitleContentList;
typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
-typedef int64_t VideoFrame;
-typedef int64_t AudioFrame;
-
-/* XXX -> DCPAudio */
-struct TimedAudioBuffers
-{
- TimedAudioBuffers ()
- : time (0)
- {}
-
- TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, DCPTime t)
- : audio (a)
- , time (t)
- {}
-
- boost::shared_ptr<AudioBuffers> audio;
- DCPTime time;
-};
+typedef int64_t Frame;
enum VideoFrameType
{
if (s.height < minimum) {
s.height = minimum;
}
-
+
return s;
}
, cpl_annotation_text (a)
, cpl_file (f)
{}
-
+
std::string dcp_directory;
std::string cpl_id;
std::string cpl_annotation_text;
std::string resolution_to_string (Resolution);
Resolution string_to_resolution (std::string);
+enum Protocol {
+ PROTOCOL_SCP,
+ PROTOCOL_FTP
+};
+
#endif