diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-11 22:35:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-11 22:35:02 +0100 |
| commit | dc27e49291d1d4d0bafee8f26e9c204270a4a2d2 (patch) | |
| tree | c9a9f51464290a11ec96b9f8e58b01069a063a3f | |
| parent | b9842263a402b5ce1d2f85a1346ca11a419f816e (diff) | |
Remove unused in_channels() in AudioProcessor.
| -rw-r--r-- | src/lib/audio_processor.h | 3 | ||||
| -rw-r--r-- | src/lib/channel_count.h | 49 | ||||
| -rw-r--r-- | src/lib/mid_side_decoder.cc | 6 | ||||
| -rw-r--r-- | src/lib/mid_side_decoder.h | 1 | ||||
| -rw-r--r-- | src/lib/upmixer_a.cc | 6 | ||||
| -rw-r--r-- | src/lib/upmixer_a.h | 1 |
6 files changed, 0 insertions, 66 deletions
diff --git a/src/lib/audio_processor.h b/src/lib/audio_processor.h index 2c66d5b07..9e34689cb 100644 --- a/src/lib/audio_processor.h +++ b/src/lib/audio_processor.h @@ -24,7 +24,6 @@ #ifndef DCPOMATIC_AUDIO_PROCESSOR_H #define DCPOMATIC_AUDIO_PROCESSOR_H -#include "channel_count.h" #include <boost/shared_ptr.hpp> #include <list> #include <string> @@ -48,8 +47,6 @@ public: virtual std::string name () const = 0; /** @return An internal identifier */ virtual std::string id () const = 0; - /** @return Number of input channels */ - virtual ChannelCount in_channels () const = 0; /** @return Number of output channels */ virtual int out_channels () const = 0; /** @return A clone of this AudioProcessor for operation at the specified sampling rate */ diff --git a/src/lib/channel_count.h b/src/lib/channel_count.h deleted file mode 100644 index bc840293e..000000000 --- a/src/lib/channel_count.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - Copyright (C) 2014 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 - 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, - 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. - -*/ - -#ifndef DCPOMATIC_CHANNEL_COUNT_H -#define DCPOMATIC_CHANNEL_COUNT_H - -class ChannelCount -{ -public: - ChannelCount () - : min (0) - , max (0) - {} - - ChannelCount (int n) - : min (n) - , max (n) - {} - - ChannelCount (int min_, int max_) - : min (min_) - , max (max_) - {} - - bool includes (int c) { - return min <= c && c <= max; - } - - int min; - int max; -}; - -#endif diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc index 4f619ad57..6aadea1a2 100644 --- a/src/lib/mid_side_decoder.cc +++ b/src/lib/mid_side_decoder.cc @@ -40,12 +40,6 @@ MidSideDecoder::id () const return N_("mid-side-decoder"); } -ChannelCount -MidSideDecoder::in_channels () const -{ - return ChannelCount (2); -} - int MidSideDecoder::out_channels () const { diff --git a/src/lib/mid_side_decoder.h b/src/lib/mid_side_decoder.h index 13e5ca360..f807c9298 100644 --- a/src/lib/mid_side_decoder.h +++ b/src/lib/mid_side_decoder.h @@ -24,7 +24,6 @@ class MidSideDecoder : public AudioProcessor public: std::string name () const; std::string id () const; - ChannelCount in_channels () const; int out_channels () const; boost::shared_ptr<AudioProcessor> clone (int) const; boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels); diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc index e6ec09c6a..a5850cf94 100644 --- a/src/lib/upmixer_a.cc +++ b/src/lib/upmixer_a.cc @@ -52,12 +52,6 @@ UpmixerA::id () const return N_("stereo-5.1-upmix-a"); } -ChannelCount -UpmixerA::in_channels () const -{ - return ChannelCount (2); -} - int UpmixerA::out_channels () const { diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h index a25c3a329..654f5f025 100644 --- a/src/lib/upmixer_a.h +++ b/src/lib/upmixer_a.h @@ -34,7 +34,6 @@ public: std::string name () const; std::string id () const; - ChannelCount in_channels () const; int out_channels () const; boost::shared_ptr<AudioProcessor> clone (int) const; boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels); |
