Fix argument types to match upstream API

This commit is contained in:
Dmitry Marakasov 2015-09-17 15:21:49 +03:00
parent adaecc22cf
commit 206d430e25
4 changed files with 8 additions and 8 deletions

View File

@ -242,7 +242,7 @@ void Mixer::SetMusicHook(MusicHook&& hook) {
}, current_music_hook_.get()); }, current_music_hook_.get());
} }
void Mixer::SetPanning(int channel, int left, int right) { void Mixer::SetPanning(int channel, Uint8 left, Uint8 right) {
if (Mix_SetPanning(channel, left, right) == 0) if (Mix_SetPanning(channel, left, right) == 0)
throw Exception("Mix_SetPanning"); throw Exception("Mix_SetPanning");
} }
@ -252,7 +252,7 @@ void Mixer::UnsetPanning(int channel) {
throw Exception("Mix_SetPanning"); throw Exception("Mix_SetPanning");
} }
void Mixer::SetDistance(int channel, int distance) { void Mixer::SetDistance(int channel, Uint8 distance) {
if (Mix_SetDistance(channel, distance) == 0) if (Mix_SetDistance(channel, distance) == 0)
throw Exception("Mix_SetDistance"); throw Exception("Mix_SetDistance");
} }
@ -262,7 +262,7 @@ void Mixer::UnsetDistance(int channel) {
throw Exception("Mix_SetDistance"); throw Exception("Mix_SetDistance");
} }
void Mixer::SetPosition(int channel, int angle, int distance) { void Mixer::SetPosition(int channel, Sint16 angle, Uint8 distance) {
if (Mix_SetPosition(channel, angle, distance) == 0) if (Mix_SetPosition(channel, angle, distance) == 0)
throw Exception("Mix_SetPosition"); throw Exception("Mix_SetPosition");
} }

View File

@ -687,7 +687,7 @@ public:
/// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC80 /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC80
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetPanning(int channel, int left, int right); void SetPanning(int channel, Uint8 left, Uint8 right);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Disable stereo panning /// \brief Disable stereo panning
@ -715,7 +715,7 @@ public:
/// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC81 /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC81
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetDistance(int channel, int distance); void SetDistance(int channel, Uint8 distance);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Disable distance attenuation /// \brief Disable distance attenuation
@ -747,7 +747,7 @@ public:
/// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC82 /// \see https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer.html#SEC82
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetPosition(int channel, int angle, int distance); void SetPosition(int channel, Sint16 angle, Uint8 distance);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Disable panning and distance /// \brief Disable panning and distance

View File

@ -115,7 +115,7 @@ Window& Window::Show() {
return *this; return *this;
} }
Window& Window::SetFullscreen(int flags) { Window& Window::SetFullscreen(Uint32 flags) {
if (SDL_SetWindowFullscreen(window_, flags) != 0) if (SDL_SetWindowFullscreen(window_, flags) != 0)
throw Exception("SDL_SetWindowFullscreen"); throw Exception("SDL_SetWindowFullscreen");
return *this; return *this;

View File

@ -267,7 +267,7 @@ public:
/// \see http://wiki.libsdl.org/SDL_SetWindowFullscreen /// \see http://wiki.libsdl.org/SDL_SetWindowFullscreen
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Window& SetFullscreen(int flags); Window& SetFullscreen(Uint32 flags);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Set the size of a window's client area /// \brief Set the size of a window's client area