projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compiles; strange hang on adding content to a film.
[dcpomatic.git]
/
src
/
lib
/
sndfile_content.h
diff --git
a/src/lib/sndfile_content.h
b/src/lib/sndfile_content.h
index e8e86b60386bc505f7db64e8295181f9f9bca34c..0623aa6f054748f9f56cada8573b736a7ce30e79 100644
(file)
--- a/
src/lib/sndfile_content.h
+++ b/
src/lib/sndfile_content.h
@@
-41,6
+41,7
@@
public:
std::string information () const;
void as_xml (xmlpp::Node *) const;
boost::shared_ptr<Content> clone () const;
std::string information () const;
void as_xml (xmlpp::Node *) const;
boost::shared_ptr<Content> clone () const;
+ Time length (boost::shared_ptr<const Film>) const;
/* AudioContent */
int audio_channels () const {
/* AudioContent */
int audio_channels () const {
@@
-53,10
+54,12
@@
public:
return _audio_length;
}
return _audio_length;
}
- int audio_frame_rate () const {
+ int
content_
audio_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
return _audio_frame_rate;
}
boost::mutex::scoped_lock lm (_mutex);
return _audio_frame_rate;
}
+
+ int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
static bool valid_file (boost::filesystem::path);
static bool valid_file (boost::filesystem::path);