Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make master volume controllable via input

Browse source 
Standard mapping is +/- keys. Setting is written to es_input.cfg.
This commit is contained in:
Bim Overbohm 2013-05-23 11:43:50 +02:00
parent 50af655fe9 12b4b12103
commit 970aa78cda
5 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/InputManager.cpp
View file

@ -262,6 +262,9 @@ void InputManager::loadDefaultConfig()
cfg->mapInput("select", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true)); cfg->mapInput("select", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true));
cfg->mapInput("pageup", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_RIGHTBRACKET, 1, true)); cfg->mapInput("pageup", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_RIGHTBRACKET, 1, true));
cfg->mapInput("pagedown", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_LEFTBRACKET, 1, true)); cfg->mapInput("pagedown", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_LEFTBRACKET, 1, true));
cfg->mapInput("mastervolup", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_PLUS, 1, true));
cfg->mapInput("mastervoldown", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_MINUS, 1, true));
} }
void InputManager::writeConfig() void InputManager::writeConfig()

27
src/VolumeControl.cpp
View file

@ -24,7 +24,7 @@ VolumeControl::VolumeControl()
init(); init();
//get original volume levels for system //get original volume levels for system
getVolume(originalVolume); originalVolume = getVolume();
} }
VolumeControl::~VolumeControl() VolumeControl::~VolumeControl()
@ -212,9 +212,9 @@ void VolumeControl::deinit()
#endif #endif
} }
void VolumeControl::getVolume(uint8_t & volume) int VolumeControl::getVolume() const
{ {
volume = 0; int volume = 0;
#if defined (__APPLE__) #if defined (__APPLE__)
#error TODO: Not implemented for MacOS yet!!! #error TODO: Not implemented for MacOS yet!!!
@ -235,11 +235,6 @@ void VolumeControl::getVolume(uint8_t & volume)
if (rawVolume > 0) if (rawVolume > 0)
{ {
volume = (rawVolume * 100) / (maxVolume - minVolume); volume = (rawVolume * 100) / (maxVolume - minVolume);
//clamp to 0-100 range
if (volume > 100)
{
volume = 100;
}
} }
//else volume = 0; //else volume = 0;
} }
@ -289,11 +284,25 @@ void VolumeControl::getVolume(uint8_t & volume)
} }
#endif #endif
//clamp to 0-100 range
if (volume < 0)
{
volume = 0;
}
if (volume > 100)
{
volume = 100;
}
return volume;
} }
void VolumeControl::setVolume(uint8_t volume) void VolumeControl::setVolume(int volume)
{ {
//clamp to 0-100 range //clamp to 0-100 range
if (volume < 0)
{
volume = 0;
}
if (volume > 100) if (volume > 100)
{ {
volume = 100; volume = 100;

8
src/VolumeControl.h
View file

@ -36,8 +36,8 @@ class VolumeControl
IAudioEndpointVolume * endpointVolume; IAudioEndpointVolume * endpointVolume;
#endif #endif
uint8_t originalVolume; int originalVolume;
uint8_t internalVolume; int internalVolume;
static std::shared_ptr<VolumeControl> sInstance; static std::shared_ptr<VolumeControl> sInstance;
@ -49,8 +49,8 @@ public:
void init(); void init();
void deinit(); void deinit();
void getVolume(uint8_t & volume); int getVolume() const;
void setVolume(uint8_t volume); void setVolume(int volume);
virtual ~VolumeControl(); virtual ~VolumeControl();
}; };

11
src/Window.cpp
View file

@ -2,6 +2,7 @@
#include <iostream> #include <iostream>
#include "Renderer.h" #include "Renderer.h"
#include "AudioManager.h" #include "AudioManager.h"
#include "VolumeControl.h"
Window::Window() Window::Window()
{ {
@ -73,7 +74,15 @@ void Window::deinit()
void Window::input(InputConfig* config, Input input) void Window::input(InputConfig* config, Input input)
{ {
if(peekGui()) if(config->isMappedTo("mastervolup", input))
{
VolumeControl::getInstance()->setVolume(VolumeControl::getInstance()->getVolume() + 5);
}
else if(config->isMappedTo("mastervoldown", input))
{
VolumeControl::getInstance()->setVolume(VolumeControl::getInstance()->getVolume() - 5);
}
else if(peekGui())
this->peekGui()->input(config, input); this->peekGui()->input(config, input);
} }

6
src/components/GuiInputConfig.cpp
View file

@ -5,9 +5,9 @@
#include "GuiGameList.h" #include "GuiGameList.h"
#include "../Log.h" #include "../Log.h"
static int inputCount = 10; static int inputCount = 12;
static std::string inputName[10] = { "Up", "Down", "Left", "Right", "A", "B", "Menu", "Select", "PageUp", "PageDown" }; static std::string inputName[12] = { "Up", "Down", "Left", "Right", "A", "B", "Menu", "Select", "PageUp", "PageDown", "MasterVolUp", "MasterVolDown" };
static std::string inputDispName[10] = { "Up", "Down", "Left", "Right", "Accept", "Back", "Menu", "Jump to Letter", "Page Up", "Page Down" }; static std::string inputDispName[12] = { "Up", "Down", "Left", "Right", "Accept", "Back", "Menu", "Jump to Letter", "Page Up", "Page Down", "Master volume up", "Master volume down" };
GuiInputConfig::GuiInputConfig(Window* window, InputConfig* target) : Gui(window), mTargetConfig(target) GuiInputConfig::GuiInputConfig(Window* window, InputConfig* target) : Gui(window), mTargetConfig(target)
{ {