From 600711d3cc135a366336bae46eb94c0c64a19c07 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 12 Feb 2010 17:30:35 +0000
Subject: [PATCH] move hardcoded keys processing to the end, so user can
 redefine

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@328 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/5e3b686db889202ad7fe81e7485ccf205b19260f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-12 (Fri, 12 Feb 2010)
---
 src/gui/movieplayer.cpp | 64 ++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 48e013349..42ccd9947 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1062,38 +1062,6 @@ void CMoviePlayerGui::PlayFile(void)
 			}
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_audio) {
 			showaudioselectdialog = true;
-		} else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) {
-			if (timeshift)
-				g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());	// UTF-8
-
-			else {
-				if (isMovieBrowser) {
-					g_file_epg = p_movie_info->epgTitle;
-					g_file_epg1 = p_movie_info->epgInfo1;
-					g_InfoViewer->showTitle(0, p_movie_info->epgChannel.c_str(), 0, 0);	// UTF-8
-
-				} else {
-					char temp_name[255];
-					char *slash = strrchr(filename, '/');
-					if (slash) {
-						slash++;
-						int len = strlen(slash);
-						for (int i = 0; i < len; i++) {
-							if (slash[i] == '_')
-								temp_name[i] = ' ';
-							else
-								temp_name[i] = slash[i];
-						}
-						temp_name[len] = 0;
-					}
-					g_file_epg = "";
-					g_file_epg1 = "";
-					g_InfoViewer->showTitle(0, temp_name, 0, 0);	// UTF-8
-				}
-				CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
-				update_lcd = true;
-				//showHelpTS();
-			}
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_time) {
 			if (FileTime.IsVisible()) {
 				if (FileTime.GetMode() == CTimeOSD::MODE_ASC) {
@@ -1148,6 +1116,38 @@ void CMoviePlayerGui::PlayFile(void)
 				FileTime.updatePos(file_prozent);
 				time_forced = true;
 			}
+		} else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) {
+			if (timeshift)
+				g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());	// UTF-8
+
+			else {
+				if (isMovieBrowser) {
+					g_file_epg = p_movie_info->epgTitle;
+					g_file_epg1 = p_movie_info->epgInfo1;
+					g_InfoViewer->showTitle(0, p_movie_info->epgChannel.c_str(), 0, 0);	// UTF-8
+
+				} else {
+					char temp_name[255];
+					char *slash = strrchr(filename, '/');
+					if (slash) {
+						slash++;
+						int len = strlen(slash);
+						for (int i = 0; i < len; i++) {
+							if (slash[i] == '_')
+								temp_name[i] = ' ';
+							else
+								temp_name[i] = slash[i];
+						}
+						temp_name[len] = 0;
+					}
+					g_file_epg = "";
+					g_file_epg1 = "";
+					g_InfoViewer->showTitle(0, temp_name, 0, 0);	// UTF-8
+				}
+				CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
+				update_lcd = true;
+				//showHelpTS();
+			}
 		} else if (msg == CRCInput::RC_1) {	// Jump Backwards 1 minute
 			//update_lcd = true;
 			playback->SetPosition(-60 * 1000);