projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const correctness for AudioMerger.
[dcpomatic.git]
/
src
/
lib
/
audio_merger.h
diff --git
a/src/lib/audio_merger.h
b/src/lib/audio_merger.h
index adaf72f8189acd7cd22a228e8a0d8cb99f2878e5..0201fcd4bfd433b57d82ba741e9d699bc6e6faf9 100644
(file)
--- a/
src/lib/audio_merger.h
+++ b/
src/lib/audio_merger.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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
@@
-17,14
+17,17
@@
*/
*/
+
/** @file src/audio_merger.h
* @brief AudioMerger class.
*/
/** @file src/audio_merger.h
* @brief AudioMerger class.
*/
+
#include "audio_buffers.h"
#include "dcpomatic_time.h"
#include "util.h"
#include "audio_buffers.h"
#include "dcpomatic_time.h"
#include "util.h"
+
/** @class AudioMerger.
* @brief A class that can merge audio data from many sources.
*/
/** @class AudioMerger.
* @brief A class that can merge audio data from many sources.
*/
@@
-33,7
+36,7
@@
class AudioMerger
public:
explicit AudioMerger (int frame_rate);
public:
explicit AudioMerger (int frame_rate);
- std::list<std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime>
> pull (dcpomatic::DCPTime time);
+ std::list<std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime>> pull (dcpomatic::DCPTime time);
void push (std::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time);
void clear ();
void push (std::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time);
void clear ();
@@
-49,7
+52,7
@@
private:
* @param r Frame rate.
*/
Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r)
* @param r Frame rate.
*/
Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r)
- : audio (
new AudioBuffers
(c, f))
+ : audio (
std::make_shared<AudioBuffers>
(c, f))
, time (t)
, frame_rate (r)
{}
, time (t)
, frame_rate (r)
{}
@@
-69,15
+72,6
@@
private:
}
};
}
};
- class BufferComparator
- {
- public:
- bool operator() (AudioMerger::Buffer const & a, AudioMerger::Buffer const & b)
- {
- return a.time < b.time;
- }
- };
-
std::list<Buffer> _buffers;
std::list<Buffer> _buffers;
- int _frame_rate;
+ int
const
_frame_rate;
};
};