Purge rint() and use llrint and friends.

[dcpomatic.git] / src / wx / subtitle_panel.cc

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index bf3e6d72af81fefeb11f9870f69d05196ad2a920..d99b545587393104aeb1f0731d1a8b0f3b3ebd42 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,20 +17,21 @@
 
 */
 
-#include <boost/lexical_cast.hpp>
-#include <wx/spinctrl.h>
-#include "lib/ffmpeg_content.h"
-#include "lib/subrip_content.h"
-#include "lib/ffmpeg_subtitle_stream.h"
-#include "lib/dcp_subtitle_content.h"
-#include "lib/subrip_decoder.h"
-#include "lib/dcp_subtitle_decoder.h"
 #include "subtitle_panel.h"
 #include "film_editor.h"
 #include "wx_util.h"
 #include "subtitle_view.h"
 #include "content_panel.h"
 #include "fonts_dialog.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/subrip_content.h"
+#include "lib/ffmpeg_subtitle_stream.h"
+#include "lib/dcp_subtitle_content.h"
+#include "lib/subrip_decoder.h"
+#include "lib/dcp_subtitle_decoder.h"
+#include <wx/spinctrl.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
 
 using std::vector;
 using std::string;
@@ -50,7 +51,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        grid->Add (_use);
        grid->AddSpacer (0);
 
-       _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles"));
+       _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
        grid->Add (_burn);
        grid->AddSpacer (0);
 
@@ -172,9 +173,9 @@ SubtitlePanel::film_content_changed (int property)
        } else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
                checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0);
        } else if (property == SubtitleContentProperty::SUBTITLE_X_SCALE) {
-               checked_set (_x_scale, scs ? int (rint (scs->subtitle_x_scale() * 100)) : 100);
+               checked_set (_x_scale, scs ? lrint (scs->subtitle_x_scale() * 100) : 100);
        } else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) {
-               checked_set (_y_scale, scs ? int (rint (scs->subtitle_y_scale() * 100)) : 100);
+               checked_set (_y_scale, scs ? lrint (scs->subtitle_y_scale() * 100) : 100);
        } else if (property == SubtitleContentProperty::SUBTITLE_LANGUAGE) {
                checked_set (_language, scs ? scs->subtitle_language() : "");
        }
@@ -204,11 +205,11 @@ SubtitlePanel::setup_sensitivity ()
        int any_subs = 0;
        int ffmpeg_subs = 0;
        int subrip_or_dcp_subs = 0;
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::const_iterator i = c.begin(); i != c.end(); ++i) {
-               shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (*i);
-               shared_ptr<const SubRipContent> sc = boost::dynamic_pointer_cast<const SubRipContent> (*i);
-               shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (*i);
+       int image_subs = 0;
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i);
+               shared_ptr<const SubRipContent> sc = boost::dynamic_pointer_cast<const SubRipContent> (i);
+               shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (i);
                if (fc) {
                        if (fc->has_subtitles ()) {
                                ++ffmpeg_subs;
@@ -220,12 +221,17 @@ SubtitlePanel::setup_sensitivity ()
                } else {
                        ++any_subs;
                }
+
+               if (i->has_image_subtitles ()) {
+                       ++image_subs;
+                       /* We must burn image subtitles at the moment */
+                       i->set_burn_subtitles (true);
+               }
        }
 
        _use->Enable (any_subs > 0);
        bool const use = _use->GetValue ();
-
-       _burn->Enable (any_subs > 0 && use);
+       _burn->Enable (any_subs > 0 && use && image_subs == 0);
        _x_offset->Enable (any_subs > 0 && use);
        _y_offset->Enable (any_subs > 0 && use);
        _x_scale->Enable (any_subs > 0 && use);