Supporters update.

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

diff --git a/src/lib/scoped_temporary.cc b/src/lib/scoped_temporary.cc
index 223100ba5f727df6180eab3b1ba191a38f1ff18b..fec938cb136ef2e3c75c5405f1736d73f44117c0 100644 (file)
--- a/src/lib/scoped_temporary.cc
+++ b/src/lib/scoped_temporary.cc
@@ -19,9 +19,10 @@
 */
 
 
-#include "scoped_temporary.h"
-#include "exceptions.h"
 #include "cross.h"
+#include "exceptions.h"
+#include "scoped_temporary.h"
+#include <dcp/filesystem.h>
 
 
 /** Construct a ScopedTemporary.  A temporary filename is decided but the file is not opened
@@ -29,16 +30,18 @@
  */
 ScopedTemporary::ScopedTemporary ()
 {
-       _file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path ();
+       _path = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
 }
 
 
 /** Close and delete the temporary file */
 ScopedTemporary::~ScopedTemporary ()
 {
-       close ();
+       if (_file) {
+               _file->close();
+       }
        boost::system::error_code ec;
-       boost::filesystem::remove (_file, ec);
+       dcp::filesystem::remove(_path, ec);
 }
 
 
@@ -46,31 +49,23 @@ ScopedTemporary::~ScopedTemporary ()
 char const *
 ScopedTemporary::c_str () const
 {
-       return _file.string().c_str();
+       return _path.string().c_str();
 }
 
 
 /** Open the temporary file.
  *  @return File's FILE pointer.
  */
-FILE*
+dcp::File&
 ScopedTemporary::open (char const * params)
 {
-       close ();
-       _open = fopen_boost (_file, params);
-       if (!_open) {
-               throw FileError ("Could not open scoped temporary", _file);
+       if (_file) {
+               _file->close();
        }
-       return _open;
-}
-
-
-/** Close the file */
-void
-ScopedTemporary::close ()
-{
-       if (_open) {
-               fclose (_open);
-               _open = nullptr;
+       _file = dcp::File(_path, params);
+       if (!*_file) {
+               throw FileError ("Could not open scoped temporary", _path);
        }
+       return *_file;
 }
+