mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +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

20
src/neutrino.cpp
View File

@@ -81,6 +81,7 @@
#include "gui/plugins.h"
#include "gui/rc_lock.h"
#include "gui/scan_setup.h"
#include "gui/sleeptimer.h"
#include "gui/start_wizard.h"
#include "gui/videosettings.h"
@@ -2155,9 +2156,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
//if(!g_settings.cacheTXT)
// tuxtxt_stop();
g_RCInput->clearRCMsg();
// restore mute symbol
if (current_muted)
g_audioMute->AudioMute(current_muted, true);
if(g_settings.mode_clock)
InfoClock->StartClock();
StartSubtitles();
@@ -2168,9 +2166,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
if(g_settings.mode_clock)
InfoClock->StopClock();
mainMenu.exec(NULL, "");
// restore mute symbol
if (current_muted)
g_audioMute->AudioMute(current_muted, true);
if(g_settings.mode_clock)
InfoClock->StartClock();
StartSubtitles();
@@ -2491,13 +2486,14 @@ _show:
//_show:
if(msg == CRCInput::RC_ok)
{
if (g_settings.channellist_new_zap_mode > 0) /* allow or active */
g_audioMute->enableMuteIcon(false);
if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0)
nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP!
else
nNewChannel = bouquetList->exec(true);
// restore mute symbol
if (current_muted)
g_audioMute->AudioMute(current_muted, true);
if (g_settings.channellist_new_zap_mode > 0) /* allow or active */
g_audioMute->enableMuteIcon(true);
} else if(msg == CRCInput::RC_sat) {
SetChannelMode(LIST_MODE_SAT);
nNewChannel = bouquetList->exec(true);
@@ -2691,6 +2687,12 @@ _repeat:
g_videoSettings->SwitchFormat();
return messages_return::handled;
}
else if( msg == CRCInput::RC_sleep ) {
CSleepTimerWidget *sleepTimer = new CSleepTimerWidget;
sleepTimer->exec(NULL, "");
delete sleepTimer;
return messages_return::handled;
}
#ifdef SCREENSHOT
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
//video+osd scaled to osd size