Re: [vdr] can't compile femon 1.7.5 with vdr 1.7.12

2010-01-31 Thread Oleg Roitburd
31 января 2010 г. 19:47 пользователь Oleg Roitburd
 написал:
> 2010/1/31 Goga777 :
>> /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
>

version 2 for Patch
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.0 +0200
+++ femon-1.7.5-patched/femonosd.c  2010-01-31 19:54:41.0 +0100
@@ -721,7 +721,11 @@ bool cFemonOsd::DeviceSwitch(int directi
   cDevice::GetDevice(device)->SwitchChannel(channel, true);
   if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
  cDevice::GetDevice(device)->ForceTransferMode();
+#if APIVERSNUM <  10712
   cControl::Launch(new
cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(),
channel->Vpid(), channel->Apids(), channel->Dpids(),
channel->Spids()));
+#else  
+  cControl::Launch(new
cTransferControl(cDevice::GetDevice(device), channel));
+#endif 
   cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(),
channel->Number());
   return (true);
   }

Regards
Oleg Roitburd

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


Re: [vdr] can't compile femon 1.7.5 with vdr 1.7.12

2010-01-31 Thread Oleg Roitburd
2010/1/31 Goga777 :
> /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.0 +0200
+++ femon-1.7.5-patched/femonosd.c  2010-01-31 19:42:29.0 +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@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr


Re: [vdr] can't compile femon 1.7.5 with vdr 1.7.12

2010-01-31 Thread Ales Jurik
On Sunday 31 of January 2010, Goga777 wrote:
> /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
> 
> ___
> vdr mailing list
> vdr@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
> 
Hi,

try this:
@@ -721,7 +721,8 @@
   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);
   }


BR,

Ales

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