Merge master.

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 0838fa8abb9a7a9241470db621091a3297169d1a..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"), true, wxGBPosition (r, 0));
+       add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
        _delay = new ContentSpinCtrl<AudioContent> (
                this,
                new wxSpinCtrl (this),
@@ -78,7 +79,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
        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));
        _description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
@@ -88,6 +89,8 @@ AudioPanel::AudioPanel (FilmEditor* e)
        _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));
@@ -166,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 ();
 }
@@ -237,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);
        }
 }