Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5e08ed9979844500c9e16b6f979c93c4edb32919..35773c797e25c591c20b65c819a1415a1d8bdc99 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -32,7 +32,6 @@
 #include "exceptions.h"
 #include "examine_content_job.h"
 #include "config.h"
-#include "ui_signaller.h"
 #include "playlist.h"
 #include "player.h"
 #include "dcp_content_type.h"
@@ -790,9 +789,7 @@ Film::signal_changed (Property p)
                break;
        }
 
-       if (ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (Changed), p));
-       }
+       emit (boost::bind (boost::ref (Changed), p));
 }
 
 void
@@ -995,9 +992,7 @@ Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
                signal_changed (NAME);
        }
 
-       if (ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
-       }
+       emit (boost::bind (boost::ref (ContentChanged), c, p));
 }
 
 void
@@ -1041,7 +1036,7 @@ Film::full_frame () const
 dcp::Size
 Film::frame_size () const
 {
-       return fit_ratio_within (container()->ratio(), full_frame (), 1);
+       return fit_ratio_within (container()->ratio(), full_frame ());
 }
 
 dcp::EncryptedKDM
@@ -1101,10 +1096,29 @@ Film::required_disk_space () const
  *  Note: the decision made by this method isn't, of course, 100% reliable.
  */
 bool
-Film::should_be_enough_disk_space (double& required, double& available) const
-{
+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";
+       can_hard_link = true;
+       FILE* f = fopen_boost (test, "w");
+       if (f) {
+               fclose (f);
+               boost::system::error_code ec;
+               boost::filesystem::create_hard_link (test, test2, ec);
+               if (ec) {
+                       can_hard_link = false;
+               }
+               boost::filesystem::remove (test);
+               boost::filesystem::remove (test2);
+       }
+
        boost::filesystem::space_info s = boost::filesystem::space (internal_video_mxf_dir ());
        required = double (required_disk_space ()) / 1073741824.0f;
+       if (!can_hard_link) {
+               required *= 2;
+       }
        available = double (s.available) / 1073741824.0f;
        return (available - required) > 1;
 }