*/
#include "audio_content.h"
-#include "analyse_audio_job.h"
-#include "job_manager.h"
#include "film.h"
#include "exceptions.h"
#include "config.h"
#include "frame_rate_change.h"
#include "raw_convert.h"
-#include "playlist.h"
+#include "compose.hpp"
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
+#include <iostream>
#include "i18n.h"
int const AudioContentProperty::AUDIO_GAIN = 201;
int const AudioContentProperty::AUDIO_DELAY = 202;
-AudioContent::AudioContent (shared_ptr<const Film> f)
- : Content (f)
+AudioContent::AudioContent (shared_ptr<const Film> film)
+ : Content (film)
, _audio_gain (0)
, _audio_delay (Config::instance()->default_audio_delay ())
{
}
-AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
- : Content (f, s)
+AudioContent::AudioContent (shared_ptr<const Film> film, DCPTime s)
+ : Content (film, s)
, _audio_gain (0)
, _audio_delay (Config::instance()->default_audio_delay ())
{
}
-AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
+AudioContent::AudioContent (shared_ptr<const Film> film, boost::filesystem::path p)
+ : Content (film, p)
, _audio_gain (0)
, _audio_delay (Config::instance()->default_audio_delay ())
{
}
-AudioContent::AudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node)
- : Content (f, node)
+AudioContent::AudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node)
+ : Content (film, node)
{
_audio_gain = node->number_child<float> ("AudioGain");
_audio_delay = node->number_child<int> ("AudioDelay");
}
-AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : Content (f, c)
+AudioContent::AudioContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+ : Content (film, c)
{
shared_ptr<AudioContent> ref = dynamic_pointer_cast<AudioContent> (c[0]);
DCPOMATIC_ASSERT (ref);
-
+
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c[i]);
boost::mutex::scoped_lock lm (_mutex);
_audio_gain = g;
}
-
+
signal_changed (AudioContentProperty::AUDIO_GAIN);
}
boost::mutex::scoped_lock lm (_mutex);
_audio_delay = d;
}
-
+
signal_changed (AudioContentProperty::AUDIO_DELAY);
}
}
i->set_mapping (stream_mapping);
}
-
+
signal_changed (AudioContentProperty::AUDIO_STREAMS);
}
BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
channels += i->channels ();
}
-
+
AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS);
-
+
int c = 0;
int s = 0;
BOOST_FOREACH (AudioStreamPtr i, audio_streams ()) {
{
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
-
+
/* Resample to a DCI-approved sample rate */
double t = has_rate_above_48k() ? 96000 : 48000;
t /= frc.speed_up;
}
- return rint (t);
+ return lrint (t);
}
string