/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "content_panel.h"
#include "audio_dialog.h"
#include "lib/config.h"
+#include "lib/ffmpeg_audio_stream.h"
#include "lib/ffmpeg_content.h"
#include "lib/cinema_sound_processor.h"
#include "lib/job_manager.h"
#include "lib/dcp_content.h"
+#include "lib/audio_content.h"
#include <wx/spinctrl.h>
-#include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp>
#include <iostream>
using std::list;
using std::pair;
using boost::dynamic_pointer_cast;
-using boost::lexical_cast;
using boost::shared_ptr;
using boost::optional;
grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
- s->Add (_show);
- _peak = new wxStaticText (this, wxID_ANY, wxT (""));
- s->Add (_peak, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
- ++r;
- }
+ _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
+ grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2));
+ _peak = new wxStaticText (this, wxID_ANY, wxT (""));
+ grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
+ ++r;
add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
_gain = new ContentSpinCtrlDouble<AudioContent> (
this,
new wxSpinCtrlDouble (this),
- AudioContentProperty::AUDIO_GAIN,
- boost::mem_fn (&AudioContent::audio_gain),
- boost::mem_fn (&AudioContent::set_audio_gain)
+ AudioContentProperty::GAIN,
+ &Content::audio,
+ boost::mem_fn (&AudioContent::gain),
+ boost::mem_fn (&AudioContent::set_gain)
);
_gain->add (grid, wxGBPosition (r, 1));
_delay = new ContentSpinCtrl<AudioContent> (
this,
new wxSpinCtrl (this),
- AudioContentProperty::AUDIO_DELAY,
- boost::mem_fn (&AudioContent::audio_delay),
- boost::mem_fn (&AudioContent::set_audio_delay)
+ AudioContentProperty::DELAY,
+ &Content::audio,
+ boost::mem_fn (&AudioContent::delay),
+ boost::mem_fn (&AudioContent::set_delay)
);
_delay->add (grid, wxGBPosition (r, 1));
void
AudioPanel::film_content_changed (int property)
{
- AudioContentList ac = _parent->selected_audio ();
- if (property == AudioContentProperty::AUDIO_STREAMS) {
+ ContentList ac = _parent->selected_audio ();
+ if (property == AudioContentProperty::STREAMS) {
if (ac.size() == 1) {
- _mapping->set (ac.front()->audio_mapping());
- _mapping->set_input_channels (ac.front()->audio_channel_names ());
+ _mapping->set (ac.front()->audio->mapping());
+ _mapping->set_input_channels (ac.front()->audio->channel_names ());
+
+ vector<AudioMappingView::Group> groups;
+ int c = 0;
+ BOOST_FOREACH (shared_ptr<const AudioStream> i, ac.front()->audio->streams()) {
+ shared_ptr<const FFmpegAudioStream> f = dynamic_pointer_cast<const FFmpegAudioStream> (i);
+ string name = "";
+ if (f) {
+ name = f->name;
+ if (f->codec_name) {
+ name += " (" + f->codec_name.get() + ")";
+ }
+ }
+ groups.push_back (AudioMappingView::Group (c, c + i->channels() - 1, name));
+ c += i->channels ();
+ }
+ _mapping->set_input_groups (groups);
+
} else {
_mapping->set (AudioMapping ());
}
setup_description ();
setup_peak ();
_sizer->Layout ();
- } else if (property == AudioContentProperty::AUDIO_GAIN) {
+ } else if (property == AudioContentProperty::GAIN) {
setup_peak ();
} else if (property == DCPContentProperty::REFERENCE_AUDIO) {
if (ac.size() == 1) {
}
setup_sensitivity ();
+ } else if (property == ContentProperty::VIDEO_FRAME_RATE) {
+ setup_description ();
}
}
void
AudioPanel::setup_description ()
{
- AudioContentList ac = _parent->selected_audio ();
+ ContentList ac = _parent->selected_audio ();
if (ac.size () != 1) {
checked_set (_description, wxT (""));
return;
}
- checked_set (_description, ac.front()->processing_description ());
+ checked_set (_description, ac.front()->audio->processing_description ());
}
void
AudioPanel::mapping_changed (AudioMapping m)
{
- AudioContentList c = _parent->selected_audio ();
+ ContentList c = _parent->selected_audio ();
if (c.size() == 1) {
- c.front()->set_audio_mapping (m);
+ c.front()->audio->set_mapping (m);
}
}
void
AudioPanel::content_selection_changed ()
{
- AudioContentList sel = _parent->selected_audio ();
+ ContentList sel = _parent->selected_audio ();
_gain->set_content (sel);
_delay->set_content (sel);
- film_content_changed (AudioContentProperty::AUDIO_STREAMS);
+ film_content_changed (AudioContentProperty::STREAMS);
film_content_changed (DCPContentProperty::REFERENCE_AUDIO);
setup_sensitivity ();
void
AudioPanel::setup_sensitivity ()
{
- AudioContentList sel = _parent->selected_audio ();
+ ContentList sel = _parent->selected_audio ();
shared_ptr<DCPContent> dcp;
if (sel.size() == 1) {
list<string> why_not;
bool const can_reference = dcp && dcp->can_reference_audio (why_not);
- _reference->Enable (can_reference);
-
- wxString s;
- if (!can_reference) {
- s = _("Cannot reference this DCP. ");
- BOOST_FOREACH (string i, why_not) {
- s += std_to_wx(i) + wxT(" ");
- }
- }
- _reference->SetToolTip (s);
+ setup_refer_button (_reference, dcp, can_reference, why_not);
if (_reference->GetValue ()) {
_gain->wrapped()->Enable (false);
_audio_dialog = 0;
}
- AudioContentList ac = _parent->selected_audio ();
+ ContentList ac = _parent->selected_audio ();
if (ac.size() != 1) {
return;
}
void
AudioPanel::setup_peak ()
{
- AudioContentList sel = _parent->selected_audio ();
+ ContentList sel = _parent->selected_audio ();
bool alert = false;
if (sel.size() != 1) {
playlist->add (sel.front ());
try {
shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
- if (analysis->peak ()) {
- float const peak_dB = 20 * log10 (analysis->peak().get()) + analysis->gain_correction (playlist);
+ if (analysis->sample_peak ()) {
+ float const peak_dB = 20 * log10 (analysis->sample_peak().get()) + analysis->gain_correction (playlist);
if (peak_dB > -3) {
alert = true;
}
d->set_reference_audio (_reference->GetValue ());
}
+
+void
+AudioPanel::set_film (shared_ptr<Film>)
+{
+ /* We are changing film, so destroy any audio dialog for the old one */
+ if (_audio_dialog) {
+ _audio_dialog->Destroy ();
+ _audio_dialog = 0;
+ }
+}
projects / dcpomatic.git / blobdiff