epgsearch, timeline, and streamdev-client timer patches?

Message ID 423E5DDB.9030004@syphir.sytes.net
State New
Headers

Commit Message

C.Y.M March 21, 2005, 5:38 a.m. UTC
  The compile for Epgsearch-0.9.1, Timeline-0.9.0, and streamdev-client have broke
due to the timer changes in vdr-1.3.23.  Does anyone have a solution for these?

Note: I found this patch for vdradmin to support vdr-1.3.23 over on vdr portal.
 It did not seem to apply to my version so I re-created it.

Best Regards,
  

Comments

C.Y.M March 21, 2005, 6:26 a.m. UTC | #1
C.Y.M wrote:
> The compile for Epgsearch-0.9.1, Timeline-0.9.0, and streamdev-client have broke
> due to the timer changes in vdr-1.3.23.  Does anyone have a solution for these?
> 
> Note: I found this patch for vdradmin to support vdr-1.3.23 over on vdr portal.
>  It did not seem to apply to my version so I re-created it.
> 

It appears that there is a new version of epgsearch (0.9.2) that fixes the
problem.  All there is left to fix it timeline and streamdev.

Best Regards,
  
Luis Palacios April 4, 2005, 9:30 a.m. UTC | #2
On Sun, 20 Mar 2005 22:26:29 -0800
"C.Y.M" <syphir@syphir.sytes.net> wrote:

> > The compile for Epgsearch-0.9.1, Timeline-0.9.0, and streamdev-client have
> > broke due to the timer changes in vdr-1.3.23.  Does anyone have a solution
> > for these? 

Hi, any news on streamdev and vdr-1.3.23 ?

It used to work, with vdr-1.3.22:
 vdr-streamdev-0.3.3-pre4.tgz
 patch for streamdev: vdr-streamdev-patch-for-vdr-1.3.19.diff

As said, there is a problem with 1.3.23. I get this error:
g++ -g -O2 -Wall -Woverloaded-virtual -O2 -c -D_GNU_SOURCE -DHAVE_AUTOPID
-I../../../include -I../DVB/include -I. -o client/menu.o client/menu.c
client/menu.c: In constructor `
   cStreamdevMenuEditTimer::cStreamdevMenuEditTimer(cRemoteTimer*, bool)':
client/menu.c:143: error: parse error before `(' token
make[1]: *** [client/menu.o] Error 1


Thanks in advance,

Luis
  
syrius.ml@no-log.org April 4, 2005, 10:30 a.m. UTC | #3
Luis Palacios <luis@luispa.com> writes:

> Hi, any news on streamdev and vdr-1.3.23 ?
>
> It used to work, with vdr-1.3.22:
>  vdr-streamdev-0.3.3-pre4.tgz
>  patch for streamdev: vdr-streamdev-patch-for-vdr-1.3.19.diff

how about trying streamdev cvs ?
I'm not sure it will work for 1.3.23, but at least it works here for
1.3.22.

cvs -d:pserver:anoncvs@vdr-developer.org:/var/cvsroot login
cvs -d:pserver:anoncvs@vdr-developer.org:/var/cvsroot co streamdev

--
  
Luis Palacios April 4, 2005, 10:51 a.m. UTC | #4
On Mon, 04 Apr 2005 12:30:26 +0200
syrius.ml@no-log.org wrote:

> > Hi, any news on streamdev and vdr-1.3.23 ?
> >
> > It used to work, with vdr-1.3.22:
> >  vdr-streamdev-0.3.3-pre4.tgz
> >  patch for streamdev: vdr-streamdev-patch-for-vdr-1.3.19.diff
> 
> how about trying streamdev cvs ?
> I'm not sure it will work for 1.3.23, but at least it works here for
> 1.3.22.
> 
> cvs -d:pserver:anoncvs@vdr-developer.org:/var/cvsroot login
> cvs -d:pserver:anoncvs@vdr-developer.org:/var/cvsroot co streamdev

Thanks for the recomendation, however didn't work with 1.3.23. Same error. I
didn't apply vdr-streamdev-patch-for-vdr-1.3.19.diff though, so looks it's 
not needed anymore.

Unfortunately, same error:

g++ -g -O2 -Wall -Woverloaded-virtual -O2 -c -D_GNU_SOURCE -DHAVE_AUTOPID
-I../../../include -I../DVB/include -I. -o client/menu.o client/menu.c
client/menu.c: In constructor `
   cStreamdevMenuEditTimer::cStreamdevMenuEditTimer(cRemoteTimer*, bool)':
client/menu.c:141: error: parse error before `(' token


> 
> --
  
Burkhardt Petermann April 4, 2005, 11:27 a.m. UTC | #5
Hi,
> On Mon, 04 Apr 2005 12:30:26 +0200
> syrius.ml@no-log.org wrote:
>
> > > Hi, any news on streamdev and vdr-1.3.23 ?
> > >
> > > It used to work, with vdr-1.3.22:
> > >  vdr-streamdev-0.3.3-pre4.tgz
> > >  patch for streamdev: vdr-streamdev-patch-for-vdr-1.3.19.diff
> >
> > how about trying streamdev cvs ?
> > I'm not sure it will work for 1.3.23, but at least it works here for
> > 1.3.22.
> >
> > cvs -d:pserver:anoncvs@vdr-developer.org:/var/cvsroot login
> > cvs -d:pserver:anoncvs@vdr-developer.org:/var/cvsroot co streamdev
>
> Thanks for the recomendation, however didn't work with 1.3.23.
> Same error. I
> didn't apply vdr-streamdev-patch-for-vdr-1.3.19.diff though, so
> looks it's
> not needed anymore.
>
> Unfortunately, same error:
>
> g++ -g -O2 -Wall -Woverloaded-virtual -O2 -c -D_GNU_SOURCE -DHAVE_AUTOPID
> -I../../../include -I../DVB/include -I. -o client/menu.o client/menu.c
> client/menu.c: In constructor `
>    cStreamdevMenuEditTimer::cStreamdevMenuEditTimer(cRemoteTimer*, bool)':
> client/menu.c:141: error: parse error before `(' token
>
>
as a urgently hack, you can change in the client/menu.c (line 143):
#if VDRVERSNUM < 10323
  Add(new cMenuEditDayItem (tr("Day"),    &m_Data.m_Day));
#endif

So streamdev will compile (Server and clientpart), but now you can't use the
remote timer.
I'll look forward, if I've more time for this ...
Greetings
  Burkhardt
  
Luis Palacios April 4, 2005, 12:14 p.m. UTC | #6
> 
> So streamdev will compile (Server and clientpart), but now you can't use the
> remote timer.
> I'll look forward, if I've more time for this ...
> Greetings
>   Burkhardt

Thanks Burkhardt,

Now it compiles. Unfortunately, when connecting from a client

 mplayer http://x.x.x.x:3000/channel#

Gets vdr to eat all CPU resources and after a while it stops sending
data.

Has any of you tried a different alternative to streamdev?

thanks
Luis
  
Dominique Simon April 5, 2005, 8:53 a.m. UTC | #7
Am 04.04.2005 um 14:14 schrieb Luis Palacios:

> Gets vdr to eat all CPU resources and after a while it stops sending
> data.
>

Same here when trying to http-stream using streamdev cvs from today 
:-(. Did you find a way to make it work?

(linvdr 0.6)

Ciao, Dominique
  
Luis Palacios April 5, 2005, 10:57 a.m. UTC | #8
On Tue, 5 Apr 2005 10:53:00 +0200
Dominique Simon <d.simon@gmx.net> wrote:

> 
> Am 04.04.2005 um 14:14 schrieb Luis Palacios:
> 
> > Gets vdr to eat all CPU resources and after a while it stops sending
> > data.
> >
> 
> Same here when trying to http-stream using streamdev cvs from today 
> :-(. Did you find a way to make it work?
> 
> (linvdr 0.6)
> 
> Ciao, Dominique
> 

Dominique... yes, from this thread:
 Re: [vdr] epgsearch, timeline, and streamdev-client timer patches?

See below. Download from peter_weber69 site (1), comment out the line indicated
in (2). It works with 1.3.23.

luis

> On Mon, 04 Apr 2005 12:26:48 GMT 
> "peter_weber69" <peter_weber69@lycos.de> wrote:
> 
> > Hi,
> > 1) use my patched plugin
> > streamdev-plugin for VDR-1.3.19, VDR-1.3.20 on
> > http://mitglied.lycos.de/peterweber69/
> > 
> > 2) then
> > change line (ca. 143) in
> >  .........../PLUGINS/src/streamdev/client/menu.c
> > from
> > Add(new cMenuEditDayItem( tr("Day"), &m_Data.m_Day));
> > to
> > // Add(new cMenuEditDayItem( tr("Day"), &m_Data.m_Day));
> > 	
> > bye
> > 
> 
> That work perfectly well. Thanks a lot !
> 
> Luis
>
  

Patch

--- vdradmin/vdradmind.pl.orig	2005-02-04 00:43:58.000000000 -0800
+++ vdradmin/vdradmind.pl	2005-03-20 19:35:01.000000000 -0800
@@ -1256,26 +1256,24 @@ 
         substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, 
         ($2 - 1), $1);
     } else { # regular timer
-      $startsse = my_mktime(substr($start, 2, 2), 
-				substr($start, 0, 2), $dor, (my_strftime("%m") - 1),
-				my_strftime("%Y"));
+      $dor =~ /(\d\d\d\d)-(\d\d)-(\d\d)/;
+      $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1);
 			
       $stopsse = my_mktime(substr($stop, 2, 2), 
-        substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, 
-        (my_strftime("%m") - 1), my_strftime("%Y"));
+	substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1);
     }
 
-    # move timers which have expired one month into the future
-    if(length($dor) != 7 && $stopsse < time) {
-			$startsse = my_mktime(substr($start, 2, 2), 
-        substr($start, 0, 2), $dor, (my_strftime("%m") % 12), 
-        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
-
-      $stopsse = my_mktime(substr($stop, 2, 2), 
-        substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1,
-        (my_strftime("%m") % 12), 
-        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
-    }
+#    # move timers which have expired one month into the future
+#    if(length($dor) != 7 && $stopsse < time) {
+#			$startsse = my_mktime(substr($start, 2, 2), 
+#        substr($start, 0, 2), $dor, (my_strftime("%m") % 12), 
+#        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
+#
+#      $stopsse = my_mktime(substr($stop, 2, 2), 
+#        substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1,
+#        (my_strftime("%m") % 12), 
+#        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
+#    }
 
     if($CONFIG{RECORDINGS} && length($dor) == 7)  { # repeating timer
       # generate repeating timer entries for up to 28 days