projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a comment.
[dcpomatic.git]
/
src
/
lib
/
sndfile_content.cc
diff --git
a/src/lib/sndfile_content.cc
b/src/lib/sndfile_content.cc
index 2ca00cf6dc6c508812cc08feb9fd5365a8d5130c..ba3bd0a772d489714a01bebd7c90d56ab1b063e6 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,19
+18,21
@@
*/
#include <libcxml/cxml.h>
*/
#include <libcxml/cxml.h>
+#include <libdcp/raw_convert.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "film.h"
#include "compose.hpp"
#include "job.h"
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "film.h"
#include "compose.hpp"
#include "job.h"
+#include "util.h"
+#include "safe_stringstream.h"
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
-using std::stringstream;
using std::cout;
using boost::shared_ptr;
using std::cout;
using boost::shared_ptr;
-using
boost::lexical_cas
t;
+using
libdcp::raw_conver
t;
SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
@@
-42,10
+44,10
@@
SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::pat
}
}
-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 version
)
: Content (f, node)
, AudioContent (f, node)
: Content (f, node)
, AudioContent (f, node)
- , _audio_mapping (node->node_child ("AudioMapping"))
+ , _audio_mapping (node->node_child ("AudioMapping")
, version
)
{
_audio_channels = node->number_child<int> ("AudioChannels");
_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
{
_audio_channels = node->number_child<int> ("AudioChannels");
_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
@@
-56,7
+58,7
@@
string
SndfileContent::summary () const
{
/* Get the string() here so that the name does not have quotes around it */
SndfileContent::summary () const
{
/* Get the string() here so that the name does not have quotes around it */
- return String::compose (_("%1 [audio]"), path
().filename().string
());
+ return String::compose (_("%1 [audio]"), path
_summary
());
}
string
}
string
@@
-64,7
+66,7
@@
SndfileContent::technical_summary () const
{
return Content::technical_summary() + " - "
+ AudioContent::technical_summary ()
{
return Content::technical_summary() + " - "
+ AudioContent::technical_summary ()
- + "sndfile";
+ + "
-
sndfile";
}
string
}
string
@@
-74,7
+76,7
@@
SndfileContent::information () const
return "";
}
return "";
}
-
strings
tream s;
+
SafeStringS
tream s;
s << String::compose (
_("%1 channels, %2kHz, %3 samples"),
s << String::compose (
_("%1 channels, %2kHz, %3 samples"),
@@
-117,9
+119,13
@@
SndfileContent::examine (shared_ptr<Job> job)
signal_changed (AudioContentProperty::AUDIO_LENGTH);
signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
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);
}
signal_changed (AudioContentProperty::AUDIO_MAPPING);
}
@@
-129,28
+135,27
@@
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("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 (raw_convert<string> (audio_channels ()));
+ node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
+ node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (content_audio_frame_rate ()));
_audio_mapping.as_xml (node->add_child("AudioMapping"));
}
Time
_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->audio_frames_to_time (audio_length ());
-}
-int
-SndfileContent::output_audio_frame_rate () const
-{
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ FrameRateChange frc = film->active_frame_rate_change (position ());
+
+ OutputAudioFrame const len = divide_with_round (
+ audio_length() * output_audio_frame_rate() * frc.source,
+ content_audio_frame_rate() * film->video_frame_rate()
+ );
- return film->audio_frame
_rate (
);
+ return film->audio_frame
s_to_time (len
);
}
void
}
void