summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-19 14:42:30 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-19 14:42:30 +0100
commitef26e37fce728cba6fb50e9e6743a012b1bbbf64 (patch)
tree8615d063c3a7d8584795e69b2b073e1f50fffda4
parentd86d3f66f88623bea44033db4855206dd3a5e830 (diff)
Some more boost::filesystem::path.
-rw-r--r--src/asset.h4
-rw-r--r--src/sound_asset.cc2
-rw-r--r--src/sound_asset.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/asset.h b/src/asset.h
index 34176d0d..dbe3deba 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -87,11 +87,11 @@ public:
boost::filesystem::path path () const;
- void set_directory (std::string d) {
+ void set_directory (boost::filesystem::path d) {
_directory = d;
}
- void set_file_name (std::string f) {
+ void set_file_name (boost::filesystem::path f) {
_file_name = f;
}
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 8f666ee6..70ed0f29 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -42,7 +42,7 @@ using boost::shared_ptr;
using boost::lexical_cast;
using namespace libdcp;
-SoundAsset::SoundAsset (boost::filesystem::path directory, string mxf_name)
+SoundAsset::SoundAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name)
: MXFAsset (directory, mxf_name)
, _channels (0)
, _sampling_rate (0)
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 67d3e445..43587a9a 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -68,7 +68,7 @@ private:
class SoundAsset : public MXFAsset
{
public:
- SoundAsset (boost::filesystem::path directory, std::string mxf_name);
+ SoundAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name);
void read ();
void create (std::vector<boost::filesystem::path> const & files);