Replace incorrect uses of raw_convert with a new locale_convert.

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 7ffc24f7dd0263863f1b02b4173a6a174c955f30..8cbd1dbb654ed947038b1e03b6f5789aceccaf6d 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -29,9 +30,12 @@
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_processor.h"
+#include "lib/video_content.h"
+#include "lib/subtitle_content.h"
 #include "lib/dcp_content.h"
+#include "lib/audio_content.h"
+#include "lib/locale_convert.h"
 #include <dcp/key.h>
-#include <dcp/raw_convert.h>
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/gbsizer.h>
@@ -178,7 +182,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
        _reel_type->Append (_("Single reel"));
        _reel_type->Append (_("Split by video content"));
        /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix
-       _reel_type->Append (_("Reel|Custom"));
+       _reel_type->Append (S_("Reel|Custom"));
 
        _reel_length->SetRange (1, 64);
 
@@ -271,7 +275,7 @@ DCPPanel::audio_channels_changed ()
                return;
        }
 
-       _film->set_audio_channels (dcp::raw_convert<int> (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ()))));
+       _film->set_audio_channels (locale_convert<int> (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ()))));
 }
 
 void
@@ -382,7 +386,7 @@ DCPPanel::film_changed (int p)
                if (_film->audio_channels () < minimum_allowed_audio_channels ()) {
                        _film->set_audio_channels (minimum_allowed_audio_channels ());
                } else {
-                       checked_set (_audio_channels, dcp::raw_convert<string> (max (minimum_allowed_audio_channels(), _film->audio_channels ())));
+                       checked_set (_audio_channels, locale_convert<string> (max (minimum_allowed_audio_channels(), _film->audio_channels ())));
                        setup_dcp_name ();
                }
                break;
@@ -400,7 +404,7 @@ DCPPanel::film_changed (int p)
                } else {
                        checked_set (_audio_processor, 0);
                }
-               setup_audio_channels_choice ();
+               setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ());
                film_changed (Film::AUDIO_CHANNELS);
                break;
        case Film::REEL_TYPE:
@@ -424,10 +428,10 @@ DCPPanel::film_changed (int p)
 void
 DCPPanel::film_content_changed (int property)
 {
-       if (property == AudioContentProperty::AUDIO_STREAMS ||
-           property == SubtitleContentProperty::USE_SUBTITLES ||
-           property == SubtitleContentProperty::BURN_SUBTITLES ||
-           property == VideoContentProperty::VIDEO_SCALE ||
+       if (property == AudioContentProperty::STREAMS ||
+           property == SubtitleContentProperty::USE ||
+           property == SubtitleContentProperty::BURN ||
+           property == VideoContentProperty::SCALE ||
            property == DCPContentProperty::REFERENCE_VIDEO ||
            property == DCPContentProperty::REFERENCE_AUDIO ||
            property == DCPContentProperty::REFERENCE_SUBTITLE) {
@@ -492,6 +496,12 @@ DCPPanel::dcp_content_type_changed ()
 void
 DCPPanel::set_film (shared_ptr<Film> film)
 {
+       /* We are changing film, so destroy any audio dialog for the old one */
+       if (_audio_dialog) {
+               _audio_dialog->Destroy ();
+               _audio_dialog = 0;
+       }
+
        _film = film;
 
        film_changed (Film::NAME);
@@ -576,6 +586,7 @@ void
 DCPPanel::setup_dcp_name ()
 {
        _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true)));
+       _dcp_name->SetToolTip (std_to_wx (_film->dcp_name (true)));
 }
 
 void
@@ -718,17 +729,6 @@ DCPPanel::minimum_allowed_audio_channels () const
        return min;
 }
 
-void
-DCPPanel::setup_audio_channels_choice ()
-{
-       vector<pair<string, string> > items;
-       for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) {
-               items.push_back (make_pair (dcp::raw_convert<string> (i), dcp::raw_convert<string> (i)));
-       }
-
-       checked_set (_audio_channels, items);
-}
-
 wxPanel *
 DCPPanel::make_audio_panel ()
 {
@@ -742,7 +742,7 @@ DCPPanel::make_audio_panel ()
 
        add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
        _audio_channels = new wxChoice (panel, wxID_ANY);
-       setup_audio_channels_choice ();
+       setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ());
        grid->Add (_audio_channels, wxGBPosition (r, 1));
        ++r;