mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-01-18 07:05:39 +00:00
Changed Audio settings to be much more flexible
Changed the selectable options for EmulationStation audio mixer
(called AudioDevice in EmulationStation) to be a greater range of
selectable options within Linux and RPi so that it is a lot more
flexible and will work with any aftermarket add-on audio cards and
RPi Audio HATs. Hopefully this gives people the flexibility that
they need in order to avoid the issues people have with unusual RPi
audio setups.
Added the ability to select the audio card as well, by surfacing
the audio card under the Audio Card setting. It was previously forced
to 'default' for all linux users, which was too restrictive in some
instances. This change now adds flexbility to support additional
Linux and RPi Audio Cards.
This option will only be available on Linux (and therefore RPi) as
Windows uses a different audio subsystem.
CHOOSING AUDIO ON LINUX AND RPi
You now select which ALSA Audio Card you want EmulationStation to use
by choosing the relevant AUDIO CARD option. If your one is not listed
then you can add a custom one in the es_settings.cfg file (see below).
You then select which ALSA Audio Mixer Control from that Audio Card
that you want EmulationStation to use, by choosing the relevant
AUDIO DEVICE option. (I kept the name AUDIO DEVICE as that what
EmulationStation previously used to describe an Audio Mixer.)
If your mixer name is not listed then you can add a custom one in
the es_settings.cfg file (see below).
ADDING A CUSTOM AUDIO CARD OR AUDIO DEVICE
In addition I added the ability to manually change the setting in
es_settings.cfg to add anything custom that you want. This will give
advanced users enough extra power that should avoid even the most
strange setups.
Step 1:
To add a custom Audio Card, edit the "AudioCard" setting and replace
the value with the name of your Audio Card. You can find this out by
opening a terminal window and running 'aplay -L'. This will generate a
list of Audio Cards similar to the one below:
pi@raspberrypi:~ $ aplay -L
null
Discard all samples (playback) or generate zero samples (capture)
default:CARD=sndrpijustboomd
snd_rpi_justboom_dac,
Default Audio Device
sysdefault:CARD=sndrpijustboomd
snd_rpi_justboom_dac,
Default Audio Device
dmix:CARD=sndrpijustboomd,DEV=0
snd_rpi_justboom_dac,
Direct sample mixing device
dsnoop:CARD=sndrpijustboomd,DEV=0
snd_rpi_justboom_dac,
Direct sample snooping device
hw:CARD=sndrpijustboomd,DEV=0
snd_rpi_justboom_dac,
Direct hardware device without any conversions
plughw:CARD=sndrpijustboomd,DEV=0
snd_rpi_justboom_dac,
Hardware device with all software conversions
Select any one of the Audio Cards listed by using the first word on
the line in your AudioCard settings in the es_settings.cfg, e.g.
<string name="AudioCard" value="default" />
NOTE: If the AudioCard value is not listed, please either close and
reopen EmulationStation (the settings is created upon close if it
doesn't exist), or add it manually to the es_settings.cfg file.
Step 2:
To add a custom Audio Device (mixer), edit the "AudioDevice" setting
and replace the value with the name of your Audio Device. You can get
a list off avilable Audio Devices on the Audio Card by opening a
terminal window and running 'amixer scontrols -D <AudioCard>', where
<AudioCard> is replaced with the name of your Audio Card that you
found in Step 1. This command will generate a list of Audio Devices
(mixers) that you can use in the AudioDevice setting in the
es_settings.cfg file, e.g.
pi@raspberrypi:~ $ amixer scontrols -D default
Simple mixer control 'DSP Program',0
Simple mixer control 'Analogue',0
Simple mixer control 'Analogue Playback Boost',0
Simple mixer control 'Auto Mute',0
Simple mixer control 'Auto Mute Mono',0
Simple mixer control 'Auto Mute Time Left',0
Simple mixer control 'Auto Mute Time Right',0
Simple mixer control 'Clock Missing Period',0
Simple mixer control 'Deemphasis',0
Simple mixer control 'Digital',0
Simple mixer control 'Max Overclock DAC',0
Simple mixer control 'Max Overclock DSP',0
Simple mixer control 'Max Overclock PLL',0
Simple mixer control 'Volume Ramp Down Emergency Rate',0
Simple mixer control 'Volume Ramp Down Emergency Step',0
Simple mixer control 'Volume Ramp Down Rate',0
Simple mixer control 'Volume Ramp Down Step',0
Simple mixer control 'Volume Ramp Up Rate',0
Simple mixer control 'Volume Ramp Up Step',0
Select any one of the Simple mixer controls listed by using the
name within the quotes within the AudioDevice setting in your
es_settings.cfg file, e.g.
<string name="AudioDevice" value="Digital" />
Using the example above, the following two settings within the
es_settings.cfg file will use the 'default' Audio Card to play
sounds, and will use the 'Digital' mixer (Audio Device) to
control the volume.
<string name="AudioCard" value="default" />
<string name="AudioDevice" value="Digital" />
NOTE: Any custom manually used settings will be overwritten if you
select any of the other options in the GUI and exit the Sound
Settings window, as the Sound Settings GUI window overwrites the
es_settings.cfg options when you exit the window.
Fix latest package renames
fonts-droid is now fonts-droid-fallback
vlc-nox is now vlc-bin
Fixed up whitespacing to project tab standard
Had not paid enough attention and had accidentally provided
whitespacing in spaces rather than the project standard of
tabs. This change fixes some additional use of spaces to
ensure all the code in the two files now uses tabs.
Vero4k autodetection and volume mixer fix
This commit is contained in:
tminit
parent
de021ca00f
commit
e7bc6f7006
|
|
@ -25,6 +25,12 @@ elseif(EXISTS "/opt/vc/include/bcm_host.h")
|
|||
set(BCMHOST found)
|
||||
set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used")
|
||||
#-------------------------------------------------------------------------------
|
||||
#check if we're running on OSMC Vero4K
|
||||
elseif(EXISTS "/opt/vero3/lib/libMali.so")
|
||||
MESSAGE("libMali.so found")
|
||||
set(VERO4K found)
|
||||
set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used")
|
||||
#-------------------------------------------------------------------------------
|
||||
#check if we're running on olinuxino / odroid / etc
|
||||
elseif(EXISTS "/usr/lib/libMali.so" OR
|
||||
EXISTS "/usr/lib/arm-linux-gnueabihf/libMali.so" OR
|
||||
|
|
@ -64,6 +70,10 @@ if(DEFINED BCMHOST)
|
|||
add_definitions(-D_RPI_)
|
||||
endif()
|
||||
|
||||
if(DEFINED VERO4K)
|
||||
add_definitions(-D_VERO4K_)
|
||||
endif()
|
||||
|
||||
if(DEFINED libCEC_FOUND)
|
||||
add_definitions(-DHAVE_LIBCEC)
|
||||
endif()
|
||||
|
|
@ -135,6 +145,11 @@ if(DEFINED BCMHOST)
|
|||
"/opt/vc/include/interface/vmcs_host/linux"
|
||||
"/opt/vc/include/interface/vcos/pthreads"
|
||||
)
|
||||
#add include directory for Vero4K
|
||||
elseif(DEFINED VERO4K)
|
||||
LIST(APPEND COMMON_INCLUDE_DIRS
|
||||
"/opt/vero3/include"
|
||||
)
|
||||
else()
|
||||
if(${GLSystem} MATCHES "Desktop OpenGL")
|
||||
LIST(APPEND COMMON_INCLUDE_DIRS
|
||||
|
|
@ -153,6 +168,10 @@ if(DEFINED BCMHOST)
|
|||
link_directories(
|
||||
"/opt/vc/lib"
|
||||
)
|
||||
elseif(DEFINED VERO4K)
|
||||
link_directories(
|
||||
"/opt/vero3/lib"
|
||||
)
|
||||
endif()
|
||||
|
||||
set(COMMON_LIBRARIES
|
||||
|
|
@ -191,6 +210,11 @@ if(DEFINED BCMHOST)
|
|||
brcmEGL
|
||||
${OPENGLES_LIBRARIES}
|
||||
)
|
||||
elseif(DEFINED VERO4K)
|
||||
LIST(APPEND COMMON_LIBRARIES
|
||||
EGL
|
||||
${OPENGLES_LIBRARIES}
|
||||
)
|
||||
else()
|
||||
if(MSVC)
|
||||
LIST(APPEND COMMON_LIBRARIES
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ EmulationStation has a few dependencies. For building, you'll need CMake, SDL2,
|
|||
All of this be easily installed with apt-get:
|
||||
```bash
|
||||
sudo apt-get install libsdl2-dev libfreeimage-dev libfreetype6-dev libcurl4-openssl-dev \
|
||||
libasound2-dev libgl1-mesa-dev build-essential cmake fonts-droid \
|
||||
libvlc-dev libvlccore-dev vlc-nox
|
||||
libasound2-dev libgl1-mesa-dev build-essential cmake fonts-droid-fallback libvlc-dev \
|
||||
libvlccore-dev vlc-bin
|
||||
```
|
||||
**On Fedora:**
|
||||
All of this be easily installed with dnf ( With rpmfusion activated) :
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(__linux__)
|
||||
#ifdef _RPI_
|
||||
#if defined(_RPI_) || defined(_VERO4K_)
|
||||
const char * VolumeControl::mixerName = "PCM";
|
||||
#else
|
||||
const char * VolumeControl::mixerName = "Master";
|
||||
|
|
@ -22,7 +22,7 @@ std::weak_ptr<VolumeControl> VolumeControl::sInstance;
|
|||
VolumeControl::VolumeControl()
|
||||
: originalVolume(0), internalVolume(0)
|
||||
#if defined (__APPLE__)
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#elif defined(__linux__)
|
||||
, mixerIndex(0), mixerHandle(nullptr), mixerElem(nullptr), mixerSelemId(nullptr)
|
||||
#elif defined(WIN32) || defined(_WIN32)
|
||||
|
|
@ -36,9 +36,9 @@ VolumeControl::VolumeControl()
|
|||
}
|
||||
|
||||
VolumeControl::VolumeControl(const VolumeControl & right):
|
||||
originalVolume(0), internalVolume(0)
|
||||
originalVolume(0), internalVolume(0)
|
||||
#if defined (__APPLE__)
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#elif defined(__linux__)
|
||||
, mixerIndex(0), mixerHandle(nullptr), mixerElem(nullptr), mixerSelemId(nullptr)
|
||||
#elif defined(WIN32) || defined(_WIN32)
|
||||
|
|
@ -86,9 +86,9 @@ void VolumeControl::init()
|
|||
//try to open mixer device
|
||||
if (mixerHandle == nullptr)
|
||||
{
|
||||
#ifdef _RPI_
|
||||
// Allow users to override the AudioCard and MixerName in es_settings.cfg
|
||||
mixerCard = Settings::getInstance()->getString("AudioCard").c_str();
|
||||
mixerName = Settings::getInstance()->getString("AudioDevice").c_str();
|
||||
#endif
|
||||
|
||||
snd_mixer_selem_id_alloca(&mixerSelemId);
|
||||
//sets simple-mixer index and name
|
||||
|
|
@ -256,7 +256,7 @@ int VolumeControl::getVolume() const
|
|||
int volume = 0;
|
||||
|
||||
#if defined (__APPLE__)
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#elif defined(__linux__)
|
||||
if (mixerElem != nullptr)
|
||||
{
|
||||
|
|
@ -350,7 +350,7 @@ void VolumeControl::setVolume(int volume)
|
|||
//store values in internal variables
|
||||
internalVolume = volume;
|
||||
#if defined (__APPLE__)
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#error TODO: Not implemented for MacOS yet!!!
|
||||
#elif defined(__linux__)
|
||||
if (mixerElem != nullptr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class VolumeControl
|
|||
static const char * mixerName;
|
||||
static const char * mixerCard;
|
||||
int mixerIndex;
|
||||
snd_mixer_t* mixerHandle;
|
||||
snd_mixer_t* mixerHandle;
|
||||
snd_mixer_elem_t* mixerElem;
|
||||
snd_mixer_selem_id_t* mixerSelemId;
|
||||
#elif defined(WIN32) || defined(_WIN32)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "SystemData.h"
|
||||
#include "VolumeControl.h"
|
||||
#include <SDL_events.h>
|
||||
#include <algorithm>
|
||||
|
||||
GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MENU"), mVersion(window)
|
||||
{
|
||||
|
|
@ -94,13 +95,49 @@ void GuiMenu::openSoundSettings()
|
|||
|
||||
if (UIModeController::getInstance()->isUIModeFull())
|
||||
{
|
||||
#ifdef _RPI_
|
||||
#if defined(__linux__)
|
||||
// audio card
|
||||
auto audio_card = std::make_shared< OptionListComponent<std::string> >(mWindow, "AUDIO CARD", false);
|
||||
std::vector<std::string> audio_cards;
|
||||
#ifdef _RPI_
|
||||
// RPi Specific Audio Cards
|
||||
audio_cards.push_back("local");
|
||||
audio_cards.push_back("hdmi");
|
||||
audio_cards.push_back("both");
|
||||
#endif
|
||||
audio_cards.push_back("default");
|
||||
audio_cards.push_back("sysdefault");
|
||||
audio_cards.push_back("dmix");
|
||||
audio_cards.push_back("hw");
|
||||
audio_cards.push_back("plughw");
|
||||
audio_cards.push_back("null");
|
||||
if (Settings::getInstance()->getString("AudioCard") != "") {
|
||||
if(std::find(audio_cards.begin(), audio_cards.end(), Settings::getInstance()->getString("AudioCard")) == audio_cards.end()) {
|
||||
audio_cards.push_back(Settings::getInstance()->getString("AudioCard"));
|
||||
}
|
||||
}
|
||||
for(auto ac = audio_cards.cbegin(); ac != audio_cards.cend(); ac++)
|
||||
audio_card->add(*ac, *ac, Settings::getInstance()->getString("AudioCard") == *ac);
|
||||
s->addWithLabel("AUDIO CARD", audio_card);
|
||||
s->addSaveFunc([audio_card] {
|
||||
Settings::getInstance()->setString("AudioCard", audio_card->getSelected());
|
||||
VolumeControl::getInstance()->deinit();
|
||||
VolumeControl::getInstance()->init();
|
||||
});
|
||||
|
||||
// volume control device
|
||||
auto vol_dev = std::make_shared< OptionListComponent<std::string> >(mWindow, "AUDIO DEVICE", false);
|
||||
std::vector<std::string> transitions;
|
||||
transitions.push_back("PCM");
|
||||
transitions.push_back("Speaker");
|
||||
transitions.push_back("Master");
|
||||
transitions.push_back("Digital");
|
||||
transitions.push_back("Analogue");
|
||||
if (Settings::getInstance()->getString("AudioDevice") != "") {
|
||||
if(std::find(transitions.begin(), transitions.end(), Settings::getInstance()->getString("AudioDevice")) == transitions.end()) {
|
||||
transitions.push_back(Settings::getInstance()->getString("AudioDevice"));
|
||||
}
|
||||
}
|
||||
for(auto it = transitions.cbegin(); it != transitions.cend(); it++)
|
||||
vol_dev->add(*it, *it, Settings::getInstance()->getString("AudioDevice") == *it);
|
||||
s->addWithLabel("AUDIO DEVICE", vol_dev);
|
||||
|
|
@ -134,14 +171,19 @@ void GuiMenu::openSoundSettings()
|
|||
#ifdef _RPI_
|
||||
// OMX player Audio Device
|
||||
auto omx_audio_dev = std::make_shared< OptionListComponent<std::string> >(mWindow, "OMX PLAYER AUDIO DEVICE", false);
|
||||
std::vector<std::string> devices;
|
||||
devices.push_back("local");
|
||||
devices.push_back("hdmi");
|
||||
devices.push_back("both");
|
||||
// USB audio
|
||||
devices.push_back("alsa:hw:0,0");
|
||||
devices.push_back("alsa:hw:1,0");
|
||||
for (auto it = devices.cbegin(); it != devices.cend(); it++)
|
||||
std::vector<std::string> omx_cards;
|
||||
// RPi Specific Audio Cards
|
||||
omx_cards.push_back("local");
|
||||
omx_cards.push_back("hdmi");
|
||||
omx_cards.push_back("both");
|
||||
omx_cards.push_back("alsa:hw:0,0");
|
||||
omx_cards.push_back("alsa:hw:1,0");
|
||||
if (Settings::getInstance()->getString("OMXAudioDev") != "") {
|
||||
if (std::find(omx_cards.begin(), omx_cards.end(), Settings::getInstance()->getString("OMXAudioDev")) == omx_cards.end()) {
|
||||
omx_cards.push_back(Settings::getInstance()->getString("OMXAudioDev"));
|
||||
}
|
||||
}
|
||||
for (auto it = omx_cards.cbegin(); it != omx_cards.cend(); it++)
|
||||
omx_audio_dev->add(*it, *it, Settings::getInstance()->getString("OMXAudioDev") == *it);
|
||||
s->addWithLabel("OMX PLAYER AUDIO DEVICE", omx_audio_dev);
|
||||
s->addSaveFunc([omx_audio_dev] {
|
||||
|
|
|
|||
Loading…
Reference in a new issue