projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Bump libdcp for new method."
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 6d1738419bab10287a9df5149d2d31bec911a255..825f6da25aab1267bffe75f8fba442585c4a44e6 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,7
+26,6
@@
#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 <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include "image_filename_sorter.h"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
@@
-36,6
+36,7
@@
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)
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
@@
-134,11
+135,9
@@
ImageContent::full_length () const
string
ImageContent::identifier () const
{
string
ImageContent::identifier () const
{
- SafeStringStream s;
- s << Content::identifier();
- s << "_" << video->identifier ();
- s << "_" << video->length();
- return s.str ();
+ char buffer[256];
+ snprintf (buffer, sizeof(buffer), "%s_%s_%" PRId64, Content::identifier().c_str(), video->identifier().c_str(), video->length());
+ return buffer;
}
bool
}
bool
@@
-168,3
+167,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);
+}