mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prefered language settings for testing, at the moment for audio and epg

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@361 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-17 13:13:43 +00:00
parent 39f76419fd
commit 81276253ae
11 changed files with 178 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/system/localize.cpp
View File

@@ -40,11 +40,14 @@
#include <cstring>
#include <fstream>
#include <string>
#include <iostream>
#include <map>
#include <stdlib.h>
//static const char * iso639filename = "/usr/share/iso-codes/iso-639.tab";
static const char * iso639filename = "/share/iso-codes/iso-639.tab";
#if 1
#if 0
#include <stdlib.h>
#include <stdio.h>
@@ -129,10 +132,8 @@ const char * getISO639Description(const char * const iso)
return ((iso639_t *)value)->name;
}
#else
#include <iostream>
#include <map>
static std::map<std::string, std::string> iso639;
std::map<std::string, std::string> iso639;
void initialize_iso639_map(void)
{
@@ -175,7 +176,7 @@ CLocaleManager::~CLocaleManager()
{
for (unsigned j = 0; j < (sizeof(locale_real_names)/sizeof(const char *)); j++)
if (localeData[j] != locale_real_names[j])
free(localeData[j]);
::free(localeData[j]);
delete localeData;
}
@@ -187,7 +188,7 @@ CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const l
unsigned int i;
FILE * fd;
initialize_iso639_map();
//initialize_iso639_map();
for (i = 0; i < 2; i++)
{

4
src/system/localize.h
View File

@@ -36,8 +36,12 @@
#include <system/locals.h>
#include_next<locale.h>
#include <time.h>
#include <string>
#include <map>
void initialize_iso639_map(void);
const char * getISO639Description(const char * const iso);
extern std::map<std::string, std::string> iso639;
#define ARE_LOCALES_EQUAL(a,b) (a == b)

4
src/system/locals.h
View File

@@ -147,6 +147,9 @@ typedef enum {
LOCALE_AUDIOMENU_AVSYNC,
LOCALE_AUDIOMENU_AVSYNC_AM,
LOCALE_AUDIOMENU_CLOCKREC,
LOCALE_AUDIOMENU_AUTO_LANG,
LOCALE_AUDIOMENU_PREF_LANG_HEAD,
LOCALE_AUDIOMENU_PREF_LANG,
LOCALE_AUDIOPLAYER_ADD,
LOCALE_AUDIOPLAYER_ADD_IC,
LOCALE_AUDIOPLAYER_ADD_LOC,
@@ -1176,7 +1179,6 @@ typedef enum {
LOCALE_ZAPIT_SCANTYPE_TV,
LOCALE_ZAPIT_SCANTYPE_TVRADIO,
LOCALE_ZAPTOTIMER_ANNOUNCE,
LOCALE_EXTRA_ENGLISH,
LOCALE_DBOXINFO,
LOCALE_EXTRA_SCANMODE,
LOCALE_EXTRA_STARTSTANDBY,

5
src/system/locals_intern.h
View File

@@ -147,6 +147,9 @@ const char *locale_real_names[] = {
"audiomenu.avsync",
"audiomenu.avsync_am",
"audiomenu.clockrec",
"audiomenu.auto_lang",
"audiomenu.pref_lang_head",
"audiomenu.pref_lang",
"audioplayer.add",
"audioplayer.add_ic",
"audioplayer.add_loc",
@@ -1176,7 +1179,6 @@ const char *locale_real_names[] = {
"zapit.scantype.tv",
"zapit.scantype.tvradio",
"zaptotimer.announce",
"extra.english",
"extra.dboxinfo",
"extra.scan_mode",
"extra.start_tostandby",
@@ -1364,4 +1366,5 @@ const char *locale_real_names[] = {
"cpu.freq_standby",
"cpu.freq_default"
};
#endif

4
src/system/settings.h
View File

@@ -70,7 +70,7 @@ struct SNeutrinoSettings
int audio_AnalogMode;
int audio_DolbyDigital;
int audio_avs_Control;
int audio_english;
int auto_lang;
char audio_PCMOffset[3];
int srs_enable;
int srs_algo;
@@ -95,6 +95,8 @@ struct SNeutrinoSettings
char language[25];
char timezone[150];
std::string pref_lang[3];
// EPG
int epg_save;
std::string epg_cache;