projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
sndfile_content.cc
diff --git
a/src/lib/sndfile_content.cc
b/src/lib/sndfile_content.cc
index 210ca15779980d6970d79eebf61d801ca973cdb7..37f2055359aa8a9d39dcced316a5476cd57bcec8 100644
(file)
--- a/
src/lib/sndfile_content.cc
+++ b/
src/lib/sndfile_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
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
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
@@
-18,10
+18,13
@@
*/
#include <libcxml/cxml.h>
*/
#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "sndfile_content.h"
#include "sndfile_decoder.h"
+#include "film.h"
#include "compose.hpp"
#include "job.h"
#include "compose.hpp"
#include "job.h"
+#include "util.h"
#include "i18n.h"
#include "i18n.h"
@@
-29,11
+32,11
@@
using std::string;
using std::stringstream;
using std::cout;
using boost::shared_ptr;
using std::stringstream;
using std::cout;
using boost::shared_ptr;
-using
boost::lexical_cas
t;
+using
dcp::raw_conver
t;
-SndfileContent::SndfileContent (
boost::filesystem::path f
)
- : Content (f)
- , AudioContent (f)
+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)
, _audio_channels (0)
, _audio_length (0)
, _audio_frame_rate (0)
@@
-41,19
+44,29
@@
SndfileContent::SndfileContent (boost::filesystem::path f)
}
}
-SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
- : Content (node)
- , AudioContent (node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
+ : Content (f, node)
+ , AudioContent (f, node)
+ , _audio_mapping (node->node_child ("AudioMapping"), version)
{
_audio_channels = node->number_child<int> ("AudioChannels");
{
_audio_channels = node->number_child<int> ("AudioChannels");
- _audio_length =
node->number_child<ContentAudioFrame> ("AudioLength"
);
+ _audio_length =
ContentTime (node->number_child<int64_t> ("AudioLength")
);
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
}
string
SndfileContent::summary () const
{
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
}
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_summary ());
+}
+
+string
+SndfileContent::technical_summary () const
+{
+ return Content::technical_summary() + " - "
+ + AudioContent::technical_summary ()
+ + " - sndfile";
}
string
}
string
@@
-68,8
+81,8
@@
SndfileContent::information () const
s << String::compose (
_("%1 channels, %2kHz, %3 samples"),
audio_channels(),
s << String::compose (
_("%1 channels, %2kHz, %3 samples"),
audio_channels(),
-
content_
audio_frame_rate() / 1000.0,
- audio_length()
+ audio_frame_rate() / 1000.0,
+ audio_length()
.frames (audio_frame_rate ())
);
return s.str ();
);
return s.str ();
@@
-84,19
+97,13
@@
SndfileContent::valid_file (boost::filesystem::path f)
return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
}
return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
}
-shared_ptr<Content>
-SndfileContent::clone () const
-{
- return shared_ptr<Content> (new SndfileContent (*this));
-}
-
void
void
-SndfileContent::examine (shared_ptr<
Film> film, shared_ptr<Job> job, bool quick
)
+SndfileContent::examine (shared_ptr<
Job> job
)
{
job->set_progress_unknown ();
{
job->set_progress_unknown ();
- Content::examine (
film, job, quick
);
+ Content::examine (
job
);
- SndfileDecoder dec (
film,
shared_from_this());
+ SndfileDecoder dec (shared_from_this());
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
@@
-108,6
+115,15
@@
SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
signal_changed (AudioContentProperty::AUDIO_CHANNELS);
signal_changed (AudioContentProperty::AUDIO_LENGTH);
signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
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
}
void
@@
-115,20
+131,29
@@
SndfileContent::as_xml (xmlpp::Node* node) const
{
node->add_child("Type")->add_child_text ("Sndfile");
Content::as_xml (node);
{
node->add_child("Type")->add_child_text ("Sndfile");
Content::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));
+ AudioContent::as_xml (node);
+
+ node->add_child("AudioChannels")->add_child_text (raw_convert<string> (audio_channels ()));
+ node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length().get ()));
+ node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio_frame_rate ()));
+ _audio_mapping.as_xml (node->add_child("AudioMapping"));
}
}
-int
-SndfileContent::
output_audio_frame_rate (shared_ptr<const Film>
) const
+DCPTime
+SndfileContent::
full_length (
) const
{
{
- /* Resample to a DCI-approved sample rate */
- return dcp_audio_frame_rate (content_audio_frame_rate ());
+ shared_ptr<const Film> film = _film.lock ();
+ assert (film);
+ return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
}
}
-Time
-SndfileContent::
length (shared_ptr<const Film> film) const
+void
+SndfileContent::
set_audio_mapping (AudioMapping m)
{
{
- return film->audio_frames_to_time (audio_length ());
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _audio_mapping = m;
+ }
+
+ AudioContent::set_audio_mapping (m);
}
}