Basic stuff to analyse audio (job).

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 3ccdac7137555c71d2e323aa6f1464a81977047a..4a67624dba15e72db0fbd635bec89ed47594f8f5 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -45,6 +45,7 @@
 #include "sound_processor.h"
 #include "dci_metadata_dialog.h"
 #include "scaler.h"
+#include "audio_dialog.h"
 
 using std::string;
 using std::cout;
@@ -124,7 +125,7 @@ FilmEditor::make_film_panel ()
        _dcp_content_type = new wxChoice (_film_panel, wxID_ANY);
        grid->Add (_dcp_content_type);
 
-       video_control (add_label_to_sizer (grid, _film_panel, _("Frames Per Second")));
+       video_control (add_label_to_sizer (grid, _film_panel, _("Original Frame Rate")));
        _frames_per_second = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
        grid->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL);
        
@@ -204,6 +205,7 @@ FilmEditor::connect_to_widgets ()
        _audio_gain_calculate_button->Connect (
                wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
                );
+       _show_audio->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
        _audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
        _use_content_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
        _use_external_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
@@ -228,28 +230,21 @@ FilmEditor::make_video_panel ()
        _format = new wxChoice (_video_panel, wxID_ANY);
        grid->Add (_format);
 
-       {
-               add_label_to_sizer (grid, _video_panel, _("Crop"));
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+       add_label_to_sizer (grid, _video_panel, _("Left crop"));
+       _left_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+       grid->Add (_left_crop);
 
-               /* TRANSLATORS: L, R, T and B are abbreviations for Left, Right, Top, Bottom, the four edges
-                  of the picture frame.
-               */
-               add_label_to_sizer (s, _video_panel, _("L"));
-               _left_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_left_crop, 0);
-               add_label_to_sizer (s, _video_panel, _("R"));
-               _right_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_right_crop, 0);
-               add_label_to_sizer (s, _video_panel, _("T"));
-               _top_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_top_crop, 0);
-               add_label_to_sizer (s, _video_panel, _("B"));
-               _bottom_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_bottom_crop, 0);
-
-               grid->Add (s);
-       }
+       add_label_to_sizer (grid, _video_panel, _("Right crop"));
+       _right_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+       grid->Add (_right_crop);
+       
+       add_label_to_sizer (grid, _video_panel, _("Top crop"));
+       _top_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+       grid->Add (_top_crop);
+       
+       add_label_to_sizer (grid, _video_panel, _("Bottom crop"));
+       _bottom_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+       grid->Add (_bottom_crop);
 
        /* VIDEO-only stuff */
        {
@@ -322,6 +317,10 @@ FilmEditor::make_audio_panel ()
                grid->Add (s);
        }
 
+       _show_audio = new wxButton (_audio_panel, wxID_ANY, _("Show Audio..."));
+       grid->AddSpacer (0);
+       grid->Add (_show_audio);
+
        {
                video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Delay")));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
@@ -1182,3 +1181,11 @@ FilmEditor::setup_dcp_name ()
                _dcp_name->SetLabel (std_to_wx (s));
        }
 }
+
+void
+FilmEditor::show_audio_clicked (wxCommandEvent &)
+{
+       AudioDialog* d = new AudioDialog (this, _film);
+       d->ShowModal ();
+       d->Destroy ();
+}