Prevent selection of too few DCP channels (#611).

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 7a5f0554f00bb836fe87b8e8d300bb972207c3ae..0759694f8802db016c07506b36559049c95e0ba0 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -21,6 +21,7 @@
 #include "wx_util.h"
 #include "key_dialog.h"
 #include "isdcf_metadata_dialog.h"
+#include "audio_dialog.h"
 #include "lib/ratio.h"
 #include "lib/config.h"
 #include "lib/dcp_content_type.h"
@@ -29,6 +30,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_processor.h"
 #include <dcp/key.h>
+#include <dcp/raw_convert.h>
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/gbsizer.h>
@@ -40,11 +42,14 @@ using std::cout;
 using std::list;
 using std::string;
 using std::vector;
+using std::pair;
+using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
 
 DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
-       : _film (f)
+       : _audio_dialog (0)
+       , _film (f)
        , _generally_sensitive (true)
 {
        _panel = new wxPanel (n);
@@ -243,7 +248,7 @@ DCPPanel::audio_channels_changed ()
                return;
        }
 
-       _film->set_audio_channels ((_audio_channels->GetSelection () + 1) * 2);
+       _film->set_audio_channels (dcp::raw_convert<int> (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ()))));
 }
 
 void
@@ -344,7 +349,7 @@ DCPPanel::film_changed (int p)
                break;
        }
        case Film::AUDIO_CHANNELS:
-               checked_set (_audio_channels, (_film->audio_channels () / 2) - 1);
+               checked_set (_audio_channels, dcp::raw_convert<string> (_film->audio_channels ()));
                setup_dcp_name ();
                break;
        case Film::THREE_D:
@@ -361,6 +366,8 @@ DCPPanel::film_changed (int p)
                } else {
                        checked_set (_audio_processor, 0);
                }
+               setup_audio_channels_choice ();
+               film_changed (Film::AUDIO_CHANNELS);
                break;
        default:
                break;
@@ -646,6 +653,26 @@ DCPPanel::make_video_panel ()
        return panel;
 }
 
+void
+DCPPanel::setup_audio_channels_choice ()
+{
+       int min = 2;
+       if (_film && _film->audio_processor ()) {
+               min = _film->audio_processor()->out_channels ();
+       }
+
+       if (min % 2 == 1) {
+               ++min;
+       }
+
+       vector<pair<string, string> > items;
+       for (int i = min; i <= 12; 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 ()
 {
@@ -659,9 +686,7 @@ DCPPanel::make_audio_panel ()
        
        add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
        _audio_channels = new wxChoice (panel, wxID_ANY);
-       for (int i = 2; i <= 12; i += 2) {
-               _audio_channels->Append (wxString::Format ("%d", i));
-       }
+       setup_audio_channels_choice ();
        grid->Add (_audio_channels, wxGBPosition (r, 1));
        ++r;
 
@@ -672,11 +697,15 @@ DCPPanel::make_audio_panel ()
                _audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ())));
        }
        grid->Add (_audio_processor, wxGBPosition (r, 1));
-       
+       ++r;
+
+       _show_audio = new wxButton (panel, wxID_ANY, _("Show audio..."));
+       grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
        _audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_channels_changed, this));
        _audio_processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_processor_changed, this));
+       _show_audio->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::show_audio_clicked, this));
 
        return panel;
 }
@@ -696,7 +725,22 @@ DCPPanel::audio_processor_changed ()
        }
 
        string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ()));
-       if (s != "none") {
-               _film->set_audio_processor (AudioProcessor::from_id (s));
+       _film->set_audio_processor (AudioProcessor::from_id (s));
+}
+
+void
+DCPPanel::show_audio_clicked ()
+{
+       if (!_film) {
+               return;
        }
+
+       if (_audio_dialog) {
+               _audio_dialog->Destroy ();
+               _audio_dialog = 0;
+       }
+       
+       AudioDialog* d = new AudioDialog (_panel, _film);
+       d->Show ();
+       d->set_playlist (_film->playlist ());
 }