projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix erroneous content change message.
[dcpomatic.git]
/
src
/
lib
/
video_content_scale.h
diff --git
a/src/lib/video_content_scale.h
b/src/lib/video_content_scale.h
index 87dd2f1fafec05b49706c71f226d58cabadc495e..845c71a52f5106616b2b2c4f53a373041947032b 100644
(file)
--- a/
src/lib/video_content_scale.h
+++ b/
src/lib/video_content_scale.h
@@
-1,28
+1,29
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
8
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_VIDEO_CONTENT_SCALE_H
#define DCPOMATIC_VIDEO_CONTENT_SCALE_H
*/
#ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
#define DCPOMATIC_VIDEO_CONTENT_SCALE_H
-#include <
vector
>
+#include <
dcp/util.h
>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <
libdcp/util.h
>
+#include <
vector
>
namespace cxml {
class Node;
namespace cxml {
class Node;
@@
-39,11
+40,11
@@
class VideoContentScale
{
public:
VideoContentScale ();
{
public:
VideoContentScale ();
- VideoContentScale (Ratio const *);
- VideoContentScale (bool);
- VideoContentScale (boost::shared_ptr<cxml::Node>);
+
explicit
VideoContentScale (Ratio const *);
+
explicit
VideoContentScale (bool);
+
explicit
VideoContentScale (boost::shared_ptr<cxml::Node>);
-
libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size, libdcp::Size
) const;
+
dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container
) const;
std::string id () const;
std::string name () const;
void as_xml (xmlpp::Node *) const;
std::string id () const;
std::string name () const;
void as_xml (xmlpp::Node *) const;
@@
-60,14
+61,17
@@
public:
static std::vector<VideoContentScale> all () {
return _scales;
}
static std::vector<VideoContentScale> all () {
return _scales;
}
- static VideoContentScale from_id (std::string id);
private:
/** a ratio to stretch the content to, or 0 for no stretch */
Ratio const * _ratio;
private:
/** a ratio to stretch the content to, or 0 for no stretch */
Ratio const * _ratio;
- /** true if we want to
scale the content
*/
+ /** true if we want to
change the size of the content in any way
*/
bool _scale;
bool _scale;
+ /* If _ratio is 0 and _scale is false there is no scale at all (i.e.
+ the content is used at its original size)
+ */
+
static std::vector<VideoContentScale> _scales;
};
static std::vector<VideoContentScale> _scales;
};