allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)

Origin commit data
------------------
Commit: a66b6677ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

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

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 )
 {

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();
 };
 

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())) {

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();
 		}

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();