Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/scoped_temporary.cc b/src/lib/scoped_temporary.cc
index b712fe4944dfbada271cd68ec63ffe14860ea235..ad4f882a2649ecfadb840e88c66c351dc7b60964 100644 (file)
--- a/src/lib/scoped_temporary.cc
+++ b/src/lib/scoped_temporary.cc
@@ -1,26 +1,29 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "scoped_temporary.h"
+#include "exceptions.h"
+#include "cross.h"
 
 /** Construct a ScopedTemporary.  A temporary filename is decided but the file is not opened
- *  until ::open() is called.
+ *  until open() is called.
  */
 ScopedTemporary::ScopedTemporary ()
        : _open (0)
@@ -49,7 +52,11 @@ ScopedTemporary::c_str () const
 FILE*
 ScopedTemporary::open (char const * params)
 {
-       _open = fopen (c_str(), params);
+       close ();
+       _open = fopen_boost (_file, params);
+       if (!_open) {
+               throw FileError ("Could not open scoped temporary", _file);
+       }
        return _open;
 }