#include "audio_mapping_view.h"
#include "wx_util.h"
#include "gain_calculator_dialog.h"
-#include "film_editor.h"
+#include "content_panel.h"
using std::vector;
using std::cout;
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, 2), wxGBSpan (1, 2));
+ grid->Add (_stream, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
++r;
add_label_to_grid_bag_sizer (grid, this, _("Process with"), true, wxGBPosition (r, 0));
_processor = new wxChoice (this, wxID_ANY);
setup_processors ();
- grid->Add (_processor, wxGBPosition (r, 1));
+ grid->Add (_processor, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
++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);
_mapping->set_channels (_parent->film()->audio_channels ());
_sizer->Layout ();
break;
+ case Film::VIDEO_FRAME_RATE:
+ setup_description ();
+ break;
default:
break;
}
if (property == AudioContentProperty::AUDIO_MAPPING) {
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
_sizer->Layout ();
+ } else if (property == AudioContentProperty::AUDIO_FRAME_RATE) {
+ setup_description ();
} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
- setup_stream_description ();
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
_sizer->Layout ();
} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
if (fcs->audio_stream()) {
checked_set (_stream, fcs->audio_stream()->identifier ());
- setup_stream_description ();
}
}
} else if (property == AudioContentProperty::AUDIO_PROCESSOR) {
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;
}
if (i != a.end ()) {
fcs->set_audio_stream (*i);
}
-
- setup_stream_description ();
-}
-
-void
-AudioPanel::setup_stream_description ()
-{
- FFmpegContentList fc = _parent->selected_ffmpeg ();
- 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->audio_frame_rate() << _("Hz");
- _description->SetLabel (s);
- }
}
void
}
}
+void
+AudioPanel::setup_description ()
+{
+ AudioContentList ac = _parent->selected_audio ();
+ if (ac.size () != 1) {
+ _description->SetLabel ("");
+ return;
+ }
+
+ _description->SetLabel (std_to_wx (ac.front()->processing_description ()));
+}
+
void
AudioPanel::mapping_changed (AudioMapping m)
{
film_content_changed (AudioContentProperty::AUDIO_MAPPING);
film_content_changed (AudioContentProperty::AUDIO_PROCESSOR);
+ film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE);
film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
}