projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1 crash on low memory.
[dcpomatic.git]
/
src
/
lib
/
audio_content.cc
diff --git
a/src/lib/audio_content.cc
b/src/lib/audio_content.cc
index e93f348f42359aab632c3d9738c6689200a4a9cf..b4c4f34b6f064aaa71e822869728e266c488bdf0 100644
(file)
--- a/
src/lib/audio_content.cc
+++ b/
src/lib/audio_content.cc
@@
-22,8
+22,13
@@
#include "analyse_audio_job.h"
#include "job_manager.h"
#include "film.h"
#include "analyse_audio_job.h"
#include "job_manager.h"
#include "film.h"
+#include "exceptions.h"
+#include "config.h"
+
+#include "i18n.h"
using std::string;
using std::string;
+using std::vector;
using boost::shared_ptr;
using boost::lexical_cast;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::lexical_cast;
using boost::dynamic_pointer_cast;
@@
-38,7
+43,7
@@
int const AudioContentProperty::AUDIO_MAPPING = 205;
AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
: Content (f, s)
, _audio_gain (0)
AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
: Content (f, s)
, _audio_gain (0)
- , _audio_delay (
0
)
+ , _audio_delay (
Config::instance()->default_audio_delay ()
)
{
}
{
}
@@
-46,7
+51,7
@@
AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
, _audio_gain (0)
AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
, _audio_gain (0)
- , _audio_delay (
0
)
+ , _audio_delay (
Config::instance()->default_audio_delay ()
)
{
}
{
}
@@
-54,21
+59,39
@@
AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
: Content (f, node)
{
AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
: Content (f, node)
{
+ LocaleGuard lg;
+
_audio_gain = node->number_child<float> ("AudioGain");
_audio_delay = node->number_child<int> ("AudioDelay");
}
_audio_gain = node->number_child<float> ("AudioGain");
_audio_delay = node->number_child<int> ("AudioDelay");
}
-AudioContent::AudioContent (AudioContent const & o)
- : Content (o)
- , _audio_gain (o._audio_gain)
- , _audio_delay (o._audio_delay)
+AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+ : Content (f, c)
{
{
+ shared_ptr<AudioContent> ref = dynamic_pointer_cast<AudioContent> (c[0]);
+ assert (ref);
+
+ for (size_t i = 0; i < c.size(); ++i) {
+ shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c[i]);
+
+ if (ac->audio_gain() != ref->audio_gain()) {
+ throw JoinError (_("Content to be joined must have the same audio gain."));
+ }
+ if (ac->audio_delay() != ref->audio_delay()) {
+ throw JoinError (_("Content to be joined must have the same audio delay."));
+ }
+ }
+
+ _audio_gain = ref->audio_gain ();
+ _audio_delay = ref->audio_delay ();
}
void
AudioContent::as_xml (xmlpp::Node* node) const
{
}
void
AudioContent::as_xml (xmlpp::Node* node) const
{
+ LocaleGuard lg;
+
boost::mutex::scoped_lock lm (_mutex);
node->add_child("AudioGain")->add_child_text (lexical_cast<string> (_audio_gain));
node->add_child("AudioDelay")->add_child_text (lexical_cast<string> (_audio_delay));
boost::mutex::scoped_lock lm (_mutex);
node->add_child("AudioGain")->add_child_text (lexical_cast<string> (_audio_gain));
node->add_child("AudioDelay")->add_child_text (lexical_cast<string> (_audio_delay));
@@
-97,17
+120,17
@@
AudioContent::set_audio_delay (int d)
signal_changed (AudioContentProperty::AUDIO_DELAY);
}
signal_changed (AudioContentProperty::AUDIO_DELAY);
}
-void
+boost::signals2::connection
AudioContent::analyse_audio (boost::function<void()> finished)
{
shared_ptr<const Film> film = _film.lock ();
AudioContent::analyse_audio (boost::function<void()> finished)
{
shared_ptr<const Film> film = _film.lock ();
- if (!film) {
- return;
- }
+ assert (film);
shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
- job->Finished.connect (finished);
+
boost::signals2::connection c =
job->Finished.connect (finished);
JobManager::instance()->add (job);
JobManager::instance()->add (job);
+
+ return c;
}
boost::filesystem::path
}
boost::filesystem::path
@@
-120,3
+143,9
@@
AudioContent::audio_analysis_path () const
return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
}
return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
}
+
+string
+AudioContent::technical_summary () const
+{
+ return String::compose ("audio: channels %1, length %2, raw rate %3, out rate %4", audio_channels(), audio_length(), content_audio_frame_rate(), output_audio_frame_rate());
+}