mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

imdb-support: renamed imdb->omdb

Browse Source 
Imdb is not really used directly, that is a bit misleading


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1af35f36c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2018-04-29 03:13:08 +02:00
committed by vanhofen
parent 7de5b2c8bf
commit 2d6da494ab
6 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/imdb.cpp
View File

@@ -48,7 +48,7 @@ CIMDB::CIMDB()
imdb_url = "http://www.omdbapi.com/?plot=full&r=json&i="; imdb_url = "http://www.omdbapi.com/?plot=full&r=json&i=";
imdb_outfile = "/tmp/imdb.json"; imdb_outfile = "/tmp/imdb.json";
omdb_apikey = "&apikey="; omdb_apikey = "&apikey=";
omdb_apikey += g_settings.imdb_api_key; omdb_apikey += g_settings.omdb_api_key;
posterfile = "/tmp/imdb.jpg"; posterfile = "/tmp/imdb.jpg";
acc = 0; acc = 0;

22
src/gui/miscsettings_menu.cpp
View File

@@ -593,15 +593,15 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
ms_oservices->addItem(GenericMenuSeparator); ms_oservices->addItem(GenericMenuSeparator);
#endif #endif
// imdb (omdb) // 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()); omdb_onoff = new CMenuOptionChooser(LOCALE_IMDB_ENABLED, &g_settings.omdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, check_omdb_api_key());
// imdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED); // omdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED);
ms_oservices->addItem(imdb_onoff); ms_oservices->addItem(omdb_onoff);
#if ENABLE_OMDB_KEY_MANAGE #if ENABLE_OMDB_KEY_MANAGE
changeNotify(LOCALE_IMDB_API_KEY, NULL); changeNotify(LOCALE_IMDB_API_KEY, NULL);
CKeyboardInput imdb_api_key_input(LOCALE_IMDB_API_KEY, &g_settings.imdb_api_key, 8, this); CKeyboardInput omdb_api_key_input(LOCALE_IMDB_API_KEY, &g_settings.omdb_api_key, 8, this);
mf = new CMenuForwarder(LOCALE_IMDB_API_KEY, true, imdb_api_key_short, &imdb_api_key_input); 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); // mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_API_KEY);
ms_oservices->addItem(mf); 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)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_IMDB_API_KEY))
{ {
g_settings.imdb_enabled = g_settings.imdb_enabled && check_imdb_api_key(); g_settings.omdb_enabled = g_settings.omdb_enabled && check_omdb_api_key();
if (g_settings.imdb_enabled) if (g_settings.omdb_enabled)
imdb_api_key_short = g_settings.imdb_api_key.substr(0, 8) + "..."; omdb_api_key_short = g_settings.omdb_api_key.substr(0, 8) + "...";
else else
imdb_api_key_short.clear(); omdb_api_key_short.clear();
imdb_onoff->setActive(check_imdb_api_key()); omdb_onoff->setActive(check_omdb_api_key());
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID))
{ {

4
src/gui/miscsettings_menu.h
View File

@@ -48,7 +48,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver
CMenuOptionChooser * epg_read_frequently; CMenuOptionChooser * epg_read_frequently;
CMenuOptionChooser * epg_scan; CMenuOptionChooser * epg_scan;
CMenuOptionChooser * tmdb_onoff; CMenuOptionChooser * tmdb_onoff;
CMenuOptionChooser * imdb_onoff; CMenuOptionChooser * omdb_onoff;
CMenuOptionChooser * youtube_onoff; CMenuOptionChooser * youtube_onoff;
CMenuOptionChooser * shoutcast_onoff; CMenuOptionChooser * shoutcast_onoff;
CMenuForwarder * epg_dir; CMenuForwarder * epg_dir;
@@ -60,7 +60,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver
std::string epg_max_events; std::string epg_max_events;
std::string tmdb_api_key_short; 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 youtube_dev_id_short;
std::string shoutcast_dev_id_short; std::string shoutcast_dev_id_short;

20
src/neutrino.cpp
View File

@@ -936,14 +936,13 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.audioplayer_repeat_on = configfile.getInt32("audioplayer_repeat_on",0); 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_show_playlist = configfile.getInt32("audioplayer_show_playlist",1);
g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",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 //Movie-Player
g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); 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_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI
g_settings.movieplayer_display_playtime = configfile.getInt32("movieplayer_display_playtime", 0); 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_dev_id = configfile.getString("youtube_dev_id","AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM"); //NI
g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1);
g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id(); 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 = configfile.getInt32("tmdb_enabled", 1);
g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key(); 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 //Filebrowser
g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1); g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1);
g_settings.filebrowser_sortmethod = configfile.getInt32("filebrowser_sortmethod", 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_repeat_on", g_settings.audioplayer_repeat_on );
configfile.setInt32( "audioplayer_show_playlist", g_settings.audioplayer_show_playlist ); configfile.setInt32( "audioplayer_show_playlist", g_settings.audioplayer_show_playlist );
configfile.setInt32( "audioplayer_enable_sc_metadata", g_settings.audioplayer_enable_sc_metadata ); 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 //Movie-Player
configfile.setInt32( "movieplayer_repeat_on", g_settings.movieplayer_repeat_on ); configfile.setInt32( "movieplayer_repeat_on", g_settings.movieplayer_repeat_on );
configfile.setInt32( "movieplayer_bisection_jump", g_settings.movieplayer_bisection_jump ); //NI configfile.setInt32( "movieplayer_bisection_jump", g_settings.movieplayer_bisection_jump ); //NI
configfile.setInt32( "movieplayer_display_playtime", g_settings.movieplayer_display_playtime ); configfile.setInt32( "movieplayer_display_playtime", g_settings.movieplayer_display_playtime );
//online services
configfile.setString( "youtube_dev_id", g_settings.youtube_dev_id ); configfile.setString( "youtube_dev_id", g_settings.youtube_dev_id );
configfile.setInt32( "youtube_enabled", g_settings.youtube_enabled ); configfile.setInt32( "youtube_enabled", g_settings.youtube_enabled );
configfile.setString( "tmdb_api_key", g_settings.tmdb_api_key ); configfile.setString( "tmdb_api_key", g_settings.tmdb_api_key );
configfile.setInt32( "tmdb_enabled", g_settings.tmdb_enabled ); 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 //Filebrowser
configfile.setInt32("filebrowser_showrights", g_settings.filebrowser_showrights); configfile.setInt32("filebrowser_showrights", g_settings.filebrowser_showrights);

2
src/system/setting_helpers.h
View File

@@ -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_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_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_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 #endif

6
src/system/settings.h
View File

@@ -814,12 +814,14 @@ struct SNeutrinoSettings
int movieplayer_repeat_on; int movieplayer_repeat_on;
int movieplayer_bisection_jump; //NI int movieplayer_bisection_jump; //NI
int movieplayer_display_playtime; int movieplayer_display_playtime;
//online services
std::string youtube_dev_id; std::string youtube_dev_id;
int youtube_enabled; int youtube_enabled;
std::string tmdb_api_key; std::string tmdb_api_key;
int tmdb_enabled; int tmdb_enabled;
std::string imdb_api_key; std::string omdb_api_key;
int imdb_enabled; int omdb_enabled;
std::string shoutcast_dev_id; std::string shoutcast_dev_id;
int shoutcast_enabled; int shoutcast_enabled;