projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt for libdcp use of enum class.
[dcpomatic.git]
/
src
/
wx
/
subtitle_appearance_dialog.cc
diff --git
a/src/wx/subtitle_appearance_dialog.cc
b/src/wx/subtitle_appearance_dialog.cc
index 46edacd97258ca8b8256c9081a523b0846e5dfd8..e21093798646641ab390ddfeb43130f744996b19 100644
(file)
--- a/
src/wx/subtitle_appearance_dialog.cc
+++ b/
src/wx/subtitle_appearance_dialog.cc
@@
-39,9
+39,9
@@
DCPOMATIC_ENABLE_WARNINGS
using std::map;
using std::string;
using std::map;
using std::string;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::bind;
using boost::bind;
-using
boost
::dynamic_pointer_cast;
+using
std
::dynamic_pointer_cast;
using boost::optional;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
using boost::optional;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
@@
-160,13
+160,13
@@
SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
_force_effect->SetValue (static_cast<bool>(effect));
if (effect) {
switch (*effect) {
_force_effect->SetValue (static_cast<bool>(effect));
if (effect) {
switch (*effect) {
- case dcp::NONE:
+ case dcp::
Effect::
NONE:
_effect->SetSelection (NONE);
break;
_effect->SetSelection (NONE);
break;
- case dcp::BORDER:
+ case dcp::
Effect::
BORDER:
_effect->SetSelection (OUTLINE);
break;
_effect->SetSelection (OUTLINE);
break;
- case dcp::SHADOW:
+ case dcp::
Effect::
SHADOW:
_effect->SetSelection (SHADOW);
break;
}
_effect->SetSelection (SHADOW);
break;
}
@@
-245,13
+245,13
@@
SubtitleAppearanceDialog::apply ()
if (_force_effect->GetValue()) {
switch (_effect->GetSelection()) {
case NONE:
if (_force_effect->GetValue()) {
switch (_effect->GetSelection()) {
case NONE:
- _caption->set_effect (dcp::NONE);
+ _caption->set_effect (dcp::
Effect::
NONE);
break;
case OUTLINE:
break;
case OUTLINE:
- _caption->set_effect (dcp::BORDER);
+ _caption->set_effect (dcp::
Effect::
BORDER);
break;
case SHADOW:
break;
case SHADOW:
- _caption->set_effect (dcp::SHADOW);
+ _caption->set_effect (dcp::
Effect::
SHADOW);
break;
}
} else {
break;
}
} else {