From 6f9255e0c4b3e77dd212eab6f8fe4458b5459460 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Wed, 3 Aug 2016 00:53:41 +0200
Subject: [PATCH] allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/a66b6677ab3a0fb8842fa987fd55a0a2b8447c09
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/gui/epgview.cpp      | 3 ---
 src/gui/epgview.h        | 3 ---
 src/gui/infoviewer.cpp   | 3 ---
 src/gui/moviebrowser.cpp | 5 -----
 src/gui/movieplayer.cpp  | 3 ---
 5 files changed, 17 deletions(-)

diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index c91ffe7ad..0f473470e 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -546,8 +546,6 @@ bool CEpgData::isCurrentEPG(const t_channel_id channel_id)
 	return false;
 }
 
-//NI
-#if 0
 int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*mp_duration*/, bool doLoop)
 {
 	int res = menu_return::RETURN_REPAINT;
@@ -580,7 +578,6 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*m
 		mp_movie_info->epgInfo2 = epgTextSwitch;
 	return res;
 }
-#endif
 
 int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_startzeit, bool doLoop, bool callFromfollowlist, bool mp_info )
 {
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index 7f6b14a01..41b37bec0 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -112,10 +112,7 @@ class CEpgData
 		~CEpgData();
 		void start( );
 		int show(const t_channel_id channel_id, uint64_t id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false, bool mp_info = false );
-//NI
-#if 0
 		int show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position = 1, int mp_duration = 1, bool doLoop = true);
-#endif
 		void hide();
 };
 
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 5037a35d0..44904f88d 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1077,8 +1077,6 @@ void CInfoViewer::loop(bool show_dot)
 			g_RCInput->postMsg (msg, 0);
 			res = messages_return::cancel_info;
 		} else if (msg == CRCInput::RC_info) { //NI
-//NI
-#if 0
 			if (fileplay)
 			{
 				CMoviePlayerGui::getInstance().setFromInfoviewer(true);
@@ -1086,7 +1084,6 @@ void CInfoViewer::loop(bool show_dot)
 				hideIt = true;
 			}
 			else
-#endif
 				g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0);
 			res = messages_return::cancel_info;
 		} else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index e5cf2fe73..19507c500 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1956,7 +1956,6 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 					refresh();
 				}
 			}
-#if 0
 			else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 			{
 				//add TMDB Cover
@@ -1979,7 +1978,6 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 						delete tmdb;
 				}
 			}
-#endif
 		}
 	}
 	else if (msg == CRCInput::RC_home)
@@ -2048,12 +2046,9 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 	{
 		if (m_movieSelectionHandler != NULL)
 		{
-//NI
-#if 0
 			if (m_settings.gui == MB_GUI_MOVIE_INFO &&  m_windowFocus == MB_FOCUS_MOVIE_INFO)
 				g_EpgData->show_mp(m_movieSelectionHandler,0,0);
 			else
-#endif
 				m_movieInfo.showMovieInfo(*m_movieSelectionHandler);
 			refresh();
 		}
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index de4dc3c5a..ad8eef431 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1560,15 +1560,12 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				SetPosition(1000 * (hh * 3600 + mm * 60 + ss), true);
 
 		} else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) {
-//NI
-#if 0
 			if (fromInfoviewer)
 			{
 				g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration());
 				fromInfoviewer = false;
 			}
 			else
-#endif
 				callInfoViewer();
 			update_lcd = true;
 			clearSubtitle();