#include <libcxml/cxml.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
+#include "film.h"
#include "compose.hpp"
#include "job.h"
+#include "util.h"
#include "i18n.h"
}
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int)
: Content (f, node)
, AudioContent (f, node)
, _audio_mapping (node->node_child ("AudioMapping"))
string
SndfileContent::summary () const
{
- return String::compose (_("%1 [audio]"), file().filename().string());
+ /* Get the string() here so that the name does not have quotes around it */
+ return String::compose (_("%1 [audio]"), path_summary ());
+}
+
+string
+SndfileContent::technical_summary () const
+{
+ return Content::technical_summary() + " - "
+ + AudioContent::technical_summary ()
+ + " - sndfile";
}
string
signal_changed (AudioContentProperty::AUDIO_LENGTH);
signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
- /* XXX: do this in signal_changed...? */
- _audio_mapping = AudioMapping (_audio_channels);
- _audio_mapping.make_default ();
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ /* XXX: do this in signal_changed...? */
+ _audio_mapping = AudioMapping (_audio_channels);
+ _audio_mapping.make_default ();
+ }
+
signal_changed (AudioContentProperty::AUDIO_MAPPING);
}
node->add_child("Type")->add_child_text ("Sndfile");
Content::as_xml (node);
AudioContent::as_xml (node);
- node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
- node->add_child("AudioLength")->add_child_text (lexical_cast<string> (_audio_length));
- node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
+
+ node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (audio_channels ()));
+ node->add_child("AudioLength")->add_child_text (lexical_cast<string> (audio_length ()));
+ node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
_audio_mapping.as_xml (node->add_child("AudioMapping"));
}
Time
-SndfileContent::length () const
+SndfileContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
+
+ OutputAudioFrame const len = audio_length() * output_audio_frame_rate() / content_audio_frame_rate ();
+
+ /* XXX: this depends on whether, alongside this audio, we are running video slower or faster than
+ it should be. The calculation above works out the output audio frames assuming that we are just
+ resampling the audio: it would be incomplete if, for example, we were running this audio alongside
+ 25fps video that was being run at 24fps.
+ */
- return film->audio_frames_to_time (audio_length ());
+ return film->audio_frames_to_time (len);
}
int
shared_ptr<const Film> film = _film.lock ();
assert (film);
- return film->dcp_audio_frame_rate ();
+ return film->audio_frame_rate ();
}
void