#include "ab_transcode_job.h"
#include "transcode_job.h"
#include "scp_dcp_job.h"
-#include "copy_from_dvd_job.h"
#include "make_dcp_job.h"
#include "log.h"
#include "options.h"
#include "config.h"
#include "check_hashes_job.h"
#include "version.h"
-
-using namespace std;
-using namespace boost;
+#include "ui_signaller.h"
+
+using std::string;
+using std::stringstream;
+using std::multimap;
+using std::pair;
+using std::map;
+using std::vector;
+using std::ifstream;
+using std::ofstream;
+using std::setfill;
+using std::min;
+using std::make_pair;
+using boost::shared_ptr;
+using boost::lexical_cast;
+using boost::to_upper_copy;
+using boost::ends_with;
+using boost::starts_with;
/** Construct a Film object in a given directory, reading any metadata
* file that exists in that directory. An exception will be thrown if
- * must_exist is true, and the specified directory does not exist.
+ * must_exist is true and the specified directory does not exist.
*
* @param d Film directory.
* @param must_exist true to throw an exception if does not exist.
, _dcp_content_type (0)
, _format (0)
, _scaler (Scaler::from_id ("bicubic"))
- , _dcp_frames (0)
- , _dcp_trim_action (CUT)
+ , _dcp_trim_start (0)
+ , _dcp_trim_end (0)
, _dcp_ab (false)
, _audio_stream (-1)
, _audio_gain (0)
, _with_subtitles (false)
, _subtitle_offset (0)
, _subtitle_scale (1)
- , _length (0)
, _audio_sample_rate (0)
, _has_subtitles (false)
, _frames_per_second (0)
(Code swiped from Adam Bowen on stackoverflow)
*/
- filesystem::path p (filesystem::system_complete (d));
- filesystem::path result;
- for (filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
+ boost::filesystem::path p (boost::filesystem::system_complete (d));
+ boost::filesystem::path result;
+ for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
if (*i == "..") {
- if (filesystem::is_symlink (result) || result.filename() == "..") {
+ if (boost::filesystem::is_symlink (result) || result.filename() == "..") {
result /= *i;
} else {
result = result.parent_path ();
set_directory (result.string ());
- if (!filesystem::exists (directory())) {
+ if (!boost::filesystem::exists (directory())) {
if (must_exist) {
throw OpenFileError (directory());
} else {
- filesystem::create_directory (directory());
+ boost::filesystem::create_directory (directory());
}
}
read_metadata ();
_log = new FileLog (file ("log"));
+ set_dci_date_today ();
}
Film::Film (Film const & o)
, _crop (o._crop)
, _filters (o._filters)
, _scaler (o._scaler)
- , _dcp_frames (o._dcp_frames)
- , _dcp_trim_action (o._dcp_trim_action)
+ , _dcp_trim_start (o._dcp_trim_start)
+ , _dcp_trim_end (o._dcp_trim_end)
, _dcp_ab (o._dcp_ab)
, _audio_stream (o._audio_stream)
, _audio_gain (o._audio_gain)
{
assert (format());
- filesystem::path p;
+ boost::filesystem::path p;
/* Start with j2c */
p /= "j2c";
void
Film::make_dcp (bool transcode)
{
+ set_dci_date_today ();
+
if (dcp_name().find ("/") != string::npos) {
throw BadSettingError ("name", "cannot contain slashes");
}
shared_ptr<Options> o (new Options (j2k_dir(), ".j2c", dir ("wavs")));
o->out_size = format()->dcp_size ();
- if (dcp_frames() == 0) {
- /* Decode the whole film, no blacking */
- o->black_after = 0;
- } else {
- switch (dcp_trim_action()) {
- case CUT:
- /* Decode only part of the film, no blacking */
- o->black_after = 0;
- break;
- case BLACK_OUT:
- /* Decode the whole film, but black some frames out */
- o->black_after = dcp_frames ();
- }
+ o->padding = format()->dcp_padding (shared_from_this ());
+ o->ratio = format()->ratio_as_float (shared_from_this ());
+ if (dcp_length ()) {
+ o->video_decode_range = make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get());
+ o->audio_decode_range = make_pair (
+ video_frames_to_audio_frames (o->video_decode_range.get().first, audio_sample_rate(), frames_per_second()),
+ video_frames_to_audio_frames (o->video_decode_range.get().second, audio_sample_rate(), frames_per_second())
+ );
+
}
-
- o->padding = format()->dcp_padding (this);
- o->ratio = format()->ratio_as_float (this);
o->decode_subtitles = with_subtitles ();
+ o->decode_video_skip = dcp_frame_rate (frames_per_second()).skip;
shared_ptr<Job> r;
JobManager::instance()->add (shared_ptr<Job> (new MakeDCPJob (shared_from_this(), o, r)));
}
-void
-Film::copy_from_dvd_post_gui ()
-{
- const string dvd_dir = dir ("dvd");
-
- string largest_file;
- uintmax_t largest_size = 0;
- for (filesystem::directory_iterator i = filesystem::directory_iterator (dvd_dir); i != filesystem::directory_iterator(); ++i) {
- uintmax_t const s = filesystem::file_size (*i);
- if (s > largest_size) {
-
-#if BOOST_FILESYSTEM_VERSION == 3
- largest_file = filesystem::path(*i).generic_string();
-#else
- largest_file = i->string ();
-#endif
- largest_size = s;
- }
- }
-
- set_content (largest_file);
-}
-
/** Start a job to examine our content file */
void
Film::examine_content ()
return;
}
- set_thumbs (vector<int> ());
- filesystem::remove_all (dir ("thumbs"));
+ set_thumbs (vector<SourceFrame> ());
+ boost::filesystem::remove_all (dir ("thumbs"));
/* This call will recreate the directory */
dir ("thumbs");
_examine_content_job.reset (new ExamineContentJob (shared_from_this(), shared_ptr<Job> ()));
- _examine_content_job->Finished.connect (sigc::mem_fun (*this, &Film::examine_content_post_gui));
+ _examine_content_job->Finished.connect (bind (&Film::examine_content_finished, this));
JobManager::instance()->add (_examine_content_job);
}
void
-Film::examine_content_post_gui ()
+Film::examine_content_finished ()
{
- set_length (_examine_content_job->last_video_frame ());
_examine_content_job.reset ();
-
- string const tdir = dir ("thumbs");
- vector<int> thumbs;
-
- for (filesystem::directory_iterator i = filesystem::directory_iterator (tdir); i != filesystem::directory_iterator(); ++i) {
-
- /* Aah, the sweet smell of progress */
-#if BOOST_FILESYSTEM_VERSION == 3
- string const l = filesystem::path(*i).leaf().generic_string();
-#else
- string const l = i->leaf ();
-#endif
-
- size_t const d = l.find (".png");
- size_t const t = l.find (".tmp");
- if (d != string::npos && t == string::npos) {
- thumbs.push_back (atoi (l.substr (0, d).c_str()));
- }
- }
-
- sort (thumbs.begin(), thumbs.end());
- set_thumbs (thumbs);
}
-
/** @return full paths to any audio files that this Film has */
vector<string>
Film::audio_files () const
{
vector<string> f;
- for (filesystem::directory_iterator i = filesystem::directory_iterator (dir("wavs")); i != filesystem::directory_iterator(); ++i) {
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dir("wavs")); i != boost::filesystem::directory_iterator(); ++i) {
f.push_back (i->path().string ());
}
JobManager::instance()->add (j);
}
-void
-Film::copy_from_dvd ()
-{
- shared_ptr<Job> j (new CopyFromDVDJob (shared_from_this(), shared_ptr<Job> ()));
- j->Finished.connect (sigc::mem_fun (*this, &Film::copy_from_dvd_post_gui));
- JobManager::instance()->add (j);
-}
-
/** Count the number of frames that have been encoded for this film.
* @return frame count.
*/
}
int N = 0;
- for (filesystem::directory_iterator i = filesystem::directory_iterator (j2k_dir ()); i != filesystem::directory_iterator(); ++i) {
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (j2k_dir ()); i != boost::filesystem::directory_iterator(); ++i) {
++N;
- this_thread::interruption_point ();
+ boost::this_thread::interruption_point ();
}
return N;
Film::thumb_subtitle (int n) const
{
string sub_file = thumb_base(n) + ".sub";
- if (!filesystem::exists (sub_file)) {
+ if (!boost::filesystem::exists (sub_file)) {
return pair<Position, string> ();
}
void
Film::write_metadata () const
{
- filesystem::create_directories (directory());
+ boost::mutex::scoped_lock lm (_state_mutex);
+
+ boost::filesystem::create_directories (directory());
string const m = file ("metadata");
ofstream f (m.c_str ());
f << "filter " << (*i)->id () << "\n";
}
f << "scaler " << _scaler->id () << "\n";
- f << "dcp_frames " << _dcp_frames << "\n";
-
- f << "dcp_trim_action ";
- switch (_dcp_trim_action) {
- case CUT:
- f << "cut\n";
- break;
- case BLACK_OUT:
- f << "black_out\n";
- break;
- }
-
+ f << "dcp_trim_start " << _dcp_trim_start << "\n";
+ f << "dcp_trim_end " << _dcp_trim_end << "\n";
f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n";
f << "selected_audio_stream " << _audio_stream << "\n";
f << "audio_gain " << _audio_gain << "\n";
/* Cached stuff; this is information about our content; we could
look it up each time, but that's slow.
*/
- for (vector<int>::const_iterator i = _thumbs.begin(); i != _thumbs.end(); ++i) {
+ for (vector<SourceFrame>::const_iterator i = _thumbs.begin(); i != _thumbs.end(); ++i) {
f << "thumb " << *i << "\n";
}
f << "width " << _size.width << "\n";
f << "height " << _size.height << "\n";
- f << "length " << _length << "\n";
+ f << "length " << _length.get_value_or(0) << "\n";
f << "audio_sample_rate " << _audio_sample_rate << "\n";
f << "content_digest " << _content_digest << "\n";
f << "has_subtitles " << _has_subtitles << "\n";
void
Film::read_metadata ()
{
- ifstream f (file("metadata").c_str());
+ boost::mutex::scoped_lock lm (_state_mutex);
+
+ ifstream f (file ("metadata").c_str());
multimap<string, string> kv = read_key_value (f);
for (multimap<string, string>::const_iterator i = kv.begin(); i != kv.end(); ++i) {
string const k = i->first;
_filters.push_back (Filter::from_id (v));
} else if (k == "scaler") {
_scaler = Scaler::from_id (v);
- } else if (k == "dcp_frames") {
- _dcp_frames = atoi (v.c_str ());
- } else if (k == "dcp_trim_action") {
- if (v == "cut") {
- _dcp_trim_action = CUT;
- } else if (v == "black_out") {
- _dcp_trim_action = BLACK_OUT;
- }
+ } else if (k == "dcp_trim_start") {
+ _dcp_trim_start = atoi (v.c_str ());
+ } else if (k == "dcp_trim_end") {
+ _dcp_trim_end = atoi (v.c_str ());
} else if (k == "dcp_ab") {
_dcp_ab = (v == "1");
} else if (k == "selected_audio_stream") {
if (k == "thumb") {
int const n = atoi (v.c_str ());
/* Only add it to the list if it still exists */
- if (filesystem::exists (thumb_file_for_frame (n))) {
+ if (boost::filesystem::exists (thumb_file_for_frame (n))) {
_thumbs.push_back (n);
}
} else if (k == "width") {
} else if (k == "height") {
_size.height = atoi (v.c_str ());
} else if (k == "length") {
- _length = atof (v.c_str ());
+ int const vv = atoi (v.c_str ());
+ if (vv) {
+ _length = vv;
+ }
} else if (k == "audio_sample_rate") {
_audio_sample_rate = atoi (v.c_str ());
} else if (k == "content_digest") {
return thumb_file_for_frame (thumb_frame (n));
}
-/** @param n A frame index within the Film.
+/** @param n A frame index within the Film's source.
* @return The path to the thumb's image file for this frame;
* we assume that it exists.
*/
string
-Film::thumb_file_for_frame (int n) const
+Film::thumb_file_for_frame (SourceFrame n) const
{
return thumb_base_for_frame(n) + ".png";
}
+/** @param n Thumb index.
+ * Must not be called with the _state_mutex locked.
+ */
string
Film::thumb_base (int n) const
{
}
string
-Film::thumb_base_for_frame (int n) const
+Film::thumb_base_for_frame (SourceFrame n) const
{
stringstream s;
s.width (8);
s << setfill('0') << n;
- filesystem::path p;
+ boost::filesystem::path p;
p /= dir ("thumbs");
p /= s.str ();
return p.string ();
}
-
/** @param n A thumb index.
- * @return The frame within the Film that it is for.
+ * @return The frame within the Film's source that it is for.
+ *
+ * Must not be called with the _state_mutex locked.
*/
-int
+SourceFrame
Film::thumb_frame (int n) const
{
+ boost::mutex::scoped_lock lm (_state_mutex);
assert (n < int (_thumbs.size ()));
return _thumbs[n];
}
Size
Film::cropped_size (Size s) const
{
+ boost::mutex::scoped_lock lm (_state_mutex);
s.width -= _crop.left + _crop.right;
s.height -= _crop.top + _crop.bottom;
return s;
string
Film::dir (string d) const
{
- filesystem::path p;
+ boost::mutex::scoped_lock lm (_directory_mutex);
+ boost::filesystem::path p;
p /= _directory;
p /= d;
- filesystem::create_directories (p);
+ boost::filesystem::create_directories (p);
return p.string ();
}
-/** Given a file or directory name, return its full path within the Film's directory */
+/** Given a file or directory name, return its full path within the Film's directory.
+ * _directory_mutex must not be locked on entry.
+ */
string
Film::file (string f) const
{
- filesystem::path p;
+ boost::mutex::scoped_lock lm (_directory_mutex);
+ boost::filesystem::path p;
p /= _directory;
p /= f;
return p.string ();
string
Film::content_path () const
{
- if (filesystem::path(_content).has_root_directory ()) {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ if (boost::filesystem::path(_content).has_root_directory ()) {
return _content;
}
Film::content_type () const
{
#if BOOST_FILESYSTEM_VERSION == 3
- string ext = filesystem::path(_content).extension().string();
+ string ext = boost::filesystem::path(_content).extension().string();
#else
- string ext = filesystem::path(_content).extension();
+ string ext = boost::filesystem::path(_content).extension();
#endif
transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
Film::target_audio_sample_rate () const
{
/* Resample to a DCI-approved sample rate */
- double t = dcp_audio_sample_rate (_audio_sample_rate);
+ double t = dcp_audio_sample_rate (audio_sample_rate());
+
+ DCPFrameRate dfr = dcp_frame_rate (frames_per_second ());
/* Compensate for the fact that video will be rounded to the
nearest integer number of frames per second.
*/
- if (rint (_frames_per_second) != _frames_per_second) {
- t *= _frames_per_second / rint (_frames_per_second);
+ if (dfr.run_fast) {
+ t *= _frames_per_second * dfr.skip / dfr.frames_per_second;
}
return rint (t);
}
-int
+boost::optional<SourceFrame>
Film::dcp_length () const
{
- if (_dcp_frames) {
- return _dcp_frames;
+ if (!length()) {
+ return boost::optional<SourceFrame> ();
}
- return _length;
+ return length().get() - dcp_trim_start() - dcp_trim_end();
}
/** @return a DCI-compliant name for a DCP of this film */
string
Film::dci_name () const
{
+ boost::mutex::scoped_lock lm (_state_mutex);
+
stringstream d;
string fixed_name = to_upper_copy (_name);
d << "_";
}
- switch (_audio_streams[_audio_stream].channels()) {
- case 1:
- d << "10_";
- break;
- case 2:
- d << "20_";
- break;
- case 6:
- d << "51_";
- break;
- case 8:
- d << "71_";
- break;
+ if (_audio_stream != -1) {
+ switch (_audio_streams[_audio_stream].channels()) {
+ case 1:
+ d << "10_";
+ break;
+ case 2:
+ d << "20_";
+ break;
+ case 6:
+ d << "51_";
+ break;
+ case 8:
+ d << "71_";
+ break;
+ }
}
d << "2K_";
d << _studio << "_";
}
- gregorian::date today = gregorian::day_clock::local_day ();
- d << gregorian::to_iso_string (today) << "_";
+ d << boost::gregorian::to_iso_string (_dci_date) << "_";
if (!_facility.empty ()) {
d << _facility << "_";
string
Film::dcp_name () const
{
- if (_use_dci_name) {
+ if (use_dci_name()) {
return dci_name ();
}
- return _name;
+ return name();
}
void
Film::set_directory (string d)
{
+ boost::mutex::scoped_lock lm (_state_mutex);
_directory = d;
_dirty = true;
}
void
Film::set_name (string n)
{
- _name = n;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _name = n;
+ }
signal_changed (NAME);
}
void
Film::set_use_dci_name (bool u)
{
- _use_dci_name = u;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _use_dci_name = u;
+ }
signal_changed (USE_DCI_NAME);
}
void
Film::set_content (string c)
{
- string check = _directory;
+ string check = directory ();
#if BOOST_FILESYSTEM_VERSION == 3
- filesystem::path slash ("/");
+ boost::filesystem::path slash ("/");
string platform_slash = slash.make_preferred().string ();
#else
#ifdef DVDOMATIC_WINDOWS
check += platform_slash;
}
- if (filesystem::path(c).has_root_directory () && starts_with (c, check)) {
+ if (boost::filesystem::path(c).has_root_directory () && starts_with (c, check)) {
c = c.substr (_directory.length() + 1);
}
- if (c == _content) {
- return;
+ string old_content;
+
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ if (c == _content) {
+ return;
+ }
+
+ old_content = _content;
+ _content = c;
}
/* Create a temporary decoder so that we can get information
about the content.
*/
- _content = c;
+ try {
+ shared_ptr<Options> o (new Options ("", "", ""));
+ o->out_size = Size (1024, 1024);
+
+ shared_ptr<Decoder> d = decoder_factory (shared_from_this(), o, 0);
+
+ set_size (d->native_size ());
+ set_frames_per_second (d->frames_per_second ());
+ set_audio_sample_rate (d->audio_sample_rate ());
+ set_has_subtitles (d->has_subtitles ());
+ set_audio_streams (d->audio_streams ());
+ set_subtitle_streams (d->subtitle_streams ());
+ set_audio_stream (audio_streams().empty() ? -1 : 0);
+ set_subtitle_stream (subtitle_streams().empty() ? -1 : 0);
+
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _content = c;
+ }
+
+ signal_changed (CONTENT);
+
+ set_content_digest (md5_digest (content_path ()));
+
+ examine_content ();
+
+ } catch (...) {
- shared_ptr<Options> o (new Options ("", "", ""));
- o->out_size = Size (1024, 1024);
-
- shared_ptr<Decoder> d = decoder_factory (shared_from_this(), o, 0, 0);
-
- set_size (d->native_size ());
- set_frames_per_second (d->frames_per_second ());
- set_audio_sample_rate (d->audio_sample_rate ());
- set_has_subtitles (d->has_subtitles ());
- set_audio_streams (d->audio_streams ());
- set_subtitle_streams (d->subtitle_streams ());
- set_audio_stream (audio_streams().empty() ? -1 : 0);
- set_subtitle_stream (subtitle_streams().empty() ? -1 : 0);
-
- signal_changed (CONTENT);
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _content = old_content;
+ throw;
- set_content_digest (md5_digest (content_path ()));
+ }
}
void
Film::set_dcp_content_type (DCPContentType const * t)
{
- _dcp_content_type = t;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _dcp_content_type = t;
+ }
signal_changed (DCP_CONTENT_TYPE);
}
void
Film::set_format (Format const * f)
{
- _format = f;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _format = f;
+ }
signal_changed (FORMAT);
}
void
Film::set_crop (Crop c)
{
- _crop = c;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _crop = c;
+ }
signal_changed (CROP);
}
void
Film::set_left_crop (int c)
{
- if (_crop.left == c) {
- return;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+
+ if (_crop.left == c) {
+ return;
+ }
+
+ _crop.left = c;
}
-
- _crop.left = c;
signal_changed (CROP);
}
void
Film::set_right_crop (int c)
{
- if (_crop.right == c) {
- return;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ if (_crop.right == c) {
+ return;
+ }
+
+ _crop.right = c;
}
-
- _crop.right = c;
signal_changed (CROP);
}
void
Film::set_top_crop (int c)
{
- if (_crop.top == c) {
- return;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ if (_crop.top == c) {
+ return;
+ }
+
+ _crop.top = c;
}
-
- _crop.top = c;
signal_changed (CROP);
}
void
Film::set_bottom_crop (int c)
{
- if (_crop.bottom == c) {
- return;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ if (_crop.bottom == c) {
+ return;
+ }
+
+ _crop.bottom = c;
}
-
- _crop.bottom = c;
signal_changed (CROP);
}
void
Film::set_filters (vector<Filter const *> f)
{
- _filters = f;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _filters = f;
+ }
signal_changed (FILTERS);
}
void
Film::set_scaler (Scaler const * s)
{
- _scaler = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _scaler = s;
+ }
signal_changed (SCALER);
}
void
-Film::set_dcp_frames (int f)
+Film::set_dcp_trim_start (int t)
{
- _dcp_frames = f;
- signal_changed (DCP_FRAMES);
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _dcp_trim_start = t;
+ }
+ signal_changed (DCP_TRIM_START);
}
void
-Film::set_dcp_trim_action (TrimAction a)
+Film::set_dcp_trim_end (int t)
{
- _dcp_trim_action = a;
- signal_changed (DCP_TRIM_ACTION);
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _dcp_trim_end = t;
+ }
+ signal_changed (DCP_TRIM_END);
}
void
Film::set_dcp_ab (bool a)
{
- _dcp_ab = a;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _dcp_ab = a;
+ }
signal_changed (DCP_AB);
}
void
Film::set_audio_stream (int s)
{
- _audio_stream = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _audio_stream = s;
+ }
signal_changed (AUDIO_STREAM);
}
void
Film::set_audio_gain (float g)
{
- _audio_gain = g;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _audio_gain = g;
+ }
signal_changed (AUDIO_GAIN);
}
void
Film::set_audio_delay (int d)
{
- _audio_delay = d;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _audio_delay = d;
+ }
signal_changed (AUDIO_DELAY);
}
void
Film::set_still_duration (int d)
{
- _still_duration = d;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _still_duration = d;
+ }
signal_changed (STILL_DURATION);
}
void
Film::set_subtitle_stream (int s)
{
- _subtitle_stream = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _subtitle_stream = s;
+ }
signal_changed (SUBTITLE_STREAM);
}
void
Film::set_with_subtitles (bool w)
{
- _with_subtitles = w;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _with_subtitles = w;
+ }
signal_changed (WITH_SUBTITLES);
}
void
Film::set_subtitle_offset (int o)
{
- _subtitle_offset = o;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _subtitle_offset = o;
+ }
signal_changed (SUBTITLE_OFFSET);
}
void
Film::set_subtitle_scale (float s)
{
- _subtitle_scale = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _subtitle_scale = s;
+ }
signal_changed (SUBTITLE_SCALE);
}
void
Film::set_audio_language (string l)
{
- _audio_language = l;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _audio_language = l;
+ }
signal_changed (DCI_METADATA);
}
void
Film::set_subtitle_language (string l)
{
- _subtitle_language = l;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _subtitle_language = l;
+ }
signal_changed (DCI_METADATA);
}
void
Film::set_territory (string t)
{
- _territory = t;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _territory = t;
+ }
signal_changed (DCI_METADATA);
}
void
Film::set_rating (string r)
{
- _rating = r;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _rating = r;
+ }
signal_changed (DCI_METADATA);
}
void
Film::set_studio (string s)
{
- _studio = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _studio = s;
+ }
signal_changed (DCI_METADATA);
}
void
Film::set_facility (string f)
{
- _facility = f;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _facility = f;
+ }
signal_changed (DCI_METADATA);
}
void
Film::set_package_type (string p)
{
- _package_type = p;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _package_type = p;
+ }
signal_changed (DCI_METADATA);
}
void
-Film::set_thumbs (vector<int> t)
+Film::set_thumbs (vector<SourceFrame> t)
{
- _thumbs = t;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _thumbs = t;
+ }
signal_changed (THUMBS);
}
void
Film::set_size (Size s)
{
- _size = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _size = s;
+ }
signal_changed (SIZE);
}
void
-Film::set_length (int l)
+Film::set_length (SourceFrame l)
{
- _length = l;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _length = l;
+ }
signal_changed (LENGTH);
}
+void
+Film::unset_length ()
+{
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _length = boost::none;
+ }
+ signal_changed (LENGTH);
+}
+
void
Film::set_audio_sample_rate (int r)
{
- _audio_sample_rate = r;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _audio_sample_rate = r;
+ }
signal_changed (AUDIO_SAMPLE_RATE);
}
void
Film::set_content_digest (string d)
{
- _content_digest = d;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _content_digest = d;
+ }
_dirty = true;
}
void
Film::set_has_subtitles (bool s)
{
- _has_subtitles = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _has_subtitles = s;
+ }
signal_changed (HAS_SUBTITLES);
}
void
Film::set_audio_streams (vector<AudioStream> s)
{
- _audio_streams = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _audio_streams = s;
+ }
_dirty = true;
}
void
Film::set_subtitle_streams (vector<SubtitleStream> s)
{
- _subtitle_streams = s;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _subtitle_streams = s;
+ }
_dirty = true;
}
void
Film::set_frames_per_second (float f)
{
- _frames_per_second = f;
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _frames_per_second = f;
+ }
signal_changed (FRAMES_PER_SECOND);
}
void
Film::signal_changed (Property p)
{
- _dirty = true;
- Changed (p);
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _dirty = true;
+ }
+
+ if (ui_signaller) {
+ ui_signaller->emit (boost::bind (boost::ref (Changed), p));
+ }
}
int
Film::audio_channels () const
{
+ boost::mutex::scoped_lock lm (_state_mutex);
if (_audio_stream == -1) {
return 0;
}
-
+
return _audio_streams[_audio_stream].channels ();
}
+
+void
+Film::set_dci_date_today ()
+{
+ _dci_date = boost::gregorian::day_clock::local_day ();
+}
+
projects / dcpomatic.git / blobdiff