Merge master.

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 50a8f709cf3d4e78f08a00064bed6b59b9f497d0..179d7db7115e315fd42d37df378a129df35f7e9c 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -22,6 +22,7 @@
 #include "lib/config.h"
 #include "lib/sound_processor.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "audio_dialog.h"
 #include "audio_panel.h"
 #include "audio_mapping_view.h"
@@ -49,10 +50,10 @@ AudioPanel::AudioPanel (FilmEditor* e)
        grid->Add (_show, wxGBPosition (r, 0));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Audio Gain"), true, wxGBPosition (r, 0));
-       _gain = new ContentSpinCtrl<AudioContent> (
+       add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
+       _gain = new ContentSpinCtrlDouble<AudioContent> (
                this,
-               new wxSpinCtrl (this),
+               new wxSpinCtrlDouble (this),
                AudioContentProperty::AUDIO_GAIN,
                boost::mem_fn (&AudioContent::audio_gain),
                boost::mem_fn (&AudioContent::set_audio_gain)
@@ -64,7 +65,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
        grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Audio Delay"), false, wxGBPosition (r, 0));
+       add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
        _delay = new ContentSpinCtrl<AudioContent> (
                this,
                new wxSpinCtrl (this),
@@ -73,24 +74,23 @@ AudioPanel::AudioPanel (FilmEditor* e)
                boost::mem_fn (&AudioContent::set_audio_delay)
                );
        
-       _delay->add (grid, wxGBPosition (r,1 ));
+       _delay->add (grid, wxGBPosition (r, 1));
        /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
        add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Audio Stream"), true, wxGBPosition (r, 0));
+       add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
        _stream = new wxChoice (this, wxID_ANY);
        grid->Add (_stream, wxGBPosition (r, 1));
-       ++r;
-       
-       _description = new wxStaticText (this, wxID_ANY, wxT (""));
-       grid->Add (_description, wxGBPosition (r, 0));
+       _description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
        ++r;
        
        _mapping = new AudioMappingView (this);
        _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
 
        _gain->wrapped()->SetRange (-60, 60);
+       _gain->wrapped()->SetDigits (1);
+       _gain->wrapped()->SetIncrement (0.5);
        _delay->wrapped()->SetRange (-1000, 1000);
 
        _stream->Bind                (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&AudioPanel::stream_changed, this));
@@ -108,7 +108,6 @@ AudioPanel::film_changed (Film::Property property)
        case Film::AUDIO_CHANNELS:
                _mapping->set_channels (_editor->film()->audio_channels ());
                _sizer->Layout ();
-               _sizer->Fit (this);
                break;
        default:
                break;
@@ -138,11 +137,11 @@ AudioPanel::film_content_changed (int property)
                if (fcs) {
                        vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
                        for (vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
-                               _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+                               _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ())));
                        }
                        
                        if (fcs->audio_stream()) {
-                               checked_set (_stream, lexical_cast<string> (fcs->audio_stream()->id));
+                               checked_set (_stream, fcs->audio_stream()->identifier ());
                                setup_stream_description ();
                        }
                }
@@ -170,7 +169,7 @@ AudioPanel::gain_calculate_button_clicked ()
        /* This appears to be necessary, as the change is not signalled,
           I think.
        */
-       _gain->update_from_model ();
+       _gain->view_changed ();
        
        d->Destroy ();
 }
@@ -210,7 +209,7 @@ AudioPanel::stream_changed ()
        vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
        vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin ();
        string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
-       while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+       while (i != a.end() && (*i)->identifier () != s) {
                ++i;
        }
 
@@ -226,6 +225,7 @@ AudioPanel::setup_stream_description ()
 {
        FFmpegContentList fc = _editor->selected_ffmpeg_content ();
        if (fc.size() != 1) {
+               _description->SetLabel ("");
                return;
        }
 
@@ -240,7 +240,7 @@ AudioPanel::setup_stream_description ()
                } else {
                        s << fcs->audio_channels() << wxT (" ") << _("channels");
                }
-               s << wxT (", ") << fcs->content_audio_frame_rate() << _("Hz");
+               s << wxT (", ") << fcs->audio_frame_rate() << _("Hz");
                _description->SetLabel (s);
        }
 }