From 7916195c15bb516cea664c0c33941c2377251468 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Sun, 30 Aug 2015 16:39:06 +0300 Subject: [PATCH] Use more meaningful function names --- SDL2pp/Mixer.cc | 10 +++++----- SDL2pp/Mixer.hh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SDL2pp/Mixer.cc b/SDL2pp/Mixer.cc index 69e2005..d9f4d1d 100644 --- a/SDL2pp/Mixer.cc +++ b/SDL2pp/Mixer.cc @@ -93,11 +93,11 @@ int Mixer::FadeInChannel(int channel, const Chunk& chunk, int loops, int ms, int return chan; } -void Mixer::Pause(int channel) { +void Mixer::PauseChannel(int channel) { Mix_Pause(channel); } -void Mixer::Resume(int channel) { +void Mixer::ResumeChannel(int channel) { Mix_Resume(channel); } @@ -117,15 +117,15 @@ void Mixer::ChannelFinished(ChannelFinishedHandler channel_finished) { Mix_ChannelFinished(channel_finished); } -int Mixer::Playing(int channel) const { +int Mixer::IsChannelPlaying(int channel) const { return Mix_Playing(channel); } -int Mixer::Paused(int channel) const { +int Mixer::IsChannelPaused(int channel) const { return Mix_Paused(channel); } -int Mixer::FadingChannel(int which) const { +int Mixer::IsChannelFading(int which) const { return Mix_FadingChannel(which); } diff --git a/SDL2pp/Mixer.hh b/SDL2pp/Mixer.hh index cb2b29b..8a70f51 100644 --- a/SDL2pp/Mixer.hh +++ b/SDL2pp/Mixer.hh @@ -254,7 +254,7 @@ public: /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC32 /// //////////////////////////////////////////////////////////// - void Pause(int channel = -1); + void PauseChannel(int channel = -1); //////////////////////////////////////////////////////////// /// \brief Resume a paused channel @@ -264,7 +264,7 @@ public: /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC33 /// //////////////////////////////////////////////////////////// - void Resume(int channel = -1); + void ResumeChannel(int channel = -1); //////////////////////////////////////////////////////////// /// \brief Stop playing on a channel @@ -332,7 +332,7 @@ public: /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC38 /// //////////////////////////////////////////////////////////// - int Playing(int channel) const; + int IsChannelPlaying(int channel) const; //////////////////////////////////////////////////////////// /// \brief Get the pause status of a channel @@ -348,7 +348,7 @@ public: /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC39 /// //////////////////////////////////////////////////////////// - int Paused(int channel) const; + int IsChannelPaused(int channel) const; //////////////////////////////////////////////////////////// /// \brief Get the fade status of a channel @@ -360,7 +360,7 @@ public: /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC40 /// //////////////////////////////////////////////////////////// - int FadingChannel(int which) const; + int IsChannelFading(int which) const; // TODO: Groups // TODO: Music