From f7b8509f05e826cd4c4d6e8cd0da1e7e67802d95 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Feb 2013 21:23:15 +0100 Subject: [PATCH 1/3] audioplayer.cpp: reducing console spam Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/57317aae31097ec8e2ee127b3463c6822b387838 Author: vanhofen Date: 2013-02-27 (Wed, 27 Feb 2013) Origin message was: ------------------ - audioplayer.cpp: reducing console spam --- src/gui/audioplayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 2e36d2076..0a3281788 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -325,7 +325,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey) puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT "."); 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(); @@ -337,7 +337,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey) puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT "."); 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(); // Start Sectionsd From 3fabc8e493a7c2c6a9579ee5d1d6ab17833fd03e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 28 Feb 2013 09:49:27 +0100 Subject: [PATCH 2/3] icons: remove unneeded movieplayer.raw Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c0959cc5f56b9cc65cd9c79969a070417af46237 Author: vanhofen Date: 2013-02-28 (Thu, 28 Feb 2013) Origin message was: ------------------ - icons: remove unneeded movieplayer.raw --- data/icons/movieplayer.raw | Bin 80657 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/icons/movieplayer.raw diff --git a/data/icons/movieplayer.raw b/data/icons/movieplayer.raw deleted file mode 100644 index c8788f5bf1c0347d32acf902c1ab6b8a262850a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80657 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 From 5bf5d830479e0f3fa9235ab3303eef7a8f33cc62 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 28 Feb 2013 10:02:59 +0100 Subject: [PATCH 3/3] audioplayer.cpp: fix comparison operator Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ca8f8251ed32e2833d6fb030a3f14f115986e3e4 Author: vanhofen Date: 2013-02-28 (Thu, 28 Feb 2013) Origin message was: ------------------ - audioplayer.cpp: fix comparison operator --- src/gui/audioplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 0a3281788..12644aa42 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -437,7 +437,7 @@ int CAudioPlayerGui::show() if (m_screensaver) { screensaver(false); - if (msg < CRCInput::RC_MaxRC) { + if (msg <= CRCInput::RC_MaxRC) { // ignore first keypress - just quit the screensaver g_RCInput->clearRCMsg(); continue;