From 488876327b654cd1e47528ae12f47d00aaa20441 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Thu, 8 Apr 2021 22:26:12 +0200 Subject: [PATCH] - - imdb/tmdb: more unifications Signed-off-by: Thilo Graf --- src/gui/Makefile.am | 4 ++-- src/gui/epgview.cpp | 2 +- src/gui/epgview.h | 6 +++--- src/gui/{imdb.cpp => mdb-imdb.cpp} | 4 ++-- src/gui/{imdb.h => mdb-imdb.h} | 0 src/gui/{tmdb.cpp => mdb-tmdb.cpp} | 28 +++++++++++++++------------- src/gui/{tmdb.h => mdb-tmdb.h} | 8 ++++---- src/gui/moviebrowser/mb.cpp | 4 ++-- src/gui/moviebrowser/mb.h | 2 +- 9 files changed, 30 insertions(+), 28 deletions(-) rename src/gui/{imdb.cpp => mdb-imdb.cpp} (99%) rename src/gui/{imdb.h => mdb-imdb.h} (100%) rename src/gui/{tmdb.cpp => mdb-tmdb.cpp} (94%) rename src/gui/{tmdb.h => mdb-tmdb.h} (97%) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index efede7ae6..180279f2d 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -61,11 +61,12 @@ libneutrino_gui_a_SOURCES = \ filebrowser.cpp \ followscreenings.cpp \ imageinfo.cpp \ - imdb.cpp \ info_menue.cpp \ infoviewer.cpp \ infoviewer_bb.cpp \ keybind_setup.cpp \ + mdb-imdb.cpp \ + mdb-tmdb.cpp \ mediaplayer.cpp \ mediaplayer_setup.cpp \ miscsettings_menu.cpp \ @@ -100,7 +101,6 @@ libneutrino_gui_a_SOURCES = \ subchannel_select.cpp \ themes.cpp \ timeosd.cpp \ - tmdb.cpp \ update.cpp \ update_menue.cpp \ update_settings.cpp \ diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 7a6f9572f..eaae95ae2 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -133,7 +133,7 @@ CEpgData::CEpgData() imdb = CIMDB::getInstance(); imdb_active = false; - tmdb = cTmdb::getInstance(); + tmdb = CTMDB::getInstance(); tmdb_active = false; movie_filename.clear(); } diff --git a/src/gui/epgview.h b/src/gui/epgview.h index 87ce78752..fa6c6d347 100644 --- a/src/gui/epgview.h +++ b/src/gui/epgview.h @@ -35,8 +35,8 @@ #include -#include -#include +#include +#include #include #include "widget/menue.h" #include "widget/navibar.h" @@ -54,7 +54,7 @@ class CEpgData CChannelEventList followlist; CEPGData epgData; CIMDB *imdb; - cTmdb *tmdb; + CTMDB *tmdb; CComponentsHeader *header; CNaviBar *Bottombox; diff --git a/src/gui/imdb.cpp b/src/gui/mdb-imdb.cpp similarity index 99% rename from src/gui/imdb.cpp rename to src/gui/mdb-imdb.cpp index 21cd04372..1dcc3ea04 100644 --- a/src/gui/imdb.cpp +++ b/src/gui/mdb-imdb.cpp @@ -1,5 +1,5 @@ /* - imdb + Movie Database - OMDb/IMDb (C) 2009-2016 NG-Team (C) 2016 NI-Team @@ -37,7 +37,7 @@ #include #include -#include "imdb.h" +#include "mdb-imdb.h" CIMDB::CIMDB() diff --git a/src/gui/imdb.h b/src/gui/mdb-imdb.h similarity index 100% rename from src/gui/imdb.h rename to src/gui/mdb-imdb.h diff --git a/src/gui/tmdb.cpp b/src/gui/mdb-tmdb.cpp similarity index 94% rename from src/gui/tmdb.cpp rename to src/gui/mdb-tmdb.cpp index 012cf7e03..eb5ea60ed 100644 --- a/src/gui/tmdb.cpp +++ b/src/gui/mdb-tmdb.cpp @@ -1,4 +1,6 @@ /* + Movie Database - TMDb + Copyright (C) 2015-2020 TangoCash License: GPLv2 @@ -42,17 +44,17 @@ #include -#include "tmdb.h" +#include "mdb-tmdb.h" -cTmdb* cTmdb::getInstance() +CTMDB* CTMDB::getInstance() { - static cTmdb* tmdb = NULL; + static CTMDB* tmdb = NULL; if(!tmdb) - tmdb = new cTmdb(); + tmdb = new CTMDB(); return tmdb; } -cTmdb::cTmdb() +CTMDB::CTMDB() { #ifdef TMDB_API_KEY key = TMDB_API_KEY; @@ -62,12 +64,12 @@ cTmdb::cTmdb() hintbox = NULL; } -cTmdb::~cTmdb() +CTMDB::~CTMDB() { cleanup(); } -void cTmdb::setTitle(std::string epgtitle) +void CTMDB::setTitle(std::string epgtitle) { minfo.epgtitle = epgtitle; @@ -86,7 +88,7 @@ void cTmdb::setTitle(std::string epgtitle) } } -bool cTmdb::GetData(std::string url, Json::Value *root) +bool CTMDB::GetData(std::string url, Json::Value *root) { std::string answer; if (!getUrl(url, answer)) @@ -102,7 +104,7 @@ bool cTmdb::GetData(std::string url, Json::Value *root) return true; } -bool cTmdb::GetMovieDetails(std::string lang, bool second) +bool CTMDB::GetMovieDetails(std::string lang, bool second) { printf("[TMDB]: %s\n",__func__); Json::Value root; @@ -189,7 +191,7 @@ bool cTmdb::GetMovieDetails(std::string lang, bool second) return false; } -std::string cTmdb::getEPGText() +std::string CTMDB::getEPGText() { std::string epgtext(""); @@ -212,7 +214,7 @@ std::string cTmdb::getEPGText() return epgtext; } -std::string cTmdb::getMovieText() +std::string CTMDB::getMovieText() { std::string movietext(""); @@ -230,13 +232,13 @@ std::string cTmdb::getMovieText() return movietext; } -void cTmdb::cleanup() +void CTMDB::cleanup() { if (access(TMDB_COVER, F_OK) == 0) unlink(TMDB_COVER); } -void cTmdb::selectResult(Json::Value elements, int results, int &use_result) +void CTMDB::selectResult(Json::Value elements, int results, int &use_result) { if(hintbox){ hintbox->hide(); diff --git a/src/gui/tmdb.h b/src/gui/mdb-tmdb.h similarity index 97% rename from src/gui/tmdb.h rename to src/gui/mdb-tmdb.h index 12214385b..14459b5f4 100644 --- a/src/gui/tmdb.h +++ b/src/gui/mdb-tmdb.h @@ -46,7 +46,7 @@ typedef struct { std::string cast; }tmdbinfo; -class cTmdb +class CTMDB { private: tmdbinfo minfo; @@ -57,9 +57,9 @@ class cTmdb void selectResult(Json::Value elements, int results, int &used_result); public: - cTmdb(); - ~cTmdb(); - static cTmdb* getInstance(); + CTMDB(); + ~CTMDB(); + static CTMDB* getInstance(); void setTitle(std::string epgtitle); std::string getEPGText(); std::string getMovieText(); diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 08f871200..49c1d2e36 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -51,7 +51,7 @@ #include "mb_functions.h" #include "mb_help.h" #include -#include +#include #include #include #include @@ -2156,7 +2156,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) extension = "." + extension; str_replace(extension, ".jpg", cover_file); printf("TMDB: %s : %s\n",m_movieSelectionHandler->file.Name.c_str(),cover_file.c_str()); - cTmdb* tmdb = cTmdb::getInstance(); + CTMDB* tmdb = CTMDB::getInstance(); if (tmdb) { tmdb->setTitle(m_movieSelectionHandler->epgTitle); diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index ce39e0a88..f7c990555 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -61,7 +61,7 @@ #include #include #include -#include +#include #define MAX_NUMBER_OF_BOOKMARK_ITEMS MI_MOVIE_BOOK_USER_MAX // we just use the same size as used in Movie info (MAX_NUMBER_OF_BOOKMARK_ITEMS is used for the number of menu items) #define MOVIEBROWSER_SETTINGS_FILE CONFIGDIR "/moviebrowser.conf"