/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <libcxml/cxml.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
+#include "sndfile_examiner.h"
+#include "audio_content.h"
#include "film.h"
#include "compose.hpp"
#include "job.h"
#include "util.h"
+#include "safe_stringstream.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
#include "i18n.h"
using std::string;
-using std::stringstream;
using std::cout;
+using std::vector;
using boost::shared_ptr;
-using boost::lexical_cast;
-
-SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
- , AudioContent (f, p)
- , _audio_channels (0)
- , _audio_length (0)
- , _audio_frame_rate (0)
+
+SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::path p)
+ : Content (film, p)
+{
+ audio.reset (new AudioContent (this, film));
+}
+
+SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+ : Content (film, node)
+ , _audio_length (node->number_child<Frame> ("AudioLength"))
{
+ audio = AudioContent::from_xml (this, film, node);
+ if (audio) {
+ audio->set_stream (
+ AudioStreamPtr (
+ new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
+ );
+ }
}
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
- : Content (f, node)
- , AudioContent (f, node)
- , _audio_mapping (node->node_child ("AudioMapping"), version)
+void
+SndfileContent::as_xml (xmlpp::Node* node) const
{
- _audio_channels = node->number_child<int> ("AudioChannels");
- _audio_length = ContentTime (node->number_child<int64_t> ("AudioLength"));
- _audio_frame_rate = node->number_child<int> ("AudioFrameRate");
+ node->add_child("Type")->add_child_text ("Sndfile");
+
+ Content::as_xml (node);
+
+ if (audio) {
+ audio->as_xml (node);
+ node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate ()));
+ audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+ }
+
+ node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
}
+
string
SndfileContent::summary () const
{
SndfileContent::technical_summary () const
{
return Content::technical_summary() + " - "
- + AudioContent::technical_summary ()
+ + audio->technical_summary ()
+ " - sndfile";
}
-string
-SndfileContent::information () const
-{
- if (_audio_frame_rate == 0) {
- return "";
- }
-
- stringstream s;
-
- s << String::compose (
- _("%1 channels, %2kHz, %3 samples"),
- audio_channels(),
- content_audio_frame_rate() / 1000.0,
- audio_length().frames (content_audio_frame_rate ())
- );
-
- return s.str ();
-}
-
bool
SndfileContent::valid_file (boost::filesystem::path f)
{
/* XXX: more extensions */
string ext = f.extension().string();
transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
- return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
+ return (ext == ".wav" || ext == ".w64" || ext == ".flac" || ext == ".aif" || ext == ".aiff");
}
void
{
job->set_progress_unknown ();
Content::examine (job);
-
- SndfileDecoder dec (shared_from_this());
+ shared_ptr<AudioExaminer> ex (new SndfileExaminer (shared_from_this ()));
{
boost::mutex::scoped_lock lm (_mutex);
- _audio_channels = dec.audio_channels ();
- _audio_length = dec.audio_length ();
- _audio_frame_rate = dec.audio_frame_rate ();
+ AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_channels ()));
+ audio->set_stream (as);
+ AudioMapping m = as->mapping ();
+ film()->make_audio_mapping_default (m);
+ as->set_mapping (m);
+ _audio_length = ex->audio_length ();
}
- signal_changed (AudioContentProperty::AUDIO_CHANNELS);
- signal_changed (AudioContentProperty::AUDIO_LENGTH);
- signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
-
- {
- 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);
-}
-
-void
-SndfileContent::as_xml (xmlpp::Node* node) const
-{
- 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().get ()));
- node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
- _audio_mapping.as_xml (node->add_child("AudioMapping"));
+ signal_changed (AudioContentProperty::STREAMS);
}
DCPTime
SndfileContent::full_length () const
{
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
- return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
-}
-
-int
-SndfileContent::output_audio_frame_rate () const
-{
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
-
- return film->audio_frame_rate ();
-}
-
-void
-SndfileContent::set_audio_mapping (AudioMapping m)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _audio_mapping = m;
- }
-
- signal_changed (AudioContentProperty::AUDIO_MAPPING);
+ FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+ return DCPTime::from_frames (audio_length() / frc.speed_up, audio->stream()->frame_rate ());
}
projects / dcpomatic.git / blobdiff