projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index b0e9e51aca8314ae0b7769148bc7df49fd564d0a..d9bee97c6b910a55683b5bfde474a362f8396a1c 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-1,26
+1,26
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2016
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#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
+33,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;
@@
-50,9
+49,6
@@
namespace xmlpp {
#define SERVER_LINK_VERSION (64+0)
typedef std::vector<boost::shared_ptr<Content> > ContentList;
#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 Frame;
typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
typedef int64_t Frame;
@@
-86,6
+82,13
@@
enum Part
PART_WHOLE
};
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.
*/
/** @struct Crop
* @brief A description of the crop of an image or video.
*/
@@
-148,4
+151,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