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

neutrino.cpp: change pref_lang/subs defaults to 'none'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65edc676b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-05-07 13:59:18 +04:00
parent 24a3bf6c1c
commit 9c7f8b0f7c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neutrino.cpp
View File

@@ -419,9 +419,9 @@ int CNeutrinoApp::loadSetup(const char * fname)
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
sprintf(cfg_key, "pref_lang_%d", i); sprintf(cfg_key, "pref_lang_%d", i);
strncpy(g_settings.pref_lang[i], configfile.getString(cfg_key, "").c_str(), 30); strncpy(g_settings.pref_lang[i], configfile.getString(cfg_key, "none").c_str(), 30);
sprintf(cfg_key, "pref_subs_%d", i); sprintf(cfg_key, "pref_subs_%d", i);
strncpy(g_settings.pref_subs[i], configfile.getString(cfg_key, "").c_str(), 30); strncpy(g_settings.pref_subs[i], configfile.getString(cfg_key, "none").c_str(), 30);
} }
g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 0 ); g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 0 );
strcpy( g_settings.audio_PCMOffset, configfile.getString( "audio_PCMOffset", "0" ).c_str() ); strcpy( g_settings.audio_PCMOffset, configfile.getString( "audio_PCMOffset", "0" ).c_str() );
@@ -3816,7 +3816,7 @@ void CNeutrinoApp::SelectSubtitles()
return; return;
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
if(strlen(g_settings.pref_subs[i]) == 0) if(strlen(g_settings.pref_subs[i]) == 0 || !strcmp(g_settings.pref_subs[i], "none"))
continue; continue;
std::string temp(g_settings.pref_subs[i]); std::string temp(g_settings.pref_subs[i]);