From 2d6da494abd64f2af40ae49cfc20c73b6df1e54f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 29 Apr 2018 03:13:08 +0200 Subject: [PATCH] imdb-support: renamed imdb->omdb Imdb is not really used directly, that is a bit misleading Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1af35f36c5775dc153a9907c04583f69cbf01e87 Author: Thilo Graf Date: 2018-04-29 (Sun, 29 Apr 2018) ------------------ This commit was generated by Migit --- src/gui/imdb.cpp | 2 +- src/gui/miscsettings_menu.cpp | 22 +++++++++++----------- src/gui/miscsettings_menu.h | 4 ++-- src/neutrino.cpp | 20 +++++++++++++++----- src/system/setting_helpers.h | 2 +- src/system/settings.h | 6 ++++-- 6 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/gui/imdb.cpp b/src/gui/imdb.cpp index a765eb431..6e450ba74 100644 --- a/src/gui/imdb.cpp +++ b/src/gui/imdb.cpp @@ -48,7 +48,7 @@ CIMDB::CIMDB() imdb_url = "http://www.omdbapi.com/?plot=full&r=json&i="; imdb_outfile = "/tmp/imdb.json"; omdb_apikey = "&apikey="; - omdb_apikey += g_settings.imdb_api_key; + omdb_apikey += g_settings.omdb_api_key; posterfile = "/tmp/imdb.jpg"; acc = 0; diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 78648a964..3d6f6e0eb 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -593,15 +593,15 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices() ms_oservices->addItem(GenericMenuSeparator); #endif - // imdb (omdb) - imdb_onoff = new CMenuOptionChooser(LOCALE_IMDB_ENABLED, &g_settings.imdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, check_imdb_api_key()); -// imdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED); - ms_oservices->addItem(imdb_onoff); + // omdb + omdb_onoff = new CMenuOptionChooser(LOCALE_IMDB_ENABLED, &g_settings.omdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, check_omdb_api_key()); +// omdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED); + ms_oservices->addItem(omdb_onoff); #if ENABLE_OMDB_KEY_MANAGE changeNotify(LOCALE_IMDB_API_KEY, NULL); - CKeyboardInput imdb_api_key_input(LOCALE_IMDB_API_KEY, &g_settings.imdb_api_key, 8, this); - mf = new CMenuForwarder(LOCALE_IMDB_API_KEY, true, imdb_api_key_short, &imdb_api_key_input); + CKeyboardInput omdb_api_key_input(LOCALE_IMDB_API_KEY, &g_settings.omdb_api_key, 8, this); + mf = new CMenuForwarder(LOCALE_IMDB_API_KEY, true, omdb_api_key_short, &omdb_api_key_input); // mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_API_KEY); ms_oservices->addItem(mf); @@ -758,12 +758,12 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data* } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_IMDB_API_KEY)) { - g_settings.imdb_enabled = g_settings.imdb_enabled && check_imdb_api_key(); - if (g_settings.imdb_enabled) - imdb_api_key_short = g_settings.imdb_api_key.substr(0, 8) + "..."; + g_settings.omdb_enabled = g_settings.omdb_enabled && check_omdb_api_key(); + if (g_settings.omdb_enabled) + omdb_api_key_short = g_settings.omdb_api_key.substr(0, 8) + "..."; else - imdb_api_key_short.clear(); - imdb_onoff->setActive(check_imdb_api_key()); + omdb_api_key_short.clear(); + omdb_onoff->setActive(check_omdb_api_key()); } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID)) { diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index 49b36b7d3..2dfcc0790 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -48,7 +48,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver CMenuOptionChooser * epg_read_frequently; CMenuOptionChooser * epg_scan; CMenuOptionChooser * tmdb_onoff; - CMenuOptionChooser * imdb_onoff; + CMenuOptionChooser * omdb_onoff; CMenuOptionChooser * youtube_onoff; CMenuOptionChooser * shoutcast_onoff; CMenuForwarder * epg_dir; @@ -60,7 +60,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver std::string epg_max_events; std::string tmdb_api_key_short; - std::string imdb_api_key_short; + std::string omdb_api_key_short; std::string youtube_dev_id_short; std::string shoutcast_dev_id_short; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 490bbf498..45e9d95ad 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -936,14 +936,13 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.audioplayer_repeat_on = configfile.getInt32("audioplayer_repeat_on",0); g_settings.audioplayer_show_playlist = configfile.getInt32("audioplayer_show_playlist",1); g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",1); - g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","fa1669MuiRPorUBw"); //NI - g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); - g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id(); //Movie-Player g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI g_settings.movieplayer_display_playtime = configfile.getInt32("movieplayer_display_playtime", 0); + + //online services g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM"); //NI g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id(); @@ -951,6 +950,14 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1); g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key(); + g_settings.omdb_api_key = configfile.getString("omdb_api_key","XXXXXXXX"); + g_settings.omdb_enabled = configfile.getInt32("omdb_enabled", 1); + g_settings.omdb_enabled = g_settings.omdb_enabled && check_omdb_api_key(); + + g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","fa1669MuiRPorUBw"); + g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); + g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id(); + //Filebrowser g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1); g_settings.filebrowser_sortmethod = configfile.getInt32("filebrowser_sortmethod", 1); @@ -1648,17 +1655,20 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "audioplayer_repeat_on", g_settings.audioplayer_repeat_on ); configfile.setInt32( "audioplayer_show_playlist", g_settings.audioplayer_show_playlist ); configfile.setInt32( "audioplayer_enable_sc_metadata", g_settings.audioplayer_enable_sc_metadata ); - configfile.setString( "shoutcast_dev_id", g_settings.shoutcast_dev_id ); - configfile.setInt32( "shoutcast_enabled", g_settings.shoutcast_enabled ); //Movie-Player configfile.setInt32( "movieplayer_repeat_on", g_settings.movieplayer_repeat_on ); configfile.setInt32( "movieplayer_bisection_jump", g_settings.movieplayer_bisection_jump ); //NI configfile.setInt32( "movieplayer_display_playtime", g_settings.movieplayer_display_playtime ); + //online services configfile.setString( "youtube_dev_id", g_settings.youtube_dev_id ); configfile.setInt32( "youtube_enabled", g_settings.youtube_enabled ); configfile.setString( "tmdb_api_key", g_settings.tmdb_api_key ); configfile.setInt32( "tmdb_enabled", g_settings.tmdb_enabled ); + configfile.setString( "omdb_api_key", g_settings.omdb_api_key ); + configfile.setInt32( "omdb_enabled", g_settings.omdb_enabled ); + configfile.setString( "shoutcast_dev_id", g_settings.shoutcast_dev_id ); + configfile.setInt32( "shoutcast_enabled", g_settings.shoutcast_enabled ); //Filebrowser configfile.setInt32("filebrowser_showrights", g_settings.filebrowser_showrights); diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 684477da5..392738bda 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -162,6 +162,6 @@ class CAutoModeNotifier : public CChangeObserver inline int check_shoutcast_dev_id() { return ((g_settings.shoutcast_dev_id != "XXXXXXXXXXXXXXXX") && !g_settings.shoutcast_dev_id.empty()); } inline int check_youtube_dev_id() { return ((g_settings.youtube_dev_id != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") && !g_settings.youtube_dev_id.empty()); } inline int check_tmdb_api_key() { return ((g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") && !g_settings.tmdb_api_key.empty()); } -inline int check_imdb_api_key() { return ((g_settings.imdb_api_key != "XXXXXXXX") && !g_settings.imdb_api_key.empty()); } +inline int check_omdb_api_key() { return ((g_settings.omdb_api_key != "XXXXXXXX") && !g_settings.omdb_api_key.empty()); } #endif diff --git a/src/system/settings.h b/src/system/settings.h index ac660b186..4cb125cce 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -814,12 +814,14 @@ struct SNeutrinoSettings int movieplayer_repeat_on; int movieplayer_bisection_jump; //NI int movieplayer_display_playtime; + + //online services std::string youtube_dev_id; int youtube_enabled; std::string tmdb_api_key; int tmdb_enabled; - std::string imdb_api_key; - int imdb_enabled; + std::string omdb_api_key; + int omdb_enabled; std::string shoutcast_dev_id; int shoutcast_enabled;