/*
- Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <boost/lexical_cast.hpp>
-#include <wx/spinctrl.h>
#include "lib/config.h"
-#include "lib/sound_processor.h"
#include "lib/ffmpeg_content.h"
-#include "audio_dialog.h"
+#include "lib/cinema_sound_processor.h"
#include "audio_panel.h"
#include "audio_mapping_view.h"
#include "wx_util.h"
#include "gain_calculator_dialog.h"
-#include "film_editor.h"
+#include "content_panel.h"
+#include <wx/spinctrl.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
using std::vector;
using std::cout;
using std::string;
+using std::list;
+using std::pair;
using boost::dynamic_pointer_cast;
using boost::lexical_cast;
using boost::shared_ptr;
-AudioPanel::AudioPanel (FilmEditor* e)
- : FilmEditorPanel (e, _("Audio"))
- , _audio_dialog (0)
+AudioPanel::AudioPanel (ContentPanel* p)
+ : ContentSubPanel (p, _("Audio"))
{
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, 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)
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),
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));
- _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));
- ++r;
-
_mapping = new AudioMappingView (this);
_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
+ ++r;
+
+ _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize);
+ _sizer->Add (_description, 0, wxALL, 12);
+ wxFont font = _description->GetFont();
+ font.SetStyle (wxFONTSTYLE_ITALIC);
+ font.SetPointSize (font.GetPointSize() - 1);
+ _description->SetFont (font);
+ ++r;
_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));
- _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));
+ _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
- _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
+ _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
}
{
switch (property) {
case Film::AUDIO_CHANNELS:
- _mapping->set_channels (_editor->film()->audio_channels ());
- _sizer->Layout ();
+ case Film::AUDIO_PROCESSOR:
+ _mapping->set_output_channels (_parent->film()->audio_output_names ());
+ break;
+ case Film::VIDEO_FRAME_RATE:
+ setup_description ();
break;
default:
break;
void
AudioPanel::film_content_changed (int property)
{
- 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 (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 ((*i)->identifier ())));
- }
-
- if (fcs->audio_stream()) {
- checked_set (_stream, fcs->audio_stream()->identifier ());
- setup_stream_description ();
- }
+ if (property == AudioContentProperty::AUDIO_STREAMS) {
+ AudioContentList ac = _parent->selected_audio ();
+ if (ac.size() == 1) {
+ _mapping->set (ac.front()->audio_mapping());
+ _mapping->set_input_channels (ac.front()->audio_channel_names ());
+ } else {
+ _mapping->set (AudioMapping ());
}
+ setup_description ();
+ _sizer->Layout ();
}
}
AudioPanel::gain_calculate_button_clicked ()
{
GainCalculatorDialog* d = new GainCalculatorDialog (this);
- d->ShowModal ();
+ int const r = d->ShowModal ();
- if (d->wanted_fader() == 0 || d->actual_fader() == 0) {
+ if (r == wxID_CANCEL || d->wanted_fader() == 0 || d->actual_fader() == 0) {
d->Destroy ();
return;
}
_gain->wrapped()->SetValue (
- Config::instance()->sound_processor()->db_for_fader_change (
+ Config::instance()->cinema_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.
*/
- _gain->update_from_model ();
+ _gain->view_changed ();
d->Destroy ();
}
void
-AudioPanel::show_clicked ()
-{
- if (_audio_dialog) {
- _audio_dialog->Destroy ();
- _audio_dialog = 0;
- }
-
- AudioContentList ac = _editor->selected_audio_content ();
- if (ac.size() != 1) {
- return;
- }
-
- _audio_dialog = new AudioDialog (this);
- _audio_dialog->Show ();
- _audio_dialog->set_content (ac.front ());
-}
-
-void
-AudioPanel::stream_changed ()
+AudioPanel::setup_description ()
{
- FFmpegContentList fc = _editor->selected_ffmpeg_content ();
- if (fc.size() != 1) {
+ AudioContentList ac = _parent->selected_audio ();
+ if (ac.size () != 1) {
+ checked_set (_description, wxT (""));
return;
}
- shared_ptr<FFmpegContent> fcs = fc.front ();
-
- if (_stream->GetSelection() == -1) {
- return;
- }
-
- 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() && (*i)->identifier () != s) {
- ++i;
- }
-
- if (i != a.end ()) {
- fcs->set_audio_stream (*i);
- }
-
- setup_stream_description ();
-}
-
-void
-AudioPanel::setup_stream_description ()
-{
- FFmpegContentList fc = _editor->selected_ffmpeg_content ();
- if (fc.size() != 1) {
- _description->SetLabel ("");
- return;
- }
-
- shared_ptr<FFmpegContent> fcs = fc.front ();
-
- if (!fcs->audio_stream ()) {
- _description->SetLabel (wxT (""));
- } else {
- wxString s;
- if (fcs->audio_channels() == 1) {
- s << _("1 channel");
- } else {
- s << fcs->audio_channels() << wxT (" ") << _("channels");
- }
- s << wxT (", ") << fcs->content_audio_frame_rate() << _("Hz");
- _description->SetLabel (s);
- }
+ checked_set (_description, ac.front()->processing_description ());
}
void
AudioPanel::mapping_changed (AudioMapping m)
{
- AudioContentList c = _editor->selected_audio_content ();
+ AudioContentList c = _parent->selected_audio ();
if (c.size() == 1) {
c.front()->set_audio_mapping (m);
}
void
AudioPanel::content_selection_changed ()
{
- AudioContentList sel = _editor->selected_audio_content ();
+ AudioContentList sel = _parent->selected_audio ();
- 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);
+ _gain_calculate_button->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);
+ film_content_changed (AudioContentProperty::AUDIO_STREAMS);
}
projects / dcpomatic.git / blobdiff