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

Separate subtitles preferences on request; Load english locale to use as default for not complete locales

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@385 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8afd4d31d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-19 (Fri, 19 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-19 14:00:53 +00:00
parent 7b691b4939
commit f71b8404b9
9 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neutrino.cpp
View File

@@ -802,9 +802,12 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.audio_avs_Control = false;
g_settings.auto_lang = configfile.getInt32( "auto_lang", 0 );
g_settings.auto_subs = configfile.getInt32( "auto_subs", 0 );
for(int i = 0; i < 3; i++) {
sprintf(cfg_key, "pref_lang_%d", i);
strncpy(g_settings.pref_lang[i], configfile.getString(cfg_key, "").c_str(), 30);
sprintf(cfg_key, "pref_subs_%d", i);
strncpy(g_settings.pref_subs[i], configfile.getString(cfg_key, "").c_str(), 30);
}
g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 1 );
g_settings.sms_channel = configfile.getInt32( "sms_channel", 0 );
@@ -1314,6 +1317,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
for(int i = 0; i < 3; i++) {
sprintf(cfg_key, "pref_lang_%d", i);
configfile.setString(cfg_key, g_settings.pref_lang[i]);
sprintf(cfg_key, "pref_subs_%d", i);
configfile.setString(cfg_key, g_settings.pref_subs[i]);
}
configfile.setString( "audio_PCMOffset", g_settings.audio_PCMOffset );
@@ -4874,10 +4879,10 @@ void CNeutrinoApp::SelectSubtitles()
CZapitChannel * cc = channelList->getChannel(curnum);
for(int i = 0; i < 3; i++) {
if(strlen(g_settings.pref_lang[i]) == 0)
if(strlen(g_settings.pref_subs[i]) == 0)
continue;
std::string temp(g_settings.pref_lang[i]);
std::string temp(g_settings.pref_subs[i]);
for(int j = 0 ; j < (int)cc->getSubtitleCount() ; j++) {
CZapitAbsSub* s = cc->getChannelSub(j);