From 423b4d858e45edf3a3b0b5a1e09a556a67088802 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 29 Jul 2016 21:10:13 +0200 Subject: [PATCH] disable new tmdb code; we use imdb Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/073d867d8111da5878cd16b5522cc8e5cf3760d2 Author: vanhofen Date: 2016-07-29 (Fri, 29 Jul 2016) Origin message was: ------------------ - disable new tmdb code; we use imdb ------------------ No further description and justification available within origin commit message! ------------------ 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 insertions(+) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index f53fcc5e5..2426776b4 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -518,6 +518,7 @@ 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; @@ -855,6 +856,7 @@ 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 71c8cff47..9903c0fbc 100644 --- a/src/gui/epgview.h +++ b/src/gui/epgview.h @@ -110,7 +110,9 @@ 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 ee20f30de..c88d872f9 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1077,6 +1077,7 @@ 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); @@ -1084,6 +1085,7 @@ 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 6961e6108..d1511d4c3 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1953,6 +1953,7 @@ 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(); @@ -1973,6 +1974,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) if (tmdb) delete tmdb; } +#endif } } } @@ -2042,9 +2044,11 @@ 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 3096b94cf..212c350ff 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1560,12 +1560,14 @@ 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();