diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-20 01:44:30 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-20 01:44:30 +0200 |
| commit | 2e2f11b29651cffe37c64275dbd45c7563310020 (patch) | |
| tree | 6e5c8a8e2cde776335cde438a0f4e94aa42c1e38 /src/lib | |
| parent | 185756ffbbba5d2b356860e75232fec9582c5800 (diff) | |
Assorted tidying.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_decoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/audio_decoder.h | 6 | ||||
| -rw-r--r-- | src/lib/audio_stream.cc | 5 | ||||
| -rw-r--r-- | src/lib/audio_stream.h | 7 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 77c9b0695..2d02043b5 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -32,8 +32,6 @@ using std::cout; -using std::map; -using std::pair; using std::shared_ptr; using std::make_shared; using boost::optional; diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 754321880..81b48b73c 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -28,9 +28,9 @@ #define DCPOMATIC_AUDIO_DECODER_H -#include "decoder.h" -#include "content_audio.h" #include "audio_stream.h" +#include "content_audio.h" +#include "decoder.h" #include "decoder_part.h" #include <boost/signals2.hpp> diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc index ef0b91665..43e4c5ec1 100644 --- a/src/lib/audio_stream.cc +++ b/src/lib/audio_stream.cc @@ -18,10 +18,12 @@ */ + #include "audio_stream.h" #include "audio_mapping.h" #include "util.h" + AudioStream::AudioStream (int frame_rate, Frame length, int channels) : _frame_rate (frame_rate) , _length (length) @@ -30,6 +32,7 @@ AudioStream::AudioStream (int frame_rate, Frame length, int channels) } + AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping) : _frame_rate (frame_rate) , _length (length) @@ -38,6 +41,7 @@ AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping) } + void AudioStream::set_mapping (AudioMapping mapping) { @@ -45,6 +49,7 @@ AudioStream::set_mapping (AudioMapping mapping) _mapping = mapping; } + int AudioStream::channels () const { diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h index a7e204065..470d9c854 100644 --- a/src/lib/audio_stream.h +++ b/src/lib/audio_stream.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,13 +18,16 @@ */ + #ifndef DCPOMATIC_AUDIO_STREAM_H #define DCPOMATIC_AUDIO_STREAM_H + #include "audio_mapping.h" #include "types.h" #include <boost/thread/mutex.hpp> + struct audio_sampling_rate_test; class AudioStream @@ -65,6 +68,8 @@ private: AudioMapping _mapping; }; + typedef std::shared_ptr<AudioStream> AudioStreamPtr; + #endif |