From 25a767290b27f43ab4c0acab376c12f0a299ea4f Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 1 Feb 2016 13:24:49 +0100 Subject: [PATCH] Audio/OpenAL: Adjust return type of QueryInputDevices and QueryOutputDevices Former-commit-id: 5f2a07a73bc8903662139067ce0b484c9af86353 --- include/Nazara/Audio/OpenAL.hpp | 4 ++-- src/Nazara/Audio/OpenAL.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/Nazara/Audio/OpenAL.hpp b/include/Nazara/Audio/OpenAL.hpp index 812b002b6..5d6fa2634 100644 --- a/include/Nazara/Audio/OpenAL.hpp +++ b/include/Nazara/Audio/OpenAL.hpp @@ -73,8 +73,8 @@ namespace Nz static bool IsInitialized(); - static unsigned int QueryInputDevices(std::vector& devices); - static unsigned int QueryOutputDevices(std::vector& devices); + static std::size_t QueryInputDevices(std::vector& devices); + static std::size_t QueryOutputDevices(std::vector& devices); static bool SetDevice(const String& deviceName); diff --git a/src/Nazara/Audio/OpenAL.cpp b/src/Nazara/Audio/OpenAL.cpp index 72a56f7a7..1c30cd5f1 100644 --- a/src/Nazara/Audio/OpenAL.cpp +++ b/src/Nazara/Audio/OpenAL.cpp @@ -23,14 +23,14 @@ namespace Nz ALCcontext* s_context = nullptr; unsigned int s_version; - unsigned int ParseDevices(const char* deviceString, std::vector& devices) + std::size_t ParseDevices(const char* deviceString, std::vector& devices) { if (!deviceString) return 0; - unsigned int startSize = devices.size(); + std::size_t startSize = devices.size(); - unsigned int length; + std::size_t length; while ((length = std::strlen(deviceString)) > 0) { devices.push_back(String(deviceString, length)); @@ -222,7 +222,7 @@ namespace Nz return s_library.IsLoaded(); } - unsigned int OpenAL::QueryInputDevices(std::vector& devices) + std::size_t OpenAL::QueryInputDevices(std::vector& devices) { const char* deviceString = reinterpret_cast(alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER)); if (!deviceString) @@ -231,7 +231,7 @@ namespace Nz return ParseDevices(deviceString, devices); } - unsigned int OpenAL::QueryOutputDevices(std::vector& devices) + std::size_t OpenAL::QueryOutputDevices(std::vector& devices) { const char* deviceString = reinterpret_cast(alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER)); if (!deviceString)