projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and general tidying.
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index 83a5e327e87c02c0da9f98d987269bd858e72f6d..963f759e82fd68e260ab5a7f7f4d16566573cf82 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,17
+18,21
@@
*/
*/
+
/** @file src/lib/audio_content.h
* @brief AudioContent and AudioContentProperty classes.
*/
/** @file src/lib/audio_content.h
* @brief AudioContent and AudioContentProperty classes.
*/
+
#ifndef DCPOMATIC_AUDIO_CONTENT_H
#define DCPOMATIC_AUDIO_CONTENT_H
#ifndef DCPOMATIC_AUDIO_CONTENT_H
#define DCPOMATIC_AUDIO_CONTENT_H
+
#include "content_part.h"
#include "audio_stream.h"
#include "audio_mapping.h"
#include "content_part.h"
#include "audio_stream.h"
#include "audio_mapping.h"
+
/** @class AudioContentProperty
* @brief Names for properties of AudioContent.
*/
/** @class AudioContentProperty
* @brief Names for properties of AudioContent.
*/
@@
-40,11
+44,13
@@
public:
static int const DELAY;
};
static int const DELAY;
};
+
class AudioContent : public ContentPart
{
public:
explicit AudioContent (Content* parent);
class AudioContent : public ContentPart
{
public:
explicit AudioContent (Content* parent);
- AudioContent (Content* parent, std::vector<std::shared_ptr<Content> >);
+ AudioContent (Content* parent, std::vector<std::shared_ptr<Content>>);
+ AudioContent (Content* parent, cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *) const;
std::string technical_summary () const;
@@
-55,7
+61,10
@@
public:
int resampled_frame_rate (std::shared_ptr<const Film> film) const;
std::vector<NamedChannel> channel_names () const;
int resampled_frame_rate (std::shared_ptr<const Film> film) const;
std::vector<NamedChannel> channel_names () const;
- void set_gain (double);
+ /** Set gain in dB.
+ * @param double g New gain in dB.
+ */
+ void set_gain (double g);
void set_delay (int);
double gain () const {
void set_delay (int);
double gain () const {
@@
-89,12
+98,10
@@
public:
private:
private:
- AudioContent (Content* parent, cxml::ConstNodePtr);
-
/** Gain to apply to audio in dB */
/** Gain to apply to audio in dB */
- double _gain;
+ double _gain
= 0
;
/** Delay to apply to audio (positive moves audio later) in milliseconds */
/** Delay to apply to audio (positive moves audio later) in milliseconds */
- int _delay;
+ int _delay
= 0
;
std::vector<AudioStreamPtr> _streams;
};
std::vector<AudioStreamPtr> _streams;
};