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

remotecontrol: resolv commented merge conflict

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a0d57cfe6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-10 (Fri, 10 Nov 2017)

Origin message was:
------------------
- remotecontrol: resolv commented merge conflict

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-10 22:47:24 +01:00
parent 5a0db3bfc0
commit dae5135aec
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/daemonc/remotecontrol.cpp
View File

@@ -503,8 +503,8 @@ void CRemoteControl::processAPIDnames()
#endif #endif
for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++) for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++)
{ {
#ifdef APID_DEBUG
const char *iso = getISO639Description(current_PIDs.APIDs[count].desc); const char *iso = getISO639Description(current_PIDs.APIDs[count].desc);
#ifdef APID_DEBUG
printf("apid=%04x/%s/%s ", current_PIDs.APIDs[count].pid, current_PIDs.APIDs[count].desc, iso); printf("apid=%04x/%s/%s ", current_PIDs.APIDs[count].pid, current_PIDs.APIDs[count].desc, iso);
#endif #endif
if ( current_PIDs.APIDs[count].component_tag != 0xFF ) if ( current_PIDs.APIDs[count].component_tag != 0xFF )
@@ -514,15 +514,8 @@ void CRemoteControl::processAPIDnames()
std::string tmp_desc = current_PIDs.APIDs[count].desc; std::string tmp_desc = current_PIDs.APIDs[count].desc;
if ( tmp_desc.size() == 3 ) if ( tmp_desc.size() == 3 )
{ {
// unaufgeloeste Sprache... // unresolved language
/* merge conflict */ tmp_desc = iso;
#if 0
/* getISO639Description returns same pointer as input if nothing is found */
if (current_PIDs.APIDs[count].desc != iso)
strcpy(current_PIDs.APIDs[count].desc, iso);
#else
tmp_desc = getISO639Description( current_PIDs.APIDs[count].desc );
#endif
} }
if ( current_PIDs.APIDs[count].is_ac3 ) if ( current_PIDs.APIDs[count].is_ac3 )