Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #220 from pjft/OMX-Volume-Control

Browse source 
Making OMXPlayer respect sound settings
This commit is contained in:
Jools Wills 2017-08-23 02:38:33 +01:00 committed by GitHub
parent e0eb0f6ae1 cf3b641c3c
commit 6d95146df6
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
es-core/src/components/VideoPlayerComponent.cpp
View file

@ -11,6 +11,14 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <math.h>
class VolumeControl
{
public:
static std::shared_ptr<VolumeControl> & getInstance();
int getVolume() const;
};
VideoPlayerComponent::VideoPlayerComponent(Window* window, std::string path) : VideoPlayerComponent::VideoPlayerComponent(Window* window, std::string path) :
VideoComponent(window), VideoComponent(window),
@ -101,10 +109,16 @@ void VideoPlayerComponent::startVideo()
const char* argv[] = { "", "--layer", "10010", "--loop", "--no-osd", "--aspect-mode", "letterbox", "--vol", "0", "-o", "both","--win", buf, "--no-ghost-box", "", "", "", "", NULL }; const char* argv[] = { "", "--layer", "10010", "--loop", "--no-osd", "--aspect-mode", "letterbox", "--vol", "0", "-o", "both","--win", buf, "--no-ghost-box", "", "", "", "", NULL };
// check if we want to mute the audio // check if we want to mute the audio
if (!Settings::getInstance()->getBool("VideoAudio")) if (!Settings::getInstance()->getBool("VideoAudio") || (float)VolumeControl::getInstance()->getVolume() == 0)
{ {
argv[8] = "-1000000"; argv[8] = "-1000000";
} }
else
{
float percentVolume = (float)VolumeControl::getInstance()->getVolume();
int OMXVolume = (int)(log(percentVolume/100)*2000);
argv[8] = std::to_string(OMXVolume).c_str();
}
// test if there's a path for possible subtitles, meaning we're a screensaver video // test if there's a path for possible subtitles, meaning we're a screensaver video
if (!subtitlePath.empty()) if (!subtitlePath.empty())