projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index ed290dd6c9e5f5f3cfc1187cd8eb7a0aad7af32f..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,14
@@
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 (new VideoContent (film))
{
{
+ video.reset (new VideoContent (this));
+
if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
_paths.push_back (p);
} else {
if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
_paths.push_back (p);
} else {
@@
-64,9
+67,8
@@
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 (new VideoContent (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
@@
-115,37
+120,26
@@
ImageContent::examine (shared_ptr<Job> job)
DCPOMATIC_ASSERT (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
DCPOMATIC_ASSERT (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
take_from_video
_examiner (examiner);
+
video->take_from
_examiner (examiner);
set_default_colour_conversion ();
}
set_default_colour_conversion ();
}
-void
-ImageContent::set_video_length (Frame len)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _video_length = len;
- }
-
- signal_changed (ContentProperty::LENGTH);
-}
-
DCPTime
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
DCPTime
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
- FrameRateChange const frc (video_frame_rate(), film->video_frame_rate());
- return DCPTime::from_frames (llrint (video
_
length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
+ FrameRateChange const frc (
active_
video_frame_rate(), film->video_frame_rate());
+ return DCPTime::from_frames (llrint (video
->
length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
}
string
ImageContent::identifier () const
{
}
string
ImageContent::identifier () const
{
-
SafeStringS
tream s;
+
locked_strings
tream s;
s << Content::identifier();
s << "_" << video->identifier ();
s << Content::identifier();
s << "_" << video->identifier ();
- s << "_" << video
_
length();
+ s << "_" << video
->
length();
return s.str ();
}
return s.str ();
}
@@
-161,7
+155,7
@@
ImageContent::set_default_colour_conversion ()
BOOST_FOREACH (boost::filesystem::path i, _paths) {
if (valid_j2k_file (i)) {
/* We default to no colour conversion if we have JPEG2000 files */
BOOST_FOREACH (boost::filesystem::path i, _paths) {
if (valid_j2k_file (i)) {
/* We default to no colour conversion if we have JPEG2000 files */
- unset_colour_conversion ();
+
video->
unset_colour_conversion ();
return;
}
}
return;
}
}
@@
-171,8
+165,15
@@
ImageContent::set_default_colour_conversion ()
boost::mutex::scoped_lock lm (_mutex);
if (s) {
boost::mutex::scoped_lock lm (_mutex);
if (s) {
-
_colour_conversion = PresetColourConversion::from_id ("srgb").conversion
;
+
video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion)
;
} else {
} else {
-
_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);
+}