summaryrefslogtreecommitdiff
path: root/src/lib/film.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-08 14:25:10 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-08 14:25:10 +0100
commitf07623551706b849190c84059bac455088f8eb1e (patch)
tree81360f73c4a52702921270c605087d0c5f03e42e /src/lib/film.cc
parent5665f1503d751391768bd7ed5894f2ecd63ea8fc (diff)
Adapt for changes to libdcp API.
Diffstat (limited to 'src/lib/film.cc')
-rw-r--r--src/lib/film.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 590acedfd..d67182022 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -220,13 +220,13 @@ Film::info_file () const
}
boost::filesystem::path
-Film::internal_video_mxf_dir () const
+Film::internal_video_asset_dir () const
{
return dir ("video");
}
boost::filesystem::path
-Film::internal_video_mxf_filename () const
+Film::internal_video_asset_filename () const
{
return video_identifier() + ".mxf";
}
@@ -1132,8 +1132,8 @@ bool
Film::should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const
{
/* Create a test file and see if we can hard-link it */
- boost::filesystem::path test = internal_video_mxf_dir() / "test";
- boost::filesystem::path test2 = internal_video_mxf_dir() / "test2";
+ boost::filesystem::path test = internal_video_asset_dir() / "test";
+ boost::filesystem::path test2 = internal_video_asset_dir() / "test2";
can_hard_link = true;
FILE* f = fopen_boost (test, "w");
if (f) {
@@ -1147,7 +1147,7 @@ Film::should_be_enough_disk_space (double& required, double& available, bool& ca
boost::filesystem::remove (test2);
}
- boost::filesystem::space_info s = boost::filesystem::space (internal_video_mxf_dir ());
+ boost::filesystem::space_info s = boost::filesystem::space (internal_video_asset_dir ());
required = double (required_disk_space ()) / 1073741824.0f;
if (!can_hard_link) {
required *= 2;