projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).
[dcpomatic.git]
/
src
/
lib
/
scoped_temporary.cc
diff --git
a/src/lib/scoped_temporary.cc
b/src/lib/scoped_temporary.cc
index 3503808bc210c7a09a37caacf0ca839f246ee4cc..fec938cb136ef2e3c75c5405f1736d73f44117c0 100644
(file)
--- a/
src/lib/scoped_temporary.cc
+++ b/
src/lib/scoped_temporary.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,48
+18,54
@@
*/
*/
+
+#include "cross.h"
+#include "exceptions.h"
#include "scoped_temporary.h"
#include "scoped_temporary.h"
+#include <dcp/filesystem.h>
+
/** Construct a ScopedTemporary. A temporary filename is decided but the file is not opened
/** Construct a ScopedTemporary. A temporary filename is decided but the file is not opened
- * until
::
open() is called.
+ * until open() is called.
*/
ScopedTemporary::ScopedTemporary ()
*/
ScopedTemporary::ScopedTemporary ()
- : _open (0)
{
{
- _
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 and delete the temporary file */
ScopedTemporary::~ScopedTemporary ()
{
- close ();
+ if (_file) {
+ _file->close();
+ }
boost::system::error_code ec;
boost::system::error_code ec;
-
boost::filesystem::remove (_file
, ec);
+
dcp::filesystem::remove(_path
, ec);
}
}
+
/** @return temporary filename */
char const *
ScopedTemporary::c_str () const
{
/** @return temporary filename */
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.
*/
/** Open the temporary file.
* @return File's FILE pointer.
*/
-FILE*
+dcp::File&
ScopedTemporary::open (char const * params)
{
ScopedTemporary::open (char const * params)
{
- _open = fopen (c_str(), params);
- return _open;
-}
-
-/** Close the file */
-void
-ScopedTemporary::close ()
-{
- if (_open) {
- fclose (_open);
- _open = 0;
+ if (_file) {
+ _file->close();
}
}
+ _file = dcp::File(_path, params);
+ if (!*_file) {
+ throw FileError ("Could not open scoped temporary", _path);
+ }
+ return *_file;
}
}
+