projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow content parts to not be preset in XML.
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index 09e7a0d12d1978812be8268b7991a59143d58854..e196e15c208e6573441c8c3de736c1d31089e4a3 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-34,23
+34,15
@@
class AudioContentProperty
{
public:
class AudioContentProperty
{
public:
-<<<<<<< 17dbd967c18aff2f3007eb86b5eee5b43f23bc4b
- static int const AUDIO_STREAMS;
- static int const AUDIO_GAIN;
- static int const AUDIO_DELAY;
- static int const AUDIO_VIDEO_FRAME_RATE;
-=======
static int const STREAMS;
static int const GAIN;
static int const DELAY;
static int const STREAMS;
static int const GAIN;
static int const DELAY;
->>>>>>> Rename video/audio/subtitle part methods.
};
class AudioContent : public ContentPart
{
public:
AudioContent (Content* parent, boost::shared_ptr<const Film>);
};
class AudioContent : public ContentPart
{
public:
AudioContent (Content* parent, boost::shared_ptr<const Film>);
- AudioContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
AudioContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
AudioContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
@@
-75,9
+67,6
@@
public:
return _delay;
}
return _delay;
}
- double audio_video_frame_rate () const;
- void set_audio_video_frame_rate (double r);
-
std::string processing_description () const;
std::vector<AudioStreamPtr> streams () const {
std::string processing_description () const;
std::vector<AudioStreamPtr> streams () const {
@@
-92,13
+81,16
@@
public:
void add_properties (std::list<UserProperty> &) const;
void add_properties (std::list<UserProperty> &) const;
+ static boost::shared_ptr<AudioContent> from_xml (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+
private:
private:
+ AudioContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+
/** Gain to apply to audio in dB */
double _gain;
/** Delay to apply to audio (positive moves audio later) in milliseconds */
int _delay;
/** Gain to apply to audio in dB */
double _gain;
/** Delay to apply to audio (positive moves audio later) in milliseconds */
int _delay;
- boost::optional<double> _video_frame_rate;
std::vector<AudioStreamPtr> _streams;
};
std::vector<AudioStreamPtr> _streams;
};