From b6f15cb8d912f8d1ac001a5a467061c3c3c62f37 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 17 Dec 2020 00:09:26 +0100 Subject: [PATCH] Fixed a compilation error on Raspberry Pi. --- es-app/src/VolumeControl.cpp | 6 +++--- es-app/src/VolumeControl.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es-app/src/VolumeControl.cpp b/es-app/src/VolumeControl.cpp index 27f43e300..a1c4e4bfd 100644 --- a/es-app/src/VolumeControl.cpp +++ b/es-app/src/VolumeControl.cpp @@ -26,11 +26,11 @@ // the rest of the volume control code in here compiles and works fine. #if defined(__linux__) #if defined(_RPI_) || defined(_VERO4K_) -const std::string VolumeControl::mixerName = "PCM"; +std::string VolumeControl::mixerName = "PCM"; #else -const std::string VolumeControl::mixerName = "Master"; +std::string VolumeControl::mixerName = "Master"; #endif -const std::string VolumeControl::mixerCard = "default"; +std::string VolumeControl::mixerCard = "default"; #endif std::weak_ptr VolumeControl::sInstance; diff --git a/es-app/src/VolumeControl.h b/es-app/src/VolumeControl.h index 9c28b3aba..3bc5e9844 100644 --- a/es-app/src/VolumeControl.h +++ b/es-app/src/VolumeControl.h @@ -30,8 +30,8 @@ class VolumeControl #if defined(__APPLE__) // #error TODO: Not implemented for MacOS yet!!! #elif defined(__linux__) - static const std::string mixerName; - static const std::string mixerCard; + static std::string mixerName; + static std::string mixerCard; int mixerIndex; snd_mixer_t* mixerHandle; snd_mixer_elem_t* mixerElem;