projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle multiple audio streams in a single piece of content
[dcpomatic.git]
/
src
/
lib
/
content.cc
diff --git
a/src/lib/content.cc
b/src/lib/content.cc
index 550a8cd0577333d88844ea014d2f41b60299c7f7..9a7cb0f34f68e0837862bbc96bc36aca00ab6d27 100644
(file)
--- a/
src/lib/content.cc
+++ b/
src/lib/content.cc
@@
-24,13
+24,12
@@
#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 "job.h"
#include "exceptions.h"
#include "film.h"
#include "safe_stringstream.h"
#include "job.h"
+#include "raw_convert.h"
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include <libxml++/libxml++.h>
#include <boost/thread/mutex.hpp>
#include <libxml++/libxml++.h>
#include <boost/thread/mutex.hpp>
@@
-42,7
+41,6
@@
using std::cout;
using std::vector;
using std::max;
using boost::shared_ptr;
using std::vector;
using std::max;
using boost::shared_ptr;
-using dcp::raw_convert;
int const ContentProperty::PATH = 400;
int const ContentProperty::POSITION = 401;
int const ContentProperty::PATH = 400;
int const ContentProperty::POSITION = 401;
@@
-141,11
+139,11
@@
Content::examine (shared_ptr<Job> job)
vector<boost::filesystem::path> p = _paths;
lm.unlock ();
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.
*/
- string const d = md5_digest_head_tail (p, 1000000) +
dcp::
raw_convert<string> (boost::filesystem::file_size (p.front ()));
+ string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
lm.lock ();
_digest = d;
lm.lock ();
_digest = d;
@@
-154,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