Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / enigma2 / enigma2 / enigma2_vuplus_conversion_error.patch
1 diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
2 index febfd78..6a90274 100644
3 --- a/lib/dvb/pmt.cpp
4 +++ b/lib/dvb/pmt.cpp
5 @@ -268,7 +268,7 @@ void eDVBServicePMTHandler::AITready(int error)
6                                 std::string boundaryExtension = "";
7                                 
8                                 int controlCode = (*i)->getApplicationControlCode();
9 -                               ApplicationIdentifier * applicationIdentifier = (*i)->getApplicationIdentifier();
10 +                               const ApplicationIdentifier * applicationIdentifier = (*i)->getApplicationIdentifier();
11                                 profilecode = 0;
12                                 orgid = applicationIdentifier->getOrganisationId();
13                                 appid = applicationIdentifier->getApplicationId();
14 @@ -285,7 +285,7 @@ void eDVBServicePMTHandler::AITready(int error)
15                                                 case APPLICATION_DESCRIPTOR:
16                                                 {
17                                                         ApplicationDescriptor* applicationDescriptor = (ApplicationDescriptor*)(*desc);
18 -                                                       ApplicationProfileList* applicationProfiles = applicationDescriptor->getApplicationProfiles();
19 +                                                       const ApplicationProfileList* applicationProfiles = applicationDescriptor->getApplicationProfiles();
20                                                         ApplicationProfileConstIterator interactionit = applicationProfiles->begin();
21                                                         for(; interactionit != applicationProfiles->end(); ++interactionit)
22                                                         {
23 @@ -353,7 +353,7 @@ void eDVBServicePMTHandler::AITready(int error)
24                                 }
25                                 if(!hbbtvUrl.empty())
26                                 {
27 -                                       char* uu = hbbtvUrl.c_str();
28 +                                       const char* uu = hbbtvUrl.c_str();
29                                         if(!strncmp(uu, "http://", 7) || !strncmp(uu, "dvb://", 6) || !strncmp(uu, "https://", 8))
30                                         {
31                                                 if(controlCode == 1) m_HBBTVUrl = hbbtvUrl;
32 @@ -420,7 +420,7 @@ void eDVBServicePMTHandler::OCready(int error)
33         {
34                 for (std::vector<OCSection*>::const_iterator it = ptr->getSections().begin(); it != ptr->getSections().end(); ++it)
35                 {
36 -                       unsigned char* sectionData = (*it)->getData();
37 +                       unsigned char* sectionData = (unsigned char*)(*it)->getData();
38                 }
39         }
40         /* for now, do not keep listening for table updates */