mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Stefan Seyfried
2013-05-24 20:24:39 +02:00
parent 95813ab60e 00dd399ff9
commit a7f1e0e25e
50 changed files with 1106 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/movieplayer.cpp
View File

@@ -31,6 +31,7 @@
#include <global.h>
#include <neutrino.h>
#include <gui/audiomute.h>
#include <gui/movieplayer.h>
#include <gui/infoviewer.h>
#include <gui/timeosd.h>
@@ -381,6 +382,7 @@ bool CMoviePlayerGui::SelectFile()
menu_ret = moviebrowser->getMenuRet();
}
else { // filebrowser
CAudioMute::getInstance()->enableMuteIcon(false);
if (filebrowser->exec(Path_local.c_str()) == true) {
Path_local = filebrowser->getCurrentDir();
CFile *file;
@@ -416,6 +418,7 @@ bool CMoviePlayerGui::SelectFile()
}
} else
menu_ret = filebrowser->getMenuRet();
CAudioMute::getInstance()->enableMuteIcon(true);
}
if(ret && file_name.empty()) {
std::string::size_type pos = full_name.find_last_of('/');
@@ -507,6 +510,8 @@ void CMoviePlayerGui::PlayFile(void)
}
}
CAudioMute::getInstance()->enableMuteIcon(true);
while (playstate >= CMoviePlayerGui::PLAY)
{
if (update_lcd) {
@@ -742,6 +747,8 @@ void CMoviePlayerGui::PlayFile(void)
restoreNeutrino();
CAudioMute::getInstance()->enableMuteIcon(false);
if (g_settings.mode_clock)
InfoClock->StartClock();
}