mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-30 20:17:31 +01:00
parent f153dcbd1e 2b6a033d8e
commit ea50f5f7bc
83 changed files with 913 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/pictureviewer.cpp
View File

@@ -53,6 +53,7 @@
#include <gui/components/cc.h>
#include <gui/widget/buttons.h>
#include <gui/widget/icons.h>
#include <gui/infoclock.h>
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
@@ -73,6 +74,7 @@
#include <video.h>
extern cVideo * videoDecoder;
extern CInfoClock *InfoClock;
//------------------------------------------------------------------------
bool comparePictureByDate (const CPicture& a, const CPicture& b)
@@ -255,6 +257,7 @@ int CPictureViewerGui::show()
m_currentTitle = m_audioPlayer->getAudioPlayerM_current();
CAudioMute::getInstance()->enableMuteIcon(false);
InfoClock->enableInfoClock(false);
while (loop)
{
@@ -639,6 +642,7 @@ int CPictureViewerGui::show()
hide();
CAudioMute::getInstance()->enableMuteIcon(true);
InfoClock->enableInfoClock(true);
return(res);
}