From d5953343ea964f575aad6d7fc606046200661fb6 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 31 Jul 2016 16:18:27 +0200
Subject: [PATCH] Revert "- disable new tmdb code; we use imdb"

This reverts commit 423b4d858e45edf3a3b0b5a1e09a556a67088802.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/3eb2b8aaf41a0ed0d55df0379e1377c8ae3fc749
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



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

diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 2ba9a2c7b..5156845f1 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -518,7 +518,6 @@ bool CEpgData::isCurrentEPG(const t_channel_id channel_id)
 	return false;
 }
 
-#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;
@@ -856,7 +855,6 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*m
 
 	return res;
 }
-#endif
 
 int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_startzeit, bool doLoop, bool callFromfollowlist )
 {
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index 9903c0fbc..71c8cff47 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -110,9 +110,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 );
-#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 c88d872f9..ee20f30de 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1077,7 +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
-#if 0
 			if (fileplay)
 			{
 				CMoviePlayerGui::getInstance().setFromInfoviewer(true);
@@ -1085,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 d1511d4c3..6961e6108 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1953,7 +1953,6 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 						unlink(fname.c_str());
 					refresh();
 				}
-#if 0
 			}else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"){
 				//add TMDB Cover
 				fname = m_movieSelectionHandler->file.Name.c_str();
@@ -1974,7 +1973,6 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 					if (tmdb)
 						delete tmdb;
 				}
-#endif
 			}
 		}
 	}
@@ -2044,11 +2042,9 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 	{
 		if (m_movieSelectionHandler != NULL)
 		{
-#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 212c350ff..3096b94cf 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1560,14 +1560,12 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				SetPosition(1000 * (hh * 3600 + mm * 60 + ss), true);
 
 		} else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) {
-#if 0
 			if (fromInfoviewer)
 			{
 				g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration());
 				fromInfoviewer = false;
 			}
 			else
-#endif
 			callInfoViewer();
 			update_lcd = true;
 			clearSubtitle();