#include <wx/spinctrl.h>
#include "lib/config.h"
#include "lib/sound_processor.h"
+#include "lib/ffmpeg_content.h"
#include "audio_dialog.h"
#include "audio_panel.h"
#include "audio_mapping_view.h"
#include "film_editor.h"
using std::vector;
+using std::cout;
using std::string;
using boost::dynamic_pointer_cast;
using boost::lexical_cast;
: FilmEditorPanel (e, _("Audio"))
, _audio_dialog (0)
{
- wxFlexGridSizer* grid = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (grid, 0, wxALL, 8);
+ int r = 0;
+
_show = new wxButton (this, wxID_ANY, _("Show Audio..."));
- grid->Add (_show, 1);
- grid->AddSpacer (0);
- grid->AddSpacer (0);
-
- add_label_to_sizer (grid, this, _("Audio Gain"), true);
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _gain = new wxSpinCtrl (this);
- s->Add (_gain, 1);
- add_label_to_sizer (s, this, _("dB"), false);
- grid->Add (s, 1);
- }
+ 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> (
+ this,
+ new wxSpinCtrl (this),
+ AudioContentProperty::AUDIO_GAIN,
+ boost::mem_fn (&AudioContent::audio_gain),
+ boost::mem_fn (&AudioContent::set_audio_gain)
+ );
+ _gain->add (grid, wxGBPosition (r, 1));
+ add_label_to_grid_bag_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2));
_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
- grid->Add (_gain_calculate_button);
-
- add_label_to_sizer (grid, this, _("Audio Delay"), false);
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _delay = new wxSpinCtrl (this);
- s->Add (_delay, 1);
- /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
- add_label_to_sizer (s, this, _("ms"), false);
- grid->Add (s);
- }
-
- grid->AddSpacer (0);
+ grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
+ ++r;
+
+ add_label_to_grid_bag_sizer (grid, this, _("Audio Delay"), false, wxGBPosition (r, 0));
+ _delay = new ContentSpinCtrl<AudioContent> (
+ this,
+ new wxSpinCtrl (this),
+ AudioContentProperty::AUDIO_DELAY,
+ boost::mem_fn (&AudioContent::audio_delay),
+ boost::mem_fn (&AudioContent::set_audio_delay)
+ );
+
+ _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_sizer (grid, this, _("Audio Stream"), true);
+ add_label_to_grid_bag_sizer (grid, this, _("Audio Stream"), true, wxGBPosition (r, 0));
_stream = new wxChoice (this, wxID_ANY);
- grid->Add (_stream, 1, wxEXPAND);
- _description = new wxStaticText (this, wxID_ANY, wxT (""));
- grid->AddSpacer (0);
+ grid->Add (_stream, wxGBPosition (r, 1));
+ ++r;
- grid->Add (_description, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
- grid->AddSpacer (0);
- grid->AddSpacer (0);
+ _description = new wxStaticText (this, wxID_ANY, wxT (""));
+ grid->Add (_description, wxGBPosition (r, 0));
+ ++r;
_mapping = new AudioMappingView (this);
_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
- _gain->SetRange (-60, 60);
- _delay->SetRange (-1000, 1000);
+ _gain->wrapped()->SetRange (-60, 60);
+ _delay->wrapped()->SetRange (-1000, 1000);
+
+ _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::stream_changed, this));
+ _show->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::show_clicked, this));
+ _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
- _delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (AudioPanel::delay_changed), 0, this);
- _stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioPanel::stream_changed), 0, this);
- _show->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (AudioPanel::show_clicked), 0, this);
- _gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (AudioPanel::gain_changed), 0, this);
- _gain_calculate_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (AudioPanel::gain_calculate_button_clicked), 0, this);
_mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
}
AudioPanel::film_changed (Film::Property property)
{
switch (property) {
- case Film::CONTENT:
- setup_sensitivity ();
- break;
- case Film::DCP_AUDIO_CHANNELS:
- _mapping->set_channels (_editor->film()->dcp_audio_channels ());
+ case Film::AUDIO_CHANNELS:
+ _mapping->set_channels (_editor->film()->audio_channels ());
+ _sizer->Layout ();
+ _sizer->Fit (this);
break;
default:
break;
}
void
-AudioPanel::film_content_changed (
- shared_ptr<Content>,
- shared_ptr<AudioContent> audio_content,
- shared_ptr<SubtitleContent>,
- shared_ptr<FFmpegContent> ffmpeg_content,
- int property
- )
+AudioPanel::film_content_changed (int property)
{
- if (property == AudioContentProperty::AUDIO_GAIN) {
- checked_set (_gain, audio_content ? audio_content->audio_gain() : 0);
- } else if (property == AudioContentProperty::AUDIO_DELAY) {
- checked_set (_delay, audio_content ? audio_content->audio_delay() : 0);
- } else if (property == AudioContentProperty::AUDIO_MAPPING) {
- _mapping->set (audio_content ? audio_content->audio_mapping () : AudioMapping ());
+ AudioContentList ac = _editor->selected_audio_content ();
+ shared_ptr<AudioContent> acs;
+ shared_ptr<FFmpegContent> fcs;
+ if (ac.size() == 1) {
+ acs = ac.front ();
+ fcs = dynamic_pointer_cast<FFmpegContent> (acs);
+ }
+
+ if (property == AudioContentProperty::AUDIO_MAPPING) {
+ _mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
+ _sizer->Layout ();
+ } else if (property == FFmpegContentProperty::AUDIO_STREAM) {
+ setup_stream_description ();
+ _mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
+ _sizer->Layout ();
} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
_stream->Clear ();
- if (ffmpeg_content) {
- vector<shared_ptr<FFmpegAudioStream> > a = ffmpeg_content->audio_streams ();
+ 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))));
}
- if (ffmpeg_content->audio_stream()) {
- checked_set (_stream, lexical_cast<string> (ffmpeg_content->audio_stream()->id));
+ if (fcs->audio_stream()) {
+ checked_set (_stream, lexical_cast<string> (fcs->audio_stream()->id));
+ setup_stream_description ();
}
}
- setup_sensitivity ();
- } else if (property == FFmpegContentProperty::AUDIO_STREAM) {
- setup_sensitivity ();
- }
-}
-
-void
-AudioPanel::gain_changed (wxCommandEvent &)
-{
- shared_ptr<AudioContent> ac = _editor->selected_audio_content ();
- if (!ac) {
- return;
- }
-
- ac->set_audio_gain (_gain->GetValue ());
-}
-
-void
-AudioPanel::delay_changed (wxCommandEvent &)
-{
- shared_ptr<AudioContent> ac = _editor->selected_audio_content ();
- if (!ac) {
- return;
}
-
- ac->set_audio_delay (_delay->GetValue ());
}
void
-AudioPanel::gain_calculate_button_clicked (wxCommandEvent &)
+AudioPanel::gain_calculate_button_clicked ()
{
GainCalculatorDialog* d = new GainCalculatorDialog (this);
d->ShowModal ();
return;
}
- _gain->SetValue (
+ _gain->wrapped()->SetValue (
Config::instance()->sound_processor()->db_for_fader_change (
d->wanted_fader (),
d->actual_fader ()
/* This appears to be necessary, as the change is not signalled,
I think.
*/
- wxCommandEvent dummy;
- gain_changed (dummy);
+ _gain->update_from_model ();
d->Destroy ();
}
void
-AudioPanel::show_clicked (wxCommandEvent &)
+AudioPanel::show_clicked ()
{
if (_audio_dialog) {
_audio_dialog->Destroy ();
_audio_dialog = 0;
}
- shared_ptr<Content> c = _editor->selected_content ();
- if (!c) {
- return;
- }
-
- shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c);
- if (!ac) {
+ AudioContentList ac = _editor->selected_audio_content ();
+ if (ac.size() != 1) {
return;
}
_audio_dialog = new AudioDialog (this);
_audio_dialog->Show ();
- _audio_dialog->set_content (ac);
-}
-
-
-void
-AudioPanel::setup_sensitivity ()
-{
- _show->Enable (_editor->film ());
- _gain->Enable (_editor->generally_sensitive ());
- _gain_calculate_button->Enable (_editor->generally_sensitive ());
- _delay->Enable (_editor->generally_sensitive ());
-}
-
-void
-AudioPanel::content_selection_changed ()
-{
- if (_audio_dialog && _editor->selected_audio_content()) {
- _audio_dialog->set_content (_editor->selected_audio_content ());
- }
+ _audio_dialog->set_content (ac.front ());
}
void
-AudioPanel::stream_changed (wxCommandEvent &)
+AudioPanel::stream_changed ()
{
- shared_ptr<Content> c = _editor->selected_content ();
- if (!c) {
+ FFmpegContentList fc = _editor->selected_ffmpeg_content ();
+ if (fc.size() != 1) {
return;
}
+
+ shared_ptr<FFmpegContent> fcs = fc.front ();
- shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
- if (!fc) {
+ if (_stream->GetSelection() == -1) {
return;
}
- vector<shared_ptr<FFmpegAudioStream> > a = fc->audio_streams ();
+ 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) {
}
if (i != a.end ()) {
- fc->set_audio_stream (*i);
+ fcs->set_audio_stream (*i);
}
- if (!fc->audio_stream ()) {
+ setup_stream_description ();
+}
+
+void
+AudioPanel::setup_stream_description ()
+{
+ FFmpegContentList fc = _editor->selected_ffmpeg_content ();
+ if (fc.size() != 1) {
+ return;
+ }
+
+ shared_ptr<FFmpegContent> fcs = fc.front ();
+
+ if (!fcs->audio_stream ()) {
_description->SetLabel (wxT (""));
} else {
wxString s;
- if (fc->audio_channels() == 1) {
+ if (fcs->audio_channels() == 1) {
s << _("1 channel");
} else {
- s << fc->audio_channels() << wxT (" ") << _("channels");
+ s << fcs->audio_channels() << wxT (" ") << _("channels");
}
- s << wxT (", ") << fc->content_audio_frame_rate() << _("Hz");
+ s << wxT (", ") << fcs->content_audio_frame_rate() << _("Hz");
_description->SetLabel (s);
}
}
void
AudioPanel::mapping_changed (AudioMapping m)
{
- shared_ptr<AudioContent> c = _editor->selected_audio_content ();
- if (!c) {
- return;
+ AudioContentList c = _editor->selected_audio_content ();
+ if (c.size() == 1) {
+ c.front()->set_audio_mapping (m);
}
-
- c->set_audio_mapping (m);
}
+void
+AudioPanel::content_selection_changed ()
+{
+ AudioContentList sel = _editor->selected_audio_content ();
+
+ if (_audio_dialog && sel.size() == 1) {
+ _audio_dialog->set_content (sel.front ());
+ }
+
+ _gain->set_content (sel);
+ _delay->set_content (sel);
+
+ _show->Enable (sel.size() == 1);
+ _stream->Enable (sel.size() == 1);
+ _mapping->Enable (sel.size() == 1);
+
+ film_content_changed (AudioContentProperty::AUDIO_MAPPING);
+ film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
+ film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
+}
projects / dcpomatic.git / blobdiff