From 84f30d0dcce2d42d7fd92803e3694752e543fdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 25 May 2015 23:35:00 +0200 Subject: [PATCH] Audio: removed deprecated list-argument functions taking pointers. Use function taking references instead. --- src/Magnum/Audio/Source.cpp | 39 ------------------------------------- src/Magnum/Audio/Source.h | 36 ---------------------------------- 2 files changed, 75 deletions(-) diff --git a/src/Magnum/Audio/Source.cpp b/src/Magnum/Audio/Source.cpp index 838722941..4daf5b3ca 100644 --- a/src/Magnum/Audio/Source.cpp +++ b/src/Magnum/Audio/Source.cpp @@ -54,17 +54,6 @@ Containers::Array sourceIds(const std::vector sourceIds(const std::vector& sources) { - Containers::Array ids(sources.size()); - for(auto it = sources.begin(); it != sources.end(); ++it) { - CORRADE_INTERNAL_ASSERT(*it); - ids[it-sources.begin()] = (*it)->id(); - } - return ids; -} -#endif - } void Source::play(std::initializer_list> sources) { @@ -77,13 +66,6 @@ void Source::play(const std::vector>& sources) { alSourcePlayv(ids.size(), ids); } -#ifdef MAGNUM_BUILD_DEPRECATED -void Source::play(const std::vector& sources) { - const auto ids = sourceIds(sources); - alSourcePlayv(ids.size(), ids); -} -#endif - void Source::pause(std::initializer_list> sources) { const auto ids = sourceIds(sources); alSourcePausev(ids.size(), ids); @@ -94,13 +76,6 @@ void Source::pause(const std::vector>& sources) { alSourcePausev(ids.size(), ids); } -#ifdef MAGNUM_BUILD_DEPRECATED -void Source::pause(const std::vector& sources) { - const auto ids = sourceIds(sources); - alSourcePausev(ids.size(), ids); -} -#endif - void Source::stop(std::initializer_list> sources) { const auto ids = sourceIds(sources); alSourceStopv(ids.size(), ids); @@ -111,13 +86,6 @@ void Source::stop(const std::vector>& sources) { alSourceStopv(ids.size(), ids); } -#ifdef MAGNUM_BUILD_DEPRECATED -void Source::stop(const std::vector& sources) { - const auto ids = sourceIds(sources); - alSourceStopv(ids.size(), ids); -} -#endif - void Source::rewind(std::initializer_list> sources) { const auto ids = sourceIds(sources); alSourceRewindv(ids.size(), ids); @@ -128,13 +96,6 @@ void Source::rewind(const std::vector>& sources) alSourceRewindv(ids.size(), ids); } -#ifdef MAGNUM_BUILD_DEPRECATED -void Source::rewind(const std::vector& sources) { - const auto ids = sourceIds(sources); - alSourceRewindv(ids.size(), ids); -} -#endif - Debug operator<<(Debug debug, const Source::State value) { switch(value) { #define _c(value) case Source::State::value: return debug << "Audio::Source::State::" #value; diff --git a/src/Magnum/Audio/Source.h b/src/Magnum/Audio/Source.h index edab1faf1..074f0113a 100644 --- a/src/Magnum/Audio/Source.h +++ b/src/Magnum/Audio/Source.h @@ -386,15 +386,6 @@ class MAGNUM_AUDIO_EXPORT Source { static void play(std::initializer_list> sources); static void play(const std::vector>& sources); /**< @overload */ - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief play(const std::vector>&) - * @deprecated Use @ref play(const std::vector>&) - * instead. - */ - static CORRADE_DEPRECATED("use play(const std::vector>&) instead") void play(const std::vector& sources); - #endif - /** * @brief Pause more sources at once * @@ -408,15 +399,6 @@ class MAGNUM_AUDIO_EXPORT Source { static void pause(std::initializer_list> sources); static void pause(const std::vector>& sources); /**< @overload */ - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief pause(const std::vector>&) - * @deprecated Use @ref pause(const std::vector>&) - * instead. - */ - static CORRADE_DEPRECATED("use pause(const std::vector>&) instead") void pause(const std::vector& sources); - #endif - /** * @brief Stop more sources at once * @@ -430,15 +412,6 @@ class MAGNUM_AUDIO_EXPORT Source { static void stop(std::initializer_list> sources); static void stop(const std::vector>& sources); /**< @overload */ - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief stop(const std::vector>&) - * @deprecated Use @ref stop(const std::vector>&) - * instead. - */ - static CORRADE_DEPRECATED("use stop(const std::vector>&) instead") void stop(const std::vector& sources); - #endif - /** * @brief Rewind more sources at once * @@ -452,15 +425,6 @@ class MAGNUM_AUDIO_EXPORT Source { static void rewind(std::initializer_list> sources); static void rewind(const std::vector>& sources); /**< @overload */ - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @copybrief rewind(const std::vector>&) - * @deprecated Use @ref rewind(const std::vector>&) - * instead. - */ - static CORRADE_DEPRECATED("use rewind(const std::vector>&) instead") void rewind(const std::vector& sources); - #endif - /** * @brief State *