#include <libcxml/cxml.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
+#include "film.h"
#include "compose.hpp"
#include "job.h"
SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
: Content (f, node)
, AudioContent (f, node)
+ , _audio_mapping (node->node_child ("AudioMapping"))
{
_audio_channels = node->number_child<int> ("AudioChannels");
_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
- _audio_mapping = AudioMapping (node->node_child ("AudioMapping"));
}
string
SndfileContent::summary () const
{
- return String::compose (_("Sound file: %1"), file().filename().string());
+ /* Get the string() here so that the name does not have quotes around it */
+ return String::compose (_("%1 [audio]"), path().filename().string());
+}
+
+string
+SndfileContent::technical_summary () const
+{
+ return Content::technical_summary() + " - "
+ + AudioContent::technical_summary ()
+ + " - sndfile";
}
string
return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
}
-shared_ptr<Content>
-SndfileContent::clone () const
-{
- return shared_ptr<Content> (new SndfileContent (*this));
-}
-
void
SndfileContent::examine (shared_ptr<Job> job)
{
signal_changed (AudioContentProperty::AUDIO_LENGTH);
signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
- /* XXX: do this in signal_changed...? */
- _audio_mapping = AudioMapping (_audio_channels);
+ {
+ 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);
shared_ptr<const Film> film = _film.lock ();
assert (film);
- return film->dcp_audio_frame_rate ();
+ return film->audio_frame_rate ();
}
void