projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Time -> DCPTime.
[dcpomatic.git]
/
src
/
lib
/
sndfile_content.h
diff --git
a/src/lib/sndfile_content.h
b/src/lib/sndfile_content.h
index e8e86b60386bc505f7db64e8295181f9f9bca34c..c88764c1b22808e953d696d55f3cc50d2ce017de 100644
(file)
--- a/
src/lib/sndfile_content.h
+++ b/
src/lib/sndfile_content.h
@@
-17,6
+17,9
@@
*/
*/
+#ifndef DCPOMATIC_SNDFILE_CONTENT_H
+#define DCPOMATIC_SNDFILE_CONTENT_H
+
extern "C" {
#include <libavutil/audioconvert.h>
}
extern "C" {
#include <libavutil/audioconvert.h>
}
@@
-29,39
+32,52
@@
namespace cxml {
class SndfileContent : public AudioContent
{
public:
class SndfileContent : public AudioContent
{
public:
- SndfileContent (boost::filesystem::path);
- SndfileContent (boost::shared_ptr<const
cxml::Node>
);
+ SndfileContent (boost::
shared_ptr<const Film>, boost::
filesystem::path);
+ SndfileContent (boost::shared_ptr<const
Film>, boost::shared_ptr<const cxml::Node>, int
);
boost::shared_ptr<SndfileContent> shared_from_this () {
return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
}
boost::shared_ptr<SndfileContent> shared_from_this () {
return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
}
- void examine (boost::shared_ptr<
Film>, boost::shared_ptr<Job>, bool
);
+ void examine (boost::shared_ptr<
Job>
);
std::string summary () const;
std::string summary () const;
+ std::string technical_summary () const;
std::string information () const;
void as_xml (xmlpp::Node *) const;
std::string information () const;
void as_xml (xmlpp::Node *) const;
-
boost::shared_ptr<Content> clone
() const;
+
DCPTime full_length
() const;
-
/* AudioContent */
-
int audio_channels () const {
+ /* AudioContent */
+ int audio_channels () const {
boost::mutex::scoped_lock lm (_mutex);
return _audio_channels;
}
boost::mutex::scoped_lock lm (_mutex);
return _audio_channels;
}
-
ContentAudio
Frame audio_length () const {
+
AudioContent::
Frame audio_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _audio_length;
}
boost::mutex::scoped_lock lm (_mutex);
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 () const;
+
+ AudioMapping audio_mapping () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _audio_mapping;
+ }
+
+ void set_audio_mapping (AudioMapping);
static bool valid_file (boost::filesystem::path);
private:
int _audio_channels;
static bool valid_file (boost::filesystem::path);
private:
int _audio_channels;
-
ContentAudio
Frame _audio_length;
+
AudioContent::
Frame _audio_length;
int _audio_frame_rate;
int _audio_frame_rate;
+ AudioMapping _audio_mapping;
};
};
+
+#endif