projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix start-trim of audio-only content (#915).
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 15c20d8741b1ca4004c8b12600560762831d4f96..08b9fd6ae475a364dd367f48274ef28e23ebf5d0 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
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/>.
*/
*/
@@
-25,8
+26,8
@@
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
-#include "safe_stringstream.h"
#include "image_filename_sorter.h"
#include "image_filename_sorter.h"
+#include <locked_sstream.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
@@
-36,12
+37,13
@@
using std::string;
using std::cout;
using std::string;
using std::cout;
+using std::list;
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
: Content (film)
{
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
: Content (film)
{
- video.reset (new VideoContent (this
, film
));
+ video.reset (new VideoContent (this));
if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
_paths.push_back (p);
if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
_paths.push_back (p);
@@
-66,7
+68,7
@@
ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
: Content (film, node)
{
ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
: Content (film, node)
{
- video = VideoContent::from_xml (this,
film,
node, version);
+ video = VideoContent::from_xml (this, node, version);
}
string
}
string
@@
-103,7
+105,10
@@
ImageContent::as_xml (xmlpp::Node* node) const
{
node->add_child("Type")->add_child_text ("Image");
Content::as_xml (node);
{
node->add_child("Type")->add_child_text ("Image");
Content::as_xml (node);
- video->as_xml (node);
+
+ if (video) {
+ video->as_xml (node);
+ }
}
void
}
void
@@
-131,7
+136,7
@@
ImageContent::full_length () const
string
ImageContent::identifier () const
{
string
ImageContent::identifier () const
{
-
SafeStringS
tream s;
+
locked_strings
tream s;
s << Content::identifier();
s << "_" << video->identifier ();
s << "_" << video->length();
s << Content::identifier();
s << "_" << video->identifier ();
s << "_" << video->length();
@@
-165,3
+170,10
@@
ImageContent::set_default_colour_conversion ()
video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
}
}
video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
}
}
+
+void
+ImageContent::add_properties (list<UserProperty>& p) const
+{
+ Content::add_properties (p);
+ video->add_properties (p);
+}