diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-31 00:23:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-31 00:23:59 +0100 |
| commit | fe3476307bead95b72efc7d47a2ce3da31c35d88 (patch) | |
| tree | ed5ad2faed0b556be9936920f4b17fd0d100b6bb /src/dcp.cc | |
| parent | b3ae1623ed44ade680236b4af283543083bceea3 (diff) | |
path -> dir, name for MXFs.
Diffstat (limited to 'src/dcp.cc')
| -rw-r--r-- | src/dcp.cc | 22 |
1 files changed, 6 insertions, 16 deletions
@@ -54,37 +54,25 @@ DCP::DCP (string directory, string name, ContentKind content_kind, int fps, int void DCP::add_sound_asset (vector<string> const & files) { - filesystem::path p; - p /= _directory; - p /= "audio.mxf"; - _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (files, p.string(), &Progress, _fps, _length))); + _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (files, _directory, "audio.mxf", &Progress, _fps, _length))); } void DCP::add_sound_asset (sigc::slot<string, Channel> get_path, int channels) { - filesystem::path p; - p /= _directory; - p /= "audio.mxf"; - _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (get_path, p.string(), &Progress, _fps, _length, channels))); + _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (get_path, _directory, "audio.mxf", &Progress, _fps, _length, channels))); } void DCP::add_picture_asset (vector<string> const & files, int width, int height) { - filesystem::path p; - p /= _directory; - p /= "video.mxf"; - _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (files, p.string(), &Progress, _fps, _length, width, height))); + _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (files, _directory, "video.mxf", &Progress, _fps, _length, width, height))); } void DCP::add_picture_asset (sigc::slot<string, int> get_path, int width, int height) { - filesystem::path p; - p /= _directory; - p /= "video.mxf"; - _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (get_path, p.string(), &Progress, _fps, _length, width, height))); + _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (get_path, _directory, "video.mxf", &Progress, _fps, _length, width, height))); } void @@ -295,6 +283,7 @@ DCP::DCP (string directory) _assets.push_back (shared_ptr<PictureAsset> ( new PictureAsset ( + _directory, cpl_assets->main_picture->annotation_text, _fps, _length, @@ -306,6 +295,7 @@ DCP::DCP (string directory) if (cpl_assets->main_sound) { _assets.push_back (shared_ptr<SoundAsset> ( new SoundAsset ( + _directory, cpl_assets->main_picture->annotation_text, _fps, _length |