From 05fc17b88a88389c95f3cdab6cd05b7d0b5488e0 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Mon, 2 Jul 2018 13:23:40 +0100 Subject: [PATCH] sink: Remove unnecessary SetDevice method Unused, doesn't do anything. --- src/audio_core/cubeb_sink.cpp | 2 -- src/audio_core/cubeb_sink.h | 1 - src/audio_core/null_sink.h | 2 -- src/audio_core/sdl2_sink.cpp | 4 ---- src/audio_core/sdl2_sink.h | 2 -- src/audio_core/sink.h | 6 ------ 6 files changed, 17 deletions(-) diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 231560269..55395e15c 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp @@ -120,8 +120,6 @@ size_t CubebSink::SamplesInQueue() const { return impl->queue.size() / 2; } -void CubebSink::SetDevice(int device_id) {} - long CubebSink::Impl::DataCallback(cubeb_stream* stream, void* user_data, const void* input_buffer, void* output_buffer, long num_frames) { Impl* impl = static_cast(user_data); diff --git a/src/audio_core/cubeb_sink.h b/src/audio_core/cubeb_sink.h index 1fb521834..0fa82ffad 100644 --- a/src/audio_core/cubeb_sink.h +++ b/src/audio_core/cubeb_sink.h @@ -22,7 +22,6 @@ public: size_t SamplesInQueue() const override; std::vector GetDeviceList() const override; - void SetDevice(int device_id) override; private: struct Impl; diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h index 3b2129f8f..6299e3e16 100644 --- a/src/audio_core/null_sink.h +++ b/src/audio_core/null_sink.h @@ -24,8 +24,6 @@ public: return 0; } - void SetDevice(int device_id) override {} - std::vector GetDeviceList() const override { return {}; } diff --git a/src/audio_core/sdl2_sink.cpp b/src/audio_core/sdl2_sink.cpp index c3fba3b84..7bc6ecd55 100644 --- a/src/audio_core/sdl2_sink.cpp +++ b/src/audio_core/sdl2_sink.cpp @@ -114,10 +114,6 @@ size_t SDL2Sink::SamplesInQueue() const { return total_size; } -void SDL2Sink::SetDevice(int device_id) { - this->device_id = device_id; -} - void SDL2Sink::Impl::Callback(void* impl_, u8* buffer, int buffer_size_in_bytes) { Impl* impl = reinterpret_cast(impl_); diff --git a/src/audio_core/sdl2_sink.h b/src/audio_core/sdl2_sink.h index bcc725369..acc86264b 100644 --- a/src/audio_core/sdl2_sink.h +++ b/src/audio_core/sdl2_sink.h @@ -22,12 +22,10 @@ public: size_t SamplesInQueue() const override; std::vector GetDeviceList() const override; - void SetDevice(int device_id) override; private: struct Impl; std::unique_ptr impl; - int device_id; std::vector device_list; }; diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h index 19fe12860..837427794 100644 --- a/src/audio_core/sink.h +++ b/src/audio_core/sink.h @@ -32,12 +32,6 @@ public: /// Samples enqueued that have not been played yet. virtual std::size_t SamplesInQueue() const = 0; - /** - * Sets the desired output device. - * @param device_id ID of the desired device. - */ - virtual void SetDevice(int device_id) = 0; - /// Returns the list of available devices. virtual std::vector GetDeviceList() const = 0; };