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

needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit

src/gui/pictureviewer.cpp

@@ -44,6 +44,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 
+#include <gui/audiomute.h>
 #include <gui/nfs.h>
 
 #include <gui/widget/buttons.h>
@@ -239,6 +240,8 @@ int CPictureViewerGui::show()
 	if (audioplayer)
 		m_currentTitle = m_audioPlayer->getAudioPlayerM_current();
 
+	CAudioMute::getInstance()->enableMuteIcon(false);
+
 	while (loop)
 	{
 		if (update)
@@ -621,6 +624,9 @@ int CPictureViewerGui::show()
 	}
 	hide();
 
+	if (!audioplayer)
+		CAudioMute::getInstance()->enableMuteIcon(true);
+
 	return(res);
 }