projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup variable name: j -> dcp
[dcpomatic.git]
/
src
/
lib
/
audio_stream.h
diff --git
a/src/lib/audio_stream.h
b/src/lib/audio_stream.h
index 8d05df268bca62e33b654114bd73ad60659dde83..470d9c854a5acf34b1e91f4053560af4babff69e 100644
(file)
--- a/
src/lib/audio_stream.h
+++ b/
src/lib/audio_stream.h
@@
-1,35
+1,40
@@
/*
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015
-2021
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
#ifndef DCPOMATIC_AUDIO_STREAM_H
#define DCPOMATIC_AUDIO_STREAM_H
#ifndef DCPOMATIC_AUDIO_STREAM_H
#define DCPOMATIC_AUDIO_STREAM_H
+
#include "audio_mapping.h"
#include "audio_mapping.h"
+#include "types.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+
struct audio_sampling_rate_test;
class AudioStream
{
public:
struct audio_sampling_rate_test;
class AudioStream
{
public:
- AudioStream (int frame_rate, int channels);
- AudioStream (int frame_rate, AudioMapping mapping);
+ AudioStream (int frame_rate,
Frame length,
int channels);
+ AudioStream (int frame_rate,
Frame length,
AudioMapping mapping);
virtual ~AudioStream () {}
void set_mapping (AudioMapping mapping);
virtual ~AudioStream () {}
void set_mapping (AudioMapping mapping);
@@
-44,6
+49,11
@@
public:
return _frame_rate;
}
return _frame_rate;
}
+ Frame length () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _length;
+ }
+
int channels () const;
protected:
int channels () const;
protected:
@@
-54,9
+64,12
@@
private:
friend struct player_time_calculation_test3;
int _frame_rate;
friend struct player_time_calculation_test3;
int _frame_rate;
+ Frame _length;
AudioMapping _mapping;
};
AudioMapping _mapping;
};
-typedef boost::shared_ptr<AudioStream> AudioStreamPtr;
+
+typedef std::shared_ptr<AudioStream> AudioStreamPtr;
+
#endif
#endif