mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-22 22:25:38 +00:00
e7bc6f7006
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
249 lines
7 KiB
CMake
249 lines
7 KiB
CMake
cmake_minimum_required(VERSION 2.8)
|
|
|
|
option(GLES "Set to ON if targeting OpenGL ES" ${GLES})
|
|
option(GL "Set to ON if targeting Desktop OpenGL" ${GL})
|
|
|
|
project(emulationstation-all)
|
|
|
|
#-------------------------------------------------------------------------------
|
|
#add local find scripts to CMAKE path
|
|
LIST(APPEND CMAKE_MODULE_PATH
|
|
${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utils
|
|
${CMAKE_CURRENT_SOURCE_DIR}/CMake/Packages
|
|
)
|
|
|
|
#-------------------------------------------------------------------------------
|
|
#set up OpenGL system variable
|
|
if(GLES)
|
|
set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used")
|
|
elseif(GL)
|
|
set(GLSystem "Desktop OpenGL" CACHE STRING "The OpenGL system to be used")
|
|
#-------------------------------------------------------------------------------
|
|
#check if we're running on Raspberry Pi
|
|
elseif(EXISTS "/opt/vc/include/bcm_host.h")
|
|
MESSAGE("bcm_host.h found")
|
|
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
|
|
EXISTS "/usr/lib/aarch64-linux-gnu/libMali.so" OR
|
|
EXISTS "/usr/lib/arm-linux-gnueabihf/mali-egl/libmali.so" OR
|
|
EXISTS "/usr/lib/arm-linux-gnueabihf/libmali.so")
|
|
MESSAGE("libMali.so found")
|
|
set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used")
|
|
else()
|
|
set(GLSystem "Desktop OpenGL" CACHE STRING "The OpenGL system to be used")
|
|
endif(GLES)
|
|
|
|
set_property(CACHE GLSystem PROPERTY STRINGS "Desktop OpenGL" "OpenGL ES")
|
|
|
|
#finding necessary packages
|
|
#-------------------------------------------------------------------------------
|
|
if(${GLSystem} MATCHES "Desktop OpenGL")
|
|
find_package(OpenGL REQUIRED)
|
|
else()
|
|
find_package(OpenGLES REQUIRED)
|
|
endif()
|
|
find_package(Freetype REQUIRED)
|
|
find_package(FreeImage REQUIRED)
|
|
find_package(SDL2 REQUIRED)
|
|
find_package(CURL REQUIRED)
|
|
find_package(VLC REQUIRED)
|
|
find_package(libCEC)
|
|
|
|
#add ALSA for Linux
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
find_package(ALSA REQUIRED)
|
|
endif()
|
|
|
|
#-------------------------------------------------------------------------------
|
|
#set up compiler flags and excutable names
|
|
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()
|
|
|
|
#-------------------------------------------------------------------------------
|
|
|
|
if(MSVC)
|
|
set(CMAKE_DEBUG_POSTFIX "d")
|
|
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
|
|
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
|
|
add_definitions(-DNOMINMAX)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") #multi-processor compilation
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") #multi-processor compilation
|
|
endif()
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
|
#check for G++ 4.7+
|
|
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE G++_VERSION)
|
|
if (G++_VERSION VERSION_LESS 4.7)
|
|
message(SEND_ERROR "You need at least G++ 4.7 to compile EmulationStation!")
|
|
endif()
|
|
|
|
#set up compiler flags for GCC
|
|
if (CMAKE_BUILD_TYPE MATCHES Debug)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes -O0") #support C++11 for std::, optimize
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O0")
|
|
else()
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes -O2") #support C++11 for std::, optimize
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2") #-s = strip binary
|
|
endif()
|
|
endif()
|
|
|
|
if(${GLSystem} MATCHES "Desktop OpenGL")
|
|
add_definitions(-DUSE_OPENGL_DESKTOP)
|
|
else()
|
|
add_definitions(-DUSE_OPENGL_ES)
|
|
endif()
|
|
|
|
#-------------------------------------------------------------------------------
|
|
#add include directories
|
|
set(COMMON_INCLUDE_DIRS
|
|
${FREETYPE_INCLUDE_DIRS}
|
|
${FreeImage_INCLUDE_DIRS}
|
|
${SDL2_INCLUDE_DIR}
|
|
${CURL_INCLUDE_DIR}
|
|
${VLC_INCLUDE_DIR}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/external
|
|
${CMAKE_CURRENT_SOURCE_DIR}/es-core/src
|
|
)
|
|
|
|
#add libCEC_INCLUDE_DIR
|
|
if(DEFINED libCEC_FOUND)
|
|
LIST(APPEND COMMON_INCLUDE_DIRS
|
|
${libCEC_INCLUDE_DIR}
|
|
)
|
|
endif()
|
|
|
|
#add ALSA for Linux
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
LIST(APPEND COMMON_INCLUDE_DIRS
|
|
${ALSA_INCLUDE_DIRS}
|
|
)
|
|
endif()
|
|
|
|
if(DEFINED BCMHOST)
|
|
LIST(APPEND COMMON_INCLUDE_DIRS
|
|
"/opt/vc/include"
|
|
"/opt/vc/include/interface/vcos"
|
|
"/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
|
|
${OPENGL_INCLUDE_DIR}
|
|
)
|
|
else()
|
|
LIST(APPEND COMMON_INCLUDE_DIRS
|
|
${OPENGLES_INCLUDE_DIR}
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
#-------------------------------------------------------------------------------
|
|
#define libraries and directories
|
|
if(DEFINED BCMHOST)
|
|
link_directories(
|
|
"/opt/vc/lib"
|
|
)
|
|
elseif(DEFINED VERO4K)
|
|
link_directories(
|
|
"/opt/vero3/lib"
|
|
)
|
|
endif()
|
|
|
|
set(COMMON_LIBRARIES
|
|
${FREETYPE_LIBRARIES}
|
|
${FreeImage_LIBRARIES}
|
|
${SDL2_LIBRARY}
|
|
${CURL_LIBRARIES}
|
|
${VLC_LIBRARIES}
|
|
pugixml
|
|
nanosvg
|
|
)
|
|
|
|
#add libCEC_LIBRARIES
|
|
if(DEFINED libCEC_FOUND)
|
|
if(DEFINED BCMHOST)
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
vchiq_arm
|
|
)
|
|
endif()
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
dl
|
|
${libCEC_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
#add ALSA for Linux
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
${ALSA_LIBRARY}
|
|
)
|
|
endif()
|
|
|
|
if(DEFINED BCMHOST)
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
bcm_host
|
|
brcmEGL
|
|
${OPENGLES_LIBRARIES}
|
|
)
|
|
elseif(DEFINED VERO4K)
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
EGL
|
|
${OPENGLES_LIBRARIES}
|
|
)
|
|
else()
|
|
if(MSVC)
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
winmm
|
|
)
|
|
endif()
|
|
if(${GLSystem} MATCHES "Desktop OpenGL")
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
${OPENGL_LIBRARIES}
|
|
)
|
|
else()
|
|
LIST(APPEND COMMON_LIBRARIES
|
|
EGL
|
|
${OPENGLES_LIBRARIES}
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# set up build directories
|
|
set(dir ${CMAKE_CURRENT_SOURCE_DIR})
|
|
set(EXECUTABLE_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
|
|
set(LIBRARY_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
|
|
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# add each component
|
|
|
|
add_subdirectory("external")
|
|
add_subdirectory("es-core")
|
|
add_subdirectory("es-app")
|