projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
content.cc
diff --git
a/src/lib/content.cc
b/src/lib/content.cc
index fcc658717900eb8e4468883815332e5d3f40c72e..aa382d68b9e5f53fa233e70a6d4925ae65a73b9e 100644
(file)
--- a/
src/lib/content.cc
+++ b/
src/lib/content.cc
@@
-24,7
+24,6
@@
#include "content.h"
#include "util.h"
#include "content_factory.h"
#include "content.h"
#include "util.h"
#include "content_factory.h"
-#include "ui_signaller.h"
#include "exceptions.h"
#include "film.h"
#include "safe_stringstream.h"
#include "exceptions.h"
#include "film.h"
#include "safe_stringstream.h"
@@
-49,8
+48,8
@@
int const ContentProperty::LENGTH = 402;
int const ContentProperty::TRIM_START = 403;
int const ContentProperty::TRIM_END = 404;
int const ContentProperty::TRIM_START = 403;
int const ContentProperty::TRIM_END = 404;
-Content::Content (shared_ptr<const Film> f)
- : _film (f)
+Content::Content (shared_ptr<const Film> f
ilm
)
+ : _film (f
ilm
)
, _position (0)
, _trim_start (0)
, _trim_end (0)
, _position (0)
, _trim_start (0)
, _trim_end (0)
@@
-59,8
+58,8
@@
Content::Content (shared_ptr<const Film> f)
}
}
-Content::Content (shared_ptr<const Film> f, DCPTime p)
- : _film (f)
+Content::Content (shared_ptr<const Film> f
ilm
, DCPTime p)
+ : _film (f
ilm
)
, _position (p)
, _trim_start (0)
, _trim_end (0)
, _position (p)
, _trim_start (0)
, _trim_end (0)
@@
-69,8
+68,8
@@
Content::Content (shared_ptr<const Film> f, DCPTime p)
}
}
-Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
- : _film (f)
+Content::Content (shared_ptr<const Film> f
ilm
, boost::filesystem::path p)
+ : _film (f
ilm
)
, _position (0)
, _trim_start (0)
, _trim_end (0)
, _position (0)
, _trim_start (0)
, _trim_end (0)
@@
-79,8
+78,8
@@
Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
_paths.push_back (p);
}
_paths.push_back (p);
}
-Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
- : _film (f)
+Content::Content (shared_ptr<const Film> f
ilm
, cxml::ConstNodePtr node)
+ : _film (f
ilm
)
, _change_signals_frequent (false)
{
list<cxml::NodePtr> path_children = node->node_children ("Path");
, _change_signals_frequent (false)
{
list<cxml::NodePtr> path_children = node->node_children ("Path");
@@
-93,8
+92,8
@@
Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
}
_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
}
-Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : _film (f)
+Content::Content (shared_ptr<const Film> f
ilm
, vector<shared_ptr<Content> > c)
+ : _film (f
ilm
)
, _position (c.front()->position ())
, _trim_start (c.front()->trim_start ())
, _trim_end (c.back()->trim_end ())
, _position (c.front()->position ())
, _trim_start (c.front()->trim_start ())
, _trim_end (c.back()->trim_end ())
@@
-135,12
+134,12
@@
Content::examine (shared_ptr<Job> job)
if (job) {
job->sub (_("Computing digest"));
}
if (job) {
job->sub (_("Computing digest"));
}
-
+
boost::mutex::scoped_lock lm (_mutex);
vector<boost::filesystem::path> p = _paths;
lm.unlock ();
boost::mutex::scoped_lock lm (_mutex);
vector<boost::filesystem::path> p = _paths;
lm.unlock ();
- /* Some content files are very big, so we use a poor's
+ /* Some content files are very big, so we use a poor
man
's
digest here: a MD5 of the first and last 1e6 bytes with the
size of the first file tacked on the end as a string.
*/
digest here: a MD5 of the first and last 1e6 bytes with the
size of the first file tacked on the end as a string.
*/
@@
-153,9
+152,7
@@
Content::examine (shared_ptr<Job> job)
void
Content::signal_changed (int p)
{
void
Content::signal_changed (int p)
{
- if (ui_signaller) {
- ui_signaller->emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
- }
+ emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
}
void
}
void
@@
-166,7
+163,7
@@
Content::set_position (DCPTime p)
if (p == _position) {
return;
}
if (p == _position) {
return;
}
-
+
_position = p;
}
_position = p;
}
@@
-203,7
+200,7
@@
Content::clone () const
if (!film) {
return shared_ptr<Content> ();
}
if (!film) {
return shared_ptr<Content> ();
}
-
+
/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
xmlpp::Document doc;
xmlpp::Node* node = doc.create_root_node ("Content");
/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
xmlpp::Document doc;
xmlpp::Node* node = doc.create_root_node ("Content");
@@
-233,7
+230,7
@@
string
Content::identifier () const
{
SafeStringStream s;
Content::identifier () const
{
SafeStringStream s;
-
+
s << Content::digest()
<< "_" << position().get()
<< "_" << trim_start().get()
s << Content::digest()
<< "_" << position().get()
<< "_" << trim_start().get()