mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-15 20:22:07 +01:00
parent 55608c905f b0dfcd11ed
commit 59b887d87a
77 changed files with 1056 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/driver/volume.cpp
View File

@@ -80,6 +80,15 @@ void CVolume::setvol(int vol)
CZapit::getInstance()->SetVolume(vol);
}
void CVolume::setVolumeExt(int vol)
{
g_settings.current_volume = vol;
CZapit::getInstance()->SetVolume(vol);
CVFD::getInstance()->showVolume(vol);
if (CNeutrinoApp::getInstance()->isMuted() && vol > 0)
CAudioMute::getInstance()->AudioMute(false, true);
}
void CVolume::setVolume(const neutrino_msg_t key)
{
if (!g_RCInput) /* don't die... */