From 0958eb9ed96dfc96a27c753b6ad151acb323d5ca Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 10 Mar 2011 17:45:54 +0000 Subject: [PATCH] unmute if volume plus git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1282 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b921bbc2352c4111bfe812b13f59741b2d14c12f Author: Jacek Jendrzej Date: 2011-03-10 (Thu, 10 Mar 2011) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index fdc82fd8e..9ad2a1f29 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3730,7 +3730,7 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy); if(g_settings.mode_clock){ clock_height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getHeight(); } - x = sw - dx; + x = sw - dx - 6; y += clock_height; break; case 1:// upper left @@ -3778,6 +3778,9 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy); g_settings.current_volume += g_settings.current_volume_step; else g_settings.current_volume = 100; + if(current_muted){ + AudioMute( false, true); + } } else if (msg == CRCInput::RC_minus || msg == CRCInput::RC_left) { //FIXME if (g_settings.current_volume > g_settings.current_volume_step)