Re: can't compile femon 1.7.5 with vdr 1.7.12

[Oleg Roitburd <oroitburd@xxxxxxxxx>]

2010/1/31 Goga777 <goga777@xxxxx>:
> /usr/src/vdr/PLUGINS/src/femon# make all
> g++ -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wall -march=athlon-xp -pipe -fomit-frame-pointer -fPIC -c -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"femon"' -I../s2-liplianin/linux/include -I../../../include femonosd.c
> femonosd.c: In member function 'bool cFemonOsd::DeviceSwitch(int)':
> femonosd.c:724: error: no matching function for call to 'cTransferControl::cTransferControl(cDevice*, tChannelID, int, const int*, const int*, const int*)'
> ../../../include/vdr/transfer.h:33: note: candidates are: cTransferControl::cTransferControl(cDevice*, const cChannel*)
> ../../../include/vdr/transfer.h:28: note:                 cTransferControl::cTransferControl(const cTransferControl&)
> make: *** [femonosd.o] Ошибка 1

diff -Nurp femon-1.7.5/femonosd.c femon-1.7.5-patched/femonosd.c
--- femon-1.7.5/femonosd.c	2009-10-01 03:20:00.000000000 +0200
+++ femon-1.7.5-patched/femonosd.c	2010-01-31 19:42:29.000000000 +0100
@@ -721,7 +721,8 @@ bool cFemonOsd::DeviceSwitch(int directi
               cDevice::GetDevice(device)->SwitchChannel(channel, true);
               if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
                  cDevice::GetDevice(device)->ForceTransferMode();
-              cControl::Launch(new
cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(),
channel->Vpid(), channel->Apids(), channel->Dpids(),
channel->Spids()));
+//              cControl::Launch(new
cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(),
channel->Vpid(), channel->Apids(), channel->Dpids(),
channel->Spids()));
+              cControl::Launch(new
cTransferControl(cDevice::GetDevice(device), channel));
               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(),
channel->Number());
               return (true);
               }

_______________________________________________
vdr mailing list
vdr@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr