diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-16 22:07:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-16 22:07:00 +0100 |
| commit | 4ed8eafd541c2c5867795db56c440e444cc0aeff (patch) | |
| tree | 22a797105d667c7a5525bb895be593d1ea6cad25 /src/lib | |
| parent | eb94fae8de00d63a44d46599cb78a63d7e08edfc (diff) | |
string -> filesystem::path
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 12 | ||||
| -rw-r--r-- | src/lib/film.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 8c0365e02..3cae2a02f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -131,7 +131,7 @@ Film::Film (boost::filesystem::path dir) } } - set_directory (result.string ()); + set_directory (result); _log.reset (new FileLog (file ("log"))); _playlist->set_sequence_video (_sequence_video); @@ -313,13 +313,13 @@ Film::encoded_frames () const void Film::write_metadata () const { - if (!boost::filesystem::exists (directory())) { - boost::filesystem::create_directory (directory()); + if (!boost::filesystem::exists (directory ())) { + boost::filesystem::create_directory (directory ()); } LocaleGuard lg; - boost::filesystem::create_directories (directory()); + boost::filesystem::create_directories (directory ()); xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Metadata"); @@ -546,7 +546,7 @@ Film::dcp_name (bool if_created_now) const void -Film::set_directory (string d) +Film::set_directory (boost::filesystem::path d) { _directory = d; _dirty = true; @@ -917,7 +917,7 @@ Film::make_kdm ( shared_ptr<const Signer> signer = make_signer (); /* Find the DCP to make the KDM for */ - string const dir = this->directory (); + boost::filesystem::path const dir = this->directory (); list<boost::filesystem::path> dcps; for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) { if ( diff --git a/src/lib/film.h b/src/lib/film.h index 71bbd3844..821c4e2b2 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -161,7 +161,7 @@ public: /* GET */ - std::string directory () const { + boost::filesystem::path directory () const { return _directory; } @@ -229,7 +229,7 @@ public: /* SET */ - void set_directory (std::string); + void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_dci_name (bool); void examine_and_add_content (boost::shared_ptr<Content>); @@ -277,7 +277,7 @@ private: /** Complete path to directory containing the film metadata; * must not be relative. */ - std::string _directory; + boost::filesystem::path _directory; /** Name for DCP-o-matic */ std::string _name; |