mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: e74f1db278
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
This commit is contained in:
Binary file not shown.
@@ -325,7 +325,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
|
|
||||||
puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT ".");
|
puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT ".");
|
||||||
if (my_system(AUDIOPLAYER_START_SCRIPT) != 0)
|
if (my_system(AUDIOPLAYER_START_SCRIPT) != 0)
|
||||||
perror("Datei " AUDIOPLAYER_START_SCRIPT " fehlt.Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_START_SCRIPT " not found. Please create if needed.\n");
|
perror(AUDIOPLAYER_START_SCRIPT " failed");
|
||||||
|
|
||||||
int res = show();
|
int res = show();
|
||||||
|
|
||||||
@@ -337,7 +337,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
|
|
||||||
puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT ".");
|
puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT ".");
|
||||||
if (my_system(AUDIOPLAYER_END_SCRIPT) != 0)
|
if (my_system(AUDIOPLAYER_END_SCRIPT) != 0)
|
||||||
perror("Datei " AUDIOPLAYER_END_SCRIPT " fehlt. Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_END_SCRIPT " not found. Please create if needed.\n");
|
perror(AUDIOPLAYER_END_SCRIPT " failed");
|
||||||
|
|
||||||
g_Zapit->unlockPlayBack();
|
g_Zapit->unlockPlayBack();
|
||||||
// Start Sectionsd
|
// Start Sectionsd
|
||||||
@@ -437,7 +437,7 @@ int CAudioPlayerGui::show()
|
|||||||
if (m_screensaver)
|
if (m_screensaver)
|
||||||
{
|
{
|
||||||
screensaver(false);
|
screensaver(false);
|
||||||
if (msg < CRCInput::RC_MaxRC) {
|
if (msg <= CRCInput::RC_MaxRC) {
|
||||||
// ignore first keypress - just quit the screensaver
|
// ignore first keypress - just quit the screensaver
|
||||||
g_RCInput->clearRCMsg();
|
g_RCInput->clearRCMsg();
|
||||||
continue;
|
continue;
|
||||||
|
Reference in New Issue
Block a user