#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
#include "film.h"
-#include "format.h"
#include "job.h"
#include "filter.h"
#include "util.h"
#include "job_manager.h"
-#include "ab_transcode_job.h"
#include "transcode_job.h"
#include "scp_dcp_job.h"
#include "log.h"
#include "config.h"
#include "version.h"
#include "ui_signaller.h"
-#include "analyse_audio_job.h"
#include "playlist.h"
#include "player.h"
#include "ffmpeg_content.h"
#include "imagemagick_content.h"
#include "sndfile_content.h"
#include "dcp_content_type.h"
+#include "ratio.h"
+#include "cross.h"
#include "i18n.h"
using std::min;
using std::make_pair;
using std::endl;
+using std::cout;
using std::list;
using boost::shared_ptr;
+using boost::weak_ptr;
using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
using boost::to_upper_copy;
using boost::ends_with;
using boost::starts_with;
int const Film::state_version = 4;
-/** 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.
+/** Construct a Film object in a given directory.
*
* @param d Film directory.
- * @param must_exist true to throw an exception if does not exist.
*/
-Film::Film (string d, bool must_exist)
+Film::Film (string d)
: _playlist (new Playlist)
, _use_dci_name (true)
- , _trust_content_headers (true)
- , _dcp_content_type (0)
- , _format (Format::from_id ("185"))
+ , _dcp_content_type (Config::instance()->default_dcp_content_type ())
+ , _container (Config::instance()->default_container ())
, _scaler (Scaler::from_id ("bicubic"))
- , _trim_start (0)
- , _trim_end (0)
- , _ab (false)
- , _audio_gain (0)
- , _audio_delay (0)
, _with_subtitles (false)
, _subtitle_offset (0)
, _subtitle_scale (1)
, _colour_lut (0)
, _j2k_bandwidth (200000000)
, _dci_metadata (Config::instance()->default_dci_metadata ())
- , _dcp_frame_rate (0)
+ , _dcp_video_frame_rate (24)
+ , _dcp_audio_channels (MAX_AUDIO_CHANNELS)
+ , _minimum_audio_channels (0)
, _dirty (false)
{
set_dci_date_today ();
- _playlist->ContentChanged.connect (bind (&Film::content_changed, this, _1, _2));
+ _playlist->Changed.connect (bind (&Film::playlist_changed, this));
+ _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
/* Make state.directory a complete path without ..s (where possible)
(Code swiped from Adam Bowen on stackoverflow)
}
set_directory (result.string ());
-
- if (!boost::filesystem::exists (directory())) {
- if (must_exist) {
- throw OpenFileError (directory());
- } else {
- boost::filesystem::create_directory (directory());
- }
- }
-
- if (must_exist) {
- read_metadata ();
- }
-
- _log.reset (new FileLog (file ("log")));
}
Film::Film (Film const & o)
: boost::enable_shared_from_this<Film> (o)
/* note: the copied film shares the original's log */
, _log (o._log)
- , _playlist (new Playlist)
+ , _playlist (new Playlist (o._playlist))
, _directory (o._directory)
, _name (o._name)
, _use_dci_name (o._use_dci_name)
- , _trust_content_headers (o._trust_content_headers)
, _dcp_content_type (o._dcp_content_type)
- , _format (o._format)
- , _crop (o._crop)
- , _filters (o._filters)
+ , _container (o._container)
, _scaler (o._scaler)
- , _trim_start (o._trim_start)
- , _trim_end (o._trim_end)
- , _ab (o._ab)
- , _audio_gain (o._audio_gain)
- , _audio_delay (o._audio_delay)
, _with_subtitles (o._with_subtitles)
, _subtitle_offset (o._subtitle_offset)
, _subtitle_scale (o._subtitle_scale)
, _colour_lut (o._colour_lut)
, _j2k_bandwidth (o._j2k_bandwidth)
, _dci_metadata (o._dci_metadata)
- , _dcp_frame_rate (o._dcp_frame_rate)
+ , _dcp_video_frame_rate (o._dcp_video_frame_rate)
, _dci_date (o._dci_date)
+ , _minimum_audio_channels (o._minimum_audio_channels)
, _dirty (o._dirty)
{
- for (ContentList::const_iterator i = o._content.begin(); i != o._content.end(); ++i) {
- _content.push_back ((*i)->clone ());
- }
-
- _playlist->ContentChanged.connect (bind (&Film::content_changed, this, _1, _2));
-
- _playlist->setup (_content);
+ _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
}
string
Film::video_state_identifier () const
{
- assert (format ());
-
- return "XXX";
-
-#if 0
-
- pair<string, string> f = Filter::ffmpeg_strings (filters());
+ assert (container ());
+ LocaleGuard lg;
stringstream s;
- s << format()->id()
- << "_" << content_digest()
- << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom
- << "_" << _dcp_frame_rate
- << "_" << f.first << "_" << f.second
+ s << container()->id()
+ << "_" << _playlist->video_digest()
+ << "_" << _dcp_video_frame_rate
<< "_" << scaler()->id()
<< "_" << j2k_bandwidth()
- << "_" << boost::lexical_cast<int> (colour_lut());
-
- if (ab()) {
- pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
- s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
- }
+ << "_" << lexical_cast<int> (colour_lut());
return s.str ();
-#endif
}
/** @return The path to the directory to write video frame info files to */
}
string
-Film::video_mxf_dir () const
+Film::internal_video_mxf_dir () const
{
- boost::filesystem::path p;
return dir ("video");
}
string
-Film::video_mxf_filename () const
+Film::internal_video_mxf_filename () const
{
return video_state_identifier() + ".mxf";
}
string
-Film::audio_analysis_path () const
+Film::dcp_video_mxf_filename () const
{
- boost::filesystem::path p;
- p /= "analysis";
- p /= "XXX";//content_digest();
- return file (p.string ());
+ return filename_safe_name() + "_video.mxf";
+}
+
+string
+Film::dcp_audio_mxf_filename () const
+{
+ return filename_safe_name() + "_audio.mxf";
+}
+
+string
+Film::filename_safe_name () const
+{
+ string const n = name ();
+ string o;
+ for (size_t i = 0; i < n.length(); ++i) {
+ if (isalnum (n[i])) {
+ o += n[i];
+ } else {
+ o += "_";
+ }
+ }
+
+ return o;
+}
+
+boost::filesystem::path
+Film::audio_analysis_path (shared_ptr<const AudioContent> c) const
+{
+ boost::filesystem::path p = dir ("analysis");
+ p /= c->digest();
+ return p;
}
/** Add suitable Jobs to the JobManager to create a DCP for this Film */
throw BadSettingError (_("name"), _("cannot contain slashes"));
}
- log()->log (String::compose ("DVD-o-matic %1 git %2 using %3", dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
+ log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
{
char buffer[128];
// log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
-#ifdef DVDOMATIC_DEBUG
- log()->log ("DVD-o-matic built in debug mode.");
+#ifdef DCPOMATIC_DEBUG
+ log()->log ("DCP-o-matic built in debug mode.");
#else
- log()->log ("DVD-o-matic built in optimised mode.");
+ log()->log ("DCP-o-matic built in optimised mode.");
#endif
#ifdef LIBDCP_DEBUG
log()->log ("libdcp built in debug mode.");
#endif
pair<string, int> const c = cpu_info ();
log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second));
+ list<pair<string, string> > const m = mount_info ();
+ for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
+ log()->log (String::compose ("Mount: %1 %2", i->first, i->second));
+ }
- if (format() == 0) {
- throw MissingSettingError (_("format"));
+ if (container() == 0) {
+ throw MissingSettingError (_("container"));
}
- if (content().empty ()) {
- throw MissingSettingError (_("content"));
+ if (_playlist->content().empty ()) {
+ throw StringError (_("You must add some content to the DCP before creating it"));
}
if (dcp_content_type() == 0) {
throw MissingSettingError (_("name"));
}
- shared_ptr<Job> r;
-
- if (ab()) {
- r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this())));
- } else {
- r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
- }
-}
-
-/** Start a job to analyse the audio in our Playlist */
-void
-Film::analyse_audio ()
-{
- if (_analyse_audio_job) {
- return;
- }
-
- _analyse_audio_job.reset (new AnalyseAudioJob (shared_from_this()));
- _analyse_audio_job->Finished.connect (bind (&Film::analyse_audio_finished, this));
- JobManager::instance()->add (_analyse_audio_job);
-}
-
-/** Start a job to examine a piece of content */
-void
-Film::examine_content (shared_ptr<Content> c)
-{
- shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c, trust_content_headers ()));
- JobManager::instance()->add (j);
-}
-
-void
-Film::analyse_audio_finished ()
-{
- ensure_ui_thread ();
-
- if (_analyse_audio_job->finished_ok ()) {
- AudioAnalysisSucceeded ();
- }
-
- _analyse_audio_job.reset ();
+ JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
}
/** Start a job to send our DCP to the configured TMS */
int
Film::encoded_frames () const
{
- if (format() == 0) {
+ if (container() == 0) {
return 0;
}
void
Film::write_metadata () const
{
- ContentList the_content = content ();
+ if (!boost::filesystem::exists (directory())) {
+ boost::filesystem::create_directory (directory());
+ }
boost::mutex::scoped_lock lm (_state_mutex);
+ LocaleGuard lg;
boost::filesystem::create_directories (directory());
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Metadata");
- root->add_child("Version")->add_child_text (boost::lexical_cast<string> (state_version));
+ root->add_child("Version")->add_child_text (lexical_cast<string> (state_version));
root->add_child("Name")->add_child_text (_name);
root->add_child("UseDCIName")->add_child_text (_use_dci_name ? "1" : "0");
- root->add_child("TrustContentHeaders")->add_child_text (_trust_content_headers ? "1" : "0");
+
if (_dcp_content_type) {
root->add_child("DCPContentType")->add_child_text (_dcp_content_type->dci_name ());
}
- if (_format) {
- root->add_child("Format")->add_child_text (_format->id ());
- }
- root->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
- root->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
- root->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
- root->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
- for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
- root->add_child("Filter")->add_child_text ((*i)->id ());
+ if (_container) {
+ root->add_child("Container")->add_child_text (_container->id ());
}
-
+
root->add_child("Scaler")->add_child_text (_scaler->id ());
- root->add_child("TrimStart")->add_child_text (boost::lexical_cast<string> (_trim_start));
- root->add_child("TrimEnd")->add_child_text (boost::lexical_cast<string> (_trim_end));
- root->add_child("AB")->add_child_text (_ab ? "1" : "0");
- root->add_child("AudioGain")->add_child_text (boost::lexical_cast<string> (_audio_gain));
- root->add_child("AudioDelay")->add_child_text (boost::lexical_cast<string> (_audio_delay));
root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
- root->add_child("SubtitleOffset")->add_child_text (boost::lexical_cast<string> (_subtitle_offset));
- root->add_child("SubtitleScale")->add_child_text (boost::lexical_cast<string> (_subtitle_scale));
- root->add_child("ColourLUT")->add_child_text (boost::lexical_cast<string> (_colour_lut));
- root->add_child("J2KBandwidth")->add_child_text (boost::lexical_cast<string> (_j2k_bandwidth));
+ root->add_child("SubtitleOffset")->add_child_text (lexical_cast<string> (_subtitle_offset));
+ root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale));
+ root->add_child("ColourLUT")->add_child_text (lexical_cast<string> (_colour_lut));
+ root->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
- root->add_child("DCPFrameRate")->add_child_text (boost::lexical_cast<string> (_dcp_frame_rate));
+ root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
-
- for (ContentList::iterator i = the_content.begin(); i != the_content.end(); ++i) {
- (*i)->as_xml (root->add_child ("Content"));
- }
+ root->add_child("DCPAudioChannels")->add_child_text (lexical_cast<string> (_dcp_audio_channels));
+ root->add_child("MinimumAudioChannels")->add_child_text (lexical_cast<string> (_minimum_audio_channels));
+ _playlist->as_xml (root->add_child ("Playlist"));
doc.write_to_file_formatted (file ("metadata.xml"));
Film::read_metadata ()
{
boost::mutex::scoped_lock lm (_state_mutex);
+ LocaleGuard lg;
if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
- throw StringError (_("This film was created with an older version of DVD-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!"));
+ throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!"));
}
cxml::File f (file ("metadata.xml"), "Metadata");
_name = f.string_child ("Name");
_use_dci_name = f.bool_child ("UseDCIName");
- _trust_content_headers = f.bool_child ("TrustContentHeaders");
{
optional<string> c = f.optional_string_child ("DCPContentType");
}
{
- optional<string> c = f.optional_string_child ("Format");
+ optional<string> c = f.optional_string_child ("Container");
if (c) {
- _format = Format::from_id (c.get ());
- }
- }
-
- _crop.left = f.number_child<int> ("LeftCrop");
- _crop.right = f.number_child<int> ("RightCrop");
- _crop.top = f.number_child<int> ("TopCrop");
- _crop.bottom = f.number_child<int> ("BottomCrop");
-
- {
- list<shared_ptr<cxml::Node> > c = f.node_children ("Filter");
- for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
- _filters.push_back (Filter::from_id ((*i)->content ()));
+ _container = Ratio::from_id (c.get ());
}
}
_scaler = Scaler::from_id (f.string_child ("Scaler"));
- _trim_start = f.number_child<int> ("TrimStart");
- _trim_end = f.number_child<int> ("TrimEnd");
- _ab = f.bool_child ("AB");
- _audio_gain = f.number_child<float> ("AudioGain");
- _audio_delay = f.number_child<int> ("AudioDelay");
_with_subtitles = f.bool_child ("WithSubtitles");
_subtitle_offset = f.number_child<float> ("SubtitleOffset");
_subtitle_scale = f.number_child<float> ("SubtitleScale");
_colour_lut = f.number_child<int> ("ColourLUT");
_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
- _dcp_frame_rate = f.number_child<int> ("DCPFrameRate");
+ _dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
+ _dcp_audio_channels = f.number_child<int> ("DCPAudioChannels");
+ _minimum_audio_channels = f.number_child<int> ("MinimumAudioChannels");
- list<shared_ptr<cxml::Node> > c = f.node_children ("Content");
- for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
-
- string const type = (*i)->string_child ("Type");
- boost::shared_ptr<Content> c;
-
- if (type == "FFmpeg") {
- c.reset (new FFmpegContent (*i));
- } else if (type == "ImageMagick") {
- c.reset (new ImageMagickContent (*i));
- } else if (type == "Sndfile") {
- c.reset (new SndfileContent (*i));
- }
-
- _content.push_back (c);
- }
+ _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
_dirty = false;
-
- _playlist->setup (_content);
-}
-
-libdcp::Size
-Film::cropped_size (libdcp::Size s) const
-{
- boost::mutex::scoped_lock lm (_state_mutex);
- s.width -= _crop.left + _crop.right;
- s.height -= _crop.top + _crop.bottom;
- return s;
}
/** Given a directory name, return its full path within the Film's directory.
return p.string ();
}
-/** @return The sampling rate that we will resample the audio to */
-int
-Film::target_audio_sample_rate () const
-{
- if (!has_audio ()) {
- return 0;
- }
-
- /* Resample to a DCI-approved sample rate */
- double t = dcp_audio_sample_rate (audio_frame_rate());
-
- FrameRateConversion frc (video_frame_rate(), dcp_frame_rate());
-
- /* Compensate if the DCP is being run at a different frame rate
- to the source; that is, if the video is run such that it will
- look different in the DCP compared to the source (slower or faster).
- skip/repeat doesn't come into effect here.
- */
-
- if (frc.change_speed) {
- t *= video_frame_rate() * frc.factor() / dcp_frame_rate();
- }
-
- return rint (t);
-}
-
/** @return a DCI-compliant name for a DCP of this film */
string
Film::dci_name (bool if_created_now) const
d << "_" << dcp_content_type()->dci_name();
}
- if (format()) {
- d << "_" << format()->dci_name();
+ if (container()) {
+ d << "_" << container()->dci_name();
}
DCIMetadata const dm = dci_metadata ();
}
}
- switch (audio_channels ()) {
- case 1:
- d << "_10";
- break;
- case 2:
- d << "_20";
- break;
- case 6:
- d << "_51";
- break;
- case 8:
- d << "_71";
- break;
- }
-
- d << "_2K";
+ d << "_51_2K";
if (!dm.studio.empty ()) {
d << "_" << dm.studio;
signal_changed (USE_DCI_NAME);
}
-void
-Film::set_trust_content_headers (bool t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trust_content_headers = t;
- }
-
- signal_changed (TRUST_CONTENT_HEADERS);
-
- if (!_trust_content_headers && !content().empty()) {
- /* We just said that we don't trust the content's header */
- ContentList c = content ();
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- examine_content (*i);
- }
- }
-}
-
void
Film::set_dcp_content_type (DCPContentType const * t)
{
}
void
-Film::set_format (Format const * f)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _format = f;
- }
- signal_changed (FORMAT);
-}
-
-void
-Film::set_crop (Crop c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _crop = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_left_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
-
- if (_crop.left == c) {
- return;
- }
-
- _crop.left = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_right_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- if (_crop.right == c) {
- return;
- }
-
- _crop.right = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_top_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- if (_crop.top == c) {
- return;
- }
-
- _crop.top = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_bottom_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- if (_crop.bottom == c) {
- return;
- }
-
- _crop.bottom = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_filters (vector<Filter const *> f)
+Film::set_container (Ratio const * c)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _filters = f;
+ _container = c;
}
- signal_changed (FILTERS);
+ signal_changed (CONTAINER);
}
void
signal_changed (SCALER);
}
-void
-Film::set_trim_start (int t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trim_start = t;
- }
- signal_changed (TRIM_START);
-}
-
-void
-Film::set_trim_end (int t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trim_end = t;
- }
- signal_changed (TRIM_END);
-}
-
-void
-Film::set_ab (bool a)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _ab = a;
- }
- signal_changed (AB);
-}
-
-void
-Film::set_audio_gain (float g)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _audio_gain = g;
- }
- signal_changed (AUDIO_GAIN);
-}
-
-void
-Film::set_audio_delay (int d)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _audio_delay = d;
- }
- signal_changed (AUDIO_DELAY);
-}
-
void
Film::set_with_subtitles (bool w)
{
void
-Film::set_dcp_frame_rate (int f)
+Film::set_minimum_audio_channels (int c)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_frame_rate = f;
+ _minimum_audio_channels = c;
}
- signal_changed (DCP_FRAME_RATE);
+ signal_changed (MINIMUM_AUDIO_CHANNELS);
+}
+
+void
+Film::set_dcp_video_frame_rate (int f)
+{
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _dcp_video_frame_rate = f;
+ }
+ signal_changed (DCP_VIDEO_FRAME_RATE);
}
void
switch (p) {
case Film::CONTENT:
- _playlist->setup (content ());
- set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
+ set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
break;
default:
break;
shared_ptr<Player>
Film::player () const
{
- boost::mutex::scoped_lock lm (_state_mutex);
return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
}
-void
-Film::add_content (shared_ptr<Content> c)
+shared_ptr<Playlist>
+Film::playlist () const
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _content.push_back (c);
- }
-
- signal_changed (CONTENT);
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _playlist;
+}
- examine_content (c);
+Playlist::ContentList
+Film::content () const
+{
+ return _playlist->content ();
}
void
-Film::remove_content (shared_ptr<Content> c)
+Film::examine_and_add_content (shared_ptr<Content> c)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- ContentList::iterator i = find (_content.begin(), _content.end(), c);
- if (i != _content.end ()) {
- _content.erase (i);
- }
- }
-
- signal_changed (CONTENT);
+ shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
+ j->Finished.connect (bind (&Film::add_content_weak, this, boost::weak_ptr<Content> (c)));
+ JobManager::instance()->add (j);
}
void
-Film::move_content_earlier (shared_ptr<Content> c)
+Film::add_content_weak (weak_ptr<Content> c)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- ContentList::iterator i = find (_content.begin(), _content.end(), c);
- if (i == _content.begin () || i == _content.end()) {
- return;
- }
-
- ContentList::iterator j = i;
- --j;
-
- swap (*i, *j);
- _playlist->setup (_content);
+ shared_ptr<Content> content = c.lock ();
+ if (content) {
+ add_content (content);
}
-
- signal_changed (CONTENT);
}
void
-Film::move_content_later (shared_ptr<Content> c)
+Film::add_content (shared_ptr<Content> c)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- ContentList::iterator i = find (_content.begin(), _content.end(), c);
- if (i == _content.end()) {
- return;
- }
-
- ContentList::iterator j = i;
- ++j;
- if (j == _content.end ()) {
- return;
- }
-
- swap (*i, *j);
- _playlist->setup (_content);
+ /* Add video content after any existing content */
+ if (dynamic_pointer_cast<VideoContent> (c)) {
+ c->set_start (_playlist->video_end ());
}
- signal_changed (CONTENT);
-
+ _playlist->add (c);
}
-ContentAudioFrame
-Film::audio_length () const
+void
+Film::remove_content (shared_ptr<Content> c)
{
- return _playlist->audio_length ();
+ _playlist->remove (c);
}
-int
-Film::audio_channels () const
+Time
+Film::length () const
{
- return _playlist->audio_channels ();
+ return _playlist->length ();
}
-int
-Film::audio_frame_rate () const
+bool
+Film::has_subtitles () const
{
- return _playlist->audio_frame_rate ();
+ return _playlist->has_subtitles ();
}
-int64_t
-Film::audio_channel_layout () const
+OutputVideoFrame
+Film::best_dcp_video_frame_rate () const
{
- return _playlist->audio_channel_layout ();
+ return _playlist->best_dcp_frame_rate ();
}
-bool
-Film::has_audio () const
+void
+Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
{
- return _playlist->has_audio ();
-}
+ if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
+ set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ }
-float
-Film::video_frame_rate () const
-{
- return _playlist->video_frame_rate ();
+ if (ui_signaller) {
+ ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
+ }
}
-libdcp::Size
-Film::video_size () const
+void
+Film::playlist_changed ()
{
- return _playlist->video_size ();
-}
+ signal_changed (CONTENT);
+}
-ContentVideoFrame
-Film::video_length () const
+int
+Film::loop () const
{
- return _playlist->video_length ();
+ return _playlist->loop ();
}
-/** Unfortunately this is needed as the GUI has FFmpeg-specific controls */
-shared_ptr<FFmpegContent>
-Film::ffmpeg () const
+void
+Film::set_loop (int c)
{
- boost::mutex::scoped_lock lm (_state_mutex);
-
- for (ContentList::const_iterator i = _content.begin (); i != _content.end(); ++i) {
- shared_ptr<FFmpegContent> f = boost::dynamic_pointer_cast<FFmpegContent> (*i);
- if (f) {
- return f;
- }
- }
-
- return shared_ptr<FFmpegContent> ();
+ _playlist->set_loop (c);
}
-vector<FFmpegSubtitleStream>
-Film::ffmpeg_subtitle_streams () const
+OutputAudioFrame
+Film::time_to_audio_frames (Time t) const
{
- shared_ptr<FFmpegContent> f = ffmpeg ();
- if (f) {
- return f->subtitle_streams ();
- }
-
- return vector<FFmpegSubtitleStream> ();
+ return t * dcp_audio_frame_rate () / TIME_HZ;
}
-boost::optional<FFmpegSubtitleStream>
-Film::ffmpeg_subtitle_stream () const
+OutputVideoFrame
+Film::time_to_video_frames (Time t) const
{
- shared_ptr<FFmpegContent> f = ffmpeg ();
- if (f) {
- return f->subtitle_stream ();
- }
-
- return boost::none;
+ return t * dcp_video_frame_rate () / TIME_HZ;
}
-vector<FFmpegAudioStream>
-Film::ffmpeg_audio_streams () const
+Time
+Film::audio_frames_to_time (OutputAudioFrame f) const
{
- shared_ptr<FFmpegContent> f = ffmpeg ();
- if (f) {
- return f->audio_streams ();
- }
-
- return vector<FFmpegAudioStream> ();
+ return f * TIME_HZ / dcp_audio_frame_rate ();
}
-boost::optional<FFmpegAudioStream>
-Film::ffmpeg_audio_stream () const
+Time
+Film::video_frames_to_time (OutputVideoFrame f) const
{
- shared_ptr<FFmpegContent> f = ffmpeg ();
- if (f) {
- return f->audio_stream ();
- }
-
- return boost::none;
+ return f * TIME_HZ / dcp_video_frame_rate ();
}
-void
-Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
+OutputAudioFrame
+Film::dcp_audio_frame_rate () const
{
- shared_ptr<FFmpegContent> f = ffmpeg ();
- if (f) {
- f->set_subtitle_stream (s);
- }
+ /* XXX */
+ return 48000;
}
void
-Film::set_ffmpeg_audio_stream (FFmpegAudioStream s)
+Film::set_sequence_video (bool s)
{
- shared_ptr<FFmpegContent> f = ffmpeg ();
- if (f) {
- f->set_audio_stream (s);
- }
+ _playlist->set_sequence_video (s);
}
-void
-Film::content_changed (boost::weak_ptr<Content> c, int p)
+libdcp::Size
+Film::full_frame () const
{
- if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
- set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
- }
-
- if (ui_signaller) {
- ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
- }
+ return libdcp::Size (2048, 1080);
}
projects / dcpomatic.git / blobdiff