projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2538ac5
)
Fix non-variant build (#1373).
author
Carl Hetherington
<cth@carlh.net>
Thu, 27 Sep 2018 18:34:27 +0000
(19:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 27 Sep 2018 18:34:27 +0000
(19:34 +0100)
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 0f1ed00b32f901fb544662978d3c2dbd9aca703c..3be884e035676c8fca9ee4f74966caf12c01cd86 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-300,6
+300,7
@@
public:
Config::instance()->add_to_player_history (dir);
}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
optional<dcp::EncryptedKDM> get_kdm_from_url (shared_ptr<DCPContent> dcp)
{
ScopedTemporary temp;
@@
-318,6
+319,7
@@
public:
}
return kdm;
}
+#endif
optional<dcp::EncryptedKDM> get_kdm_from_directory (shared_ptr<DCPContent> dcp)
{