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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-03-04 19:32:30 +01:00
parent e569490348 393fd9d9bb
commit a5cbcf84af
46 changed files with 335 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/system/flashtool.cpp
View File

@@ -526,28 +526,26 @@ const char *CFlashVersionInfo::getReleaseCycle(void) const
const char *CFlashVersionInfo::getType(void) const
{
// TODO: localize it
switch (snapshot)
{
case '0':
return "Release";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_RELEASE);
case '1':
return "Beta";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_BETA);
case '2':
return "Internal";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_INTERNAL);
case 'L':
return "Locale";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_LOCALE);
case 'S':
return "Settings";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_SETTINGS);
case 'A':
return "Addon";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_ADDON);
case 'U':
return "Update";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UPDATE);
case 'T':
return "Text";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_TEXT);
default:
return "Unknown";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UNKNOWN);
}
}

9
src/system/locals.h
View File

@@ -709,6 +709,15 @@ typedef enum
LOCALE_FLASHUPDATE_SETTINGS,
LOCALE_FLASHUPDATE_TITLEREADFLASH,
LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_TYPE_ADDON,
LOCALE_FLASHUPDATE_TYPE_BETA,
LOCALE_FLASHUPDATE_TYPE_INTERNAL,
LOCALE_FLASHUPDATE_TYPE_LOCALE,
LOCALE_FLASHUPDATE_TYPE_RELEASE,
LOCALE_FLASHUPDATE_TYPE_SETTINGS,
LOCALE_FLASHUPDATE_TYPE_TEXT,
LOCALE_FLASHUPDATE_TYPE_UNKNOWN,
LOCALE_FLASHUPDATE_TYPE_UPDATE,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,

9
src/system/locals_intern.h
View File

@@ -709,6 +709,15 @@ const char * locale_real_names[] =
"flashupdate.settings",
"flashupdate.titlereadflash",
"flashupdate.titlewriteflash",
"flashupdate.type_addon",
"flashupdate.type_beta",
"flashupdate.type_internal",
"flashupdate.type_locale",
"flashupdate.type_release",
"flashupdate.type_settings",
"flashupdate.type_text",
"flashupdate.type_unknown",
"flashupdate.type_update",
"flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_error",
"flashupdate.update_with_settings_processed",

4
src/system/setting_helpers.cpp
View File

@@ -75,7 +75,7 @@
#include <zapit/satconfig.h>
#include <zapit/zapit.h>
extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CPlugins * g_Plugins; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern cVideo *videoDecoder;
extern cAudio *audioDecoder;
@@ -391,7 +391,7 @@ int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & action
{
int sel = atoi(actionKey.c_str());
if (sel >= 0)
g_settings.movieplayer_plugin = g_PluginList->getName(sel);
g_settings.movieplayer_plugin = g_Plugins->getName(sel);
}
return menu_return::RETURN_EXIT;