From 7af537a417cf961d3174bb8f3eee9f370b2b64ed Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Sat, 7 May 2022 11:04:28 +0800 Subject: [PATCH] Rename *OutputDevice(s) to *PlaybackDevice(s) --- src/modules/audio/Audio.cpp | 2 +- src/modules/audio/Audio.h | 12 ++++++------ src/modules/audio/null/Audio.cpp | 4 ++-- src/modules/audio/null/Audio.h | 4 ++-- src/modules/audio/openal/Audio.cpp | 8 ++++---- src/modules/audio/openal/Audio.h | 6 +++--- src/modules/audio/wrap_Audio.cpp | 18 +++++++++--------- src/modules/love/callbacks.lua | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/modules/audio/Audio.cpp b/src/modules/audio/Audio.cpp index 645c95bb6..b892556c3 100644 --- a/src/modules/audio/Audio.cpp +++ b/src/modules/audio/Audio.cpp @@ -78,7 +78,7 @@ bool Audio::setMixWithSystem(bool mix) #endif } -void Audio::setOutputDevice(const char */*name*/) +void Audio::setPlaybackDevice(const char */*name*/) { throw love::Exception("Re-setting output device is not supported."); } diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h index 474d8a939..2cdc40b4e 100644 --- a/src/modules/audio/Audio.h +++ b/src/modules/audio/Audio.h @@ -298,19 +298,19 @@ public: virtual void resumeContext() = 0; /** - * Get current output device name. + * Get current playback device name. */ - virtual std::string getOutputDevice() = 0; + virtual std::string getPlaybackDevice() = 0; /** - * Retrieve list of available output devices. + * Retrieve list of available playback devices. */ - virtual void getOutputDevices(std::vector &list) = 0; + virtual void getPlaybackDevices(std::vector &list) = 0; /** - * Set the output device to specified device name. + * Set the current playback device to specified device name. */ - virtual void setOutputDevice(const char *name); + virtual void setPlaybackDevice(const char *name); private: diff --git a/src/modules/audio/null/Audio.cpp b/src/modules/audio/null/Audio.cpp index 70babb0f7..4704b2461 100644 --- a/src/modules/audio/null/Audio.cpp +++ b/src/modules/audio/null/Audio.cpp @@ -211,12 +211,12 @@ void Audio::resumeContext() { } -std::string Audio::getOutputDevice() +std::string Audio::getPlaybackDevice() { return ""; } -void Audio::getOutputDevices(std::vector &/*list*/) +void Audio::getPlaybackDevices(std::vector &/*list*/) { } diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h index 11689d151..b452433f9 100644 --- a/src/modules/audio/null/Audio.h +++ b/src/modules/audio/null/Audio.h @@ -89,8 +89,8 @@ public: void pauseContext(); void resumeContext(); - std::string getOutputDevice(); - void getOutputDevices(std::vector &list); + std::string getPlaybackDevice(); + void getPlaybackDevices(std::vector &list); private: float volume; diff --git a/src/modules/audio/openal/Audio.cpp b/src/modules/audio/openal/Audio.cpp index 5aff7115d..d6208c310 100644 --- a/src/modules/audio/openal/Audio.cpp +++ b/src/modules/audio/openal/Audio.cpp @@ -328,7 +328,7 @@ void Audio::resumeContext() alcMakeContextCurrent(context); } -std::string Audio::getOutputDevice() +std::string Audio::getPlaybackDevice() { const char *dev = getDeviceSpecifier(device); @@ -338,7 +338,7 @@ std::string Audio::getOutputDevice() return dev; } -void Audio::getOutputDevices(std::vector &list) +void Audio::getPlaybackDevices(std::vector &list) { const char *devices = getDeviceSpecifier(nullptr); @@ -352,7 +352,7 @@ void Audio::getOutputDevices(std::vector &list) } } -void Audio::setOutputDevice(const char* name) +void Audio::setPlaybackDevice(const char* name) { #ifndef ALC_SOFT_reopen_device typedef ALCboolean (ALC_APIENTRY*LPALCREOPENDEVICESOFT)(ALCdevice *device, @@ -366,7 +366,7 @@ void Audio::setOutputDevice(const char* name) { // Default implementation throws exception. To make // error message consistent, call the base class. - love::audio::Audio::setOutputDevice(name); + love::audio::Audio::setPlaybackDevice(name); return; } diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h index 7c2531c4a..e452f9867 100644 --- a/src/modules/audio/openal/Audio.h +++ b/src/modules/audio/openal/Audio.h @@ -127,9 +127,9 @@ public: bool getEffectID(const char *name, ALuint &id); - std::string getOutputDevice(); - void getOutputDevices(std::vector &list); - void setOutputDevice(const char *name); + std::string getPlaybackDevice(); + void getPlaybackDevices(std::vector &list); + void setPlaybackDevice(const char *name); private: void initializeEFX(); diff --git a/src/modules/audio/wrap_Audio.cpp b/src/modules/audio/wrap_Audio.cpp index 18a2942a8..957b11abd 100644 --- a/src/modules/audio/wrap_Audio.cpp +++ b/src/modules/audio/wrap_Audio.cpp @@ -543,20 +543,20 @@ int w_setMixWithSystem(lua_State *L) return 1; } -int w_getOutputDevice(lua_State* L) +int w_getPlaybackDevice(lua_State* L) { std::string device; - luax_catchexcept(L, [&]() { device = instance()->getOutputDevice(); }); + luax_catchexcept(L, [&]() { device = instance()->getPlaybackDevice(); }); luax_pushstring(L, device); return 1; } -int w_getOutputDevices(lua_State* L) +int w_getPlaybackDevices(lua_State* L) { std::vector list; - luax_catchexcept(L, [&]() { instance()->getOutputDevices(list); }); + luax_catchexcept(L, [&]() { instance()->getPlaybackDevices(list); }); lua_createtable(L, 0, (int) list.size()); for (int i = 0; i < (int) list.size(); i++) { @@ -568,13 +568,13 @@ int w_getOutputDevices(lua_State* L) return 1; } -int w_setOutputDevice(lua_State* L) +int w_setPlaybackDevice(lua_State* L) { const char *device = luaL_optstring(L, 1, nullptr); try { - instance()->setOutputDevice(device); + instance()->setPlaybackDevice(device); luax_pushboolean(L, true); return 1; } @@ -620,9 +620,9 @@ static const luaL_Reg functions[] = { "getMaxSourceEffects", w_getMaxSourceEffects }, { "isEffectsSupported", w_isEffectsSupported }, { "setMixWithSystem", w_setMixWithSystem }, - { "getOutputDevice", w_getOutputDevice }, - { "getOutputDevices", w_getOutputDevices }, - { "setOutputDevice", w_setOutputDevice }, + { "getPlaybackDevice", w_getPlaybackDevice }, + { "getPlaybackDevices", w_getPlaybackDevices }, + { "setPlaybackDevice", w_setPlaybackDevice }, { 0, 0 } }; diff --git a/src/modules/love/callbacks.lua b/src/modules/love/callbacks.lua index 872f21344..b0532a346 100644 --- a/src/modules/love/callbacks.lua +++ b/src/modules/love/callbacks.lua @@ -131,7 +131,7 @@ function love.createhandlers() end, audiodisconnected = function (sources) if not love.audiodisconnected or not love.audiodisconnected(sources) then - love.audio.setOutputDevice() + love.audio.setPlaybackDevice() end end, }, {