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 7069499641933bbb266a21532d72f2a0ce977d77..cad5eb8e73704d2ba15bdf6d2b0a58210c112ade 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,6
+18,7
@@
*/
#include <libcxml/cxml.h>
*/
#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "film.h"
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "film.h"
@@
-31,7
+32,7
@@
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 (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)
@@
-43,13
+44,13
@@
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_channels = node->number_child<int> ("AudioChannels");
- _audio_length =
node->number_child<AudioContent::Frame> ("AudioLength"
);
+ _audio_length =
ContentTime (node->number_child<int64_t> ("AudioLength")
);
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
}
_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
}
@@
-80,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 ();
@@
-102,10
+103,7
@@
SndfileContent::examine (shared_ptr<Job> job)
job->set_progress_unknown ();
Content::examine (job);
job->set_progress_unknown ();
Content::examine (job);
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
-
- SndfileDecoder dec (film, shared_from_this());
+ SndfileDecoder dec (shared_from_this());
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
@@
-135,28
+133,18
@@
SndfileContent::as_xml (xmlpp::Node* node) const
Content::as_xml (node);
AudioContent::as_xml (node);
Content::as_xml (node);
AudioContent::as_xml (node);
- node->add_child("AudioChannels")->add_child_text (
lexical_cas
t<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 ()));
+ node->add_child("AudioChannels")->add_child_text (
raw_conver
t<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"));
}
_audio_mapping.as_xml (node->add_child("AudioMapping"));
}
-Time
+
DCP
Time
SndfileContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
SndfileContent::full_length () const
{
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);
-
- return film->audio_frame_rate ();
+ return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
}
void
}
void
@@
-167,5
+155,6
@@
SndfileContent::set_audio_mapping (AudioMapping m)
_audio_mapping = m;
}
_audio_mapping = m;
}
-
signal_changed (AudioContentProperty::AUDIO_MAPPING
);
+
AudioContent::set_audio_mapping (m
);
}
}
+