diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-01-08 16:25:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-09 11:54:16 +0100 |
| commit | 12d1abf033654727d6ab6278087ff7cfc65d63f6 (patch) | |
| tree | b920b3c3614fc91a1cb2a220972042e6318a6fd4 /src/tools | |
| parent | ad41d2dd987ffcd2068d9fbf4273108c9f796762 (diff) | |
Move ScopeGuard into libdcp.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 133cabf95..301e893ff 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -59,7 +59,6 @@ #include "lib/player.h" #include "lib/player_video.h" #include "lib/ratio.h" -#include "lib/scope_guard.h" #include "lib/scoped_temporary.h" #include "lib/server.h" #include "lib/text_content.h" @@ -71,6 +70,7 @@ #include <dcp/exceptions.h> #include <dcp/filesystem.h> #include <dcp/raw_convert.h> +#include <dcp/scope_guard.h> #include <dcp/search.h> #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS @@ -707,7 +707,7 @@ private: DCPOMATIC_ASSERT (dcp); try { if (dcp) { - ScopeGuard sg([this]() { + dcp::ScopeGuard sg([this]() { _viewer.set_coalesce_player_changes(false); }); _viewer.set_coalesce_player_changes(true); |