Rename Subtitle -> Text

[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 831afe757d880832ff517e4a16765089bca35112..f78ed9ab5ed4b585640e9e9cbd849661bb242f0e 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -20,8 +20,8 @@
 
 #include "subtitle_appearance_dialog.h"
 #include "rgba_colour_picker.h"
-#include "lib/text_subtitle_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_text_content.h"
+#include "lib/text_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
 #include "lib/ffmpeg_content.h"
 #include <wx/wx.h>
@@ -127,7 +127,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        _effect->Append (_("Shadow"));;
 
        optional<dcp::Colour> colour = _content->subtitle->colour();
-       _force_effect_colour->SetValue (static_cast<bool>(colour));
+       _force_colour->SetValue (static_cast<bool>(colour));
        if (colour) {
                _colour->SetColour (wxColour (colour->r, colour->g, colour->b));
        } else {
@@ -153,7 +153,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        }
 
        optional<dcp::Colour> effect_colour = _content->subtitle->effect_colour();
-       _force_effect_colour->SetValue (static_cast<bool>(_force_effect_colour));
+       _force_effect_colour->SetValue (static_cast<bool>(effect_colour));
        if (effect_colour) {
                _effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b));
        } else {
@@ -210,16 +210,20 @@ SubtitleAppearanceDialog::apply ()
        } else {
                _content->subtitle->unset_colour ();
        }
-       switch (_effect->GetSelection()) {
-       case NONE:
-               _content->subtitle->set_effect (dcp::NONE);
-               break;
-       case OUTLINE:
-               _content->subtitle->set_effect (dcp::BORDER);
-               break;
-       case SHADOW:
-               _content->subtitle->set_effect (dcp::SHADOW);
-               break;
+       if (_force_effect->GetValue()) {
+               switch (_effect->GetSelection()) {
+               case NONE:
+                       _content->subtitle->set_effect (dcp::NONE);
+                       break;
+               case OUTLINE:
+                       _content->subtitle->set_effect (dcp::BORDER);
+                       break;
+               case SHADOW:
+                       _content->subtitle->set_effect (dcp::SHADOW);
+                       break;
+               }
+       } else {
+               _content->subtitle->unset_effect ();
        }
        if (_force_effect_colour->GetValue ()) {
                wxColour const ec = _effect_colour->GetColour ();