#include "film.h"
#include "frame_rate_change.h"
#include "maths_util.h"
+#include "video_content.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
int const AudioContentProperty::DELAY = 202;
int const AudioContentProperty::FADE_IN = 203;
int const AudioContentProperty::FADE_OUT = 204;
+int const AudioContentProperty::USE_SAME_FADES_AS_VIDEO = 205;
AudioContent::AudioContent (Content* parent)
_delay = node->number_child<int> ("AudioDelay");
_fade_in = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeIn").get_value_or(0));
_fade_out = ContentTime(node->optional_number_child<ContentTime::Type>("AudioFadeOut").get_value_or(0));
+ _use_same_fades_as_video = node->optional_bool_child("AudioUseSameFadesAsVideo").get_value_or(false);
/* Backwards compatibility */
auto r = node->optional_number_child<double>("AudioVideoFrameRate");
node->add_child("AudioDelay")->add_child_text(raw_convert<string>(_delay));
node->add_child("AudioFadeIn")->add_child_text(raw_convert<string>(_fade_in.get()));
node->add_child("AudioFadeOut")->add_child_text(raw_convert<string>(_fade_out.get()));
+ node->add_child("AudioUseSameFadesAsVideo")->add_child_text(_use_same_fades_as_video ? "1" : "0");
}
}
+ContentTime
+AudioContent::fade_in () const
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ if (_use_same_fades_as_video && _parent->video) {
+ return dcpomatic::ContentTime::from_frames(_parent->video->fade_in(), _parent->video_frame_rate().get_value_or(24));
+ }
+
+ return _fade_in;
+}
+
+
+ContentTime
+AudioContent::fade_out () const
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ if (_use_same_fades_as_video && _parent->video) {
+ return dcpomatic::ContentTime::from_frames(_parent->video->fade_out(), _parent->video_frame_rate().get_value_or(24));
+ }
+
+ return _fade_out;
+}
+
+
void
AudioContent::set_fade_in (ContentTime t)
{
}
+void
+AudioContent::set_use_same_fades_as_video (bool s)
+{
+ maybe_set (_use_same_fades_as_video, s, AudioContentProperty::USE_SAME_FADES_AS_VIDEO);
+}
+
+
vector<float>
AudioContent::fade (AudioStreamPtr stream, Frame frame, Frame length, int frame_rate) const
{
static int const DELAY;
static int const FADE_IN;
static int const FADE_OUT;
+ static int const USE_SAME_FADES_AS_VIDEO;
};
return _delay;
}
- dcpomatic::ContentTime fade_in () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _fade_in;
- }
-
- dcpomatic::ContentTime fade_out () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _fade_out;
- }
+ dcpomatic::ContentTime fade_in () const;
+ dcpomatic::ContentTime fade_out () const;
void set_fade_in (dcpomatic::ContentTime time);
void set_fade_out (dcpomatic::ContentTime time);
+ void set_use_same_fades_as_video (bool s);
std::string processing_description (std::shared_ptr<const Film> film) const;
int _delay = 0;
dcpomatic::ContentTime _fade_in;
dcpomatic::ContentTime _fade_out;
+ bool _use_same_fades_as_video = false;
std::vector<AudioStreamPtr> _streams;
};
_fade_out_label = create_label (this, _("Fade out"), true);
_fade_out = new Timecode<ContentTime> (this);
+ _use_same_fades_as_video = new wxCheckBox (this, wxID_ANY, _("Use same fades as video"));
+
_mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP"));
_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
_fade_in->Changed.connect (boost::bind(&AudioPanel::fade_in_changed, this));
_fade_out->Changed.connect (boost::bind(&AudioPanel::fade_out_changed, this));
+ _use_same_fades_as_video->Bind (wxEVT_CHECKBOX, boost::bind(&AudioPanel::use_same_fades_as_video_changed, this));
_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
_active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition(r, 0));
_grid->Add (_fade_out, wxGBPosition(r, 1), wxGBSpan(1, 3));
++r;
+
+ _grid->Add (_use_same_fades_as_video, wxGBPosition(r, 0), wxGBSpan(1, 4));
+ ++r;
}
} else {
_fade_out->clear ();
}
+ } else if (property == AudioContentProperty::USE_SAME_FADES_AS_VIDEO) {
+ setup_sensitivity ();
}
}
film_content_changed (AudioContentProperty::GAIN);
film_content_changed (AudioContentProperty::FADE_IN);
film_content_changed (AudioContentProperty::FADE_OUT);
+ film_content_changed (AudioContentProperty::USE_SAME_FADES_AS_VIDEO);
film_content_changed (DCPContentProperty::REFERENCE_AUDIO);
setup_sensitivity ();
auto const ref = _reference->GetValue();
auto const single = sel.size() == 1;
+ auto const all_have_video = std::all_of(sel.begin(), sel.end(), [](shared_ptr<const Content> c) { return static_cast<bool>(c->video); });
+
_gain->wrapped()->Enable (!ref);
_gain_calculate_button->Enable (!ref && single);
_show->Enable (single);
_delay->wrapped()->Enable (!ref);
_mapping->Enable (!ref && single);
_description->Enable (!ref && single);
+ _fade_in->Enable (!_use_same_fades_as_video->GetValue());
+ _fade_out->Enable (!_use_same_fades_as_video->GetValue());
+ _use_same_fades_as_video->Enable (!ref && all_have_video);
}
}
}
+
+void
+AudioPanel::use_same_fades_as_video_changed ()
+{
+ for (auto content: _parent->selected_audio()) {
+ content->audio->set_use_same_fades_as_video(_use_same_fades_as_video->GetValue());
+ }
+}
+
boost::optional<float> peak () const;
void fade_in_changed ();
void fade_out_changed ();
+ void use_same_fades_as_video_changed ();
wxCheckBox* _reference;
wxStaticText* _reference_note;
Timecode<dcpomatic::ContentTime>* _fade_in;
wxStaticText* _fade_out_label;
Timecode<dcpomatic::ContentTime>* _fade_out;
+ wxCheckBox* _use_same_fades_as_video;
AudioMappingView* _mapping;
wxStaticText* _description;
AudioDialog* _audio_dialog = nullptr;
#include "lib/audio_content.h"
#include "lib/content_factory.h"
#include "lib/maths_util.h"
+#include "lib/video_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
}
+
+BOOST_AUTO_TEST_CASE (audio_content_fades_same_as_video)
+{
+ auto content = content_factory("test/data/staircase.mov").front();
+ auto film = new_test_film2("audio_content_fades_same_as_video", { content });
+
+ content->audio->set_use_same_fades_as_video(true);
+ content->video->set_fade_in(9);
+ content->video->set_fade_out(81);
+
+ BOOST_CHECK(content->audio->fade_in() == dcpomatic::ContentTime::from_frames(9 * 48000 / 24, 48000));
+ BOOST_CHECK(content->audio->fade_out() == dcpomatic::ContentTime::from_frames(81 * 48000 / 24, 48000));
+}
+