diff options
| author | Jochen Dolze <vdr@dolze.de> | 2010-05-25 21:36:38 +0200 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2010-05-25 21:36:38 +0200 |
| commit | e8891a0d2713d830c276c3914a6c6bfd75b71295 (patch) | |
| tree | 29ab5015744f35b92870d838f57039b5c4dca578 | |
| parent | 18e1698f114f033accb23abbb83ba7761f04b566 (diff) | |
| download | vdr-plugin-infosatepg-e8891a0d2713d830c276c3914a6c6bfd75b71295.tar.gz vdr-plugin-infosatepg-e8891a0d2713d830c276c3914a6c6bfd75b71295.tar.bz2 | |
Fixed support for VDR >= 1.7.13 ;)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | global.cpp | 12 | ||||
| -rw-r--r-- | process.cpp | 5 |
3 files changed, 13 insertions, 6 deletions
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ pri ### The C++ compiler and options: CXX ?= g++ -CXXFLAGS ?= -fPIC -g0 -O2 -Wall -Woverloaded-virtual -Wno-parentheses +CXXFLAGS ?= -fPIC -g0 -O2 -Wall -Wextra -Woverloaded-virtual -Wno-parentheses ### The directory environment: @@ -475,7 +475,9 @@ bool cGlobalInfosatepg::FindReceiverChannel() #if VDRVERSNUM < 10713 if (chan->Polarization()!=Polarization) continue; #else - if (strpbrk(chan->Parameters(),"HVLRhvlr")!=Polarization) continue; + char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr"); + if (!polarization) continue; + if (*polarization!=Polarization) continue; #endif channel=i; return true; @@ -494,7 +496,9 @@ bool cGlobalInfosatepg::FindReceiverChannel() #if VDRVERSNUM < 10713 if (chan->Polarization()!=Polarization) continue; #else - if (strpbrk(chan->Parameters(),"HVLRhvlr")!=Polarization) continue; + char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr"); + if (!polarization) continue; + if (*polarization!=Polarization) continue; #endif channel=i; return true; @@ -513,7 +517,9 @@ bool cGlobalInfosatepg::FindReceiverChannel() #if VDRVERSNUM < 10713 if (chan->Polarization()!=Polarization) continue; #else - if (strpbrk(chan->Parameters(),"HVLRhvlr")!=Polarization) continue; + char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr"); + if (!polarization) continue; + if (*polarization!=Polarization) continue; #endif channel=i; return true; diff --git a/process.cpp b/process.cpp index 7969136..4fbb0b5 100644 --- a/process.cpp +++ b/process.cpp @@ -1062,7 +1062,8 @@ bool cProcessInfosatepg::ParseInfosatepg(FILE *f,time_t *firststarttime) { if (ievent) { - int content_descr,fsk; + int fsk; + unsigned int content_descr; fields=sscanf(s,"%x %d",&content_descr,&fsk); if (fields==1) ievent->SetContentDescriptor(content_descr); if (fields==2) @@ -1274,7 +1275,7 @@ bool cProcessInfosatepg::ParseInfosatepg(FILE *f,time_t *firststarttime) // contains description if (ignore) continue; if (!ievent) continue; - strreplace(s,0x8A,'\n'); + strreplace(s,-118,'\n'); // 0x8a ievent->SetDescription(conv->Convert(s)); if (!AddInfosatEvent(chan,ievent)) abort=true; delete ievent; |