hello world

3 files changed, 119 insertions, 0 deletions

diff --git a/plugins/timeline/patches/timeline-1.0.141-1.5.0.diff b/plugins/timeline/patches/timeline-1.0.141-1.5.0.diff
new file mode 100644
index 0000000..a621ab3
--- /dev/null
+++ b/plugins/timeline/patches/timeline-1.0.141-1.5.0.diff
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_timeline-1.0.141-1.5.0.dpatch by Thomas Günther <tom@toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).
+
+@DPATCH@
+--- timeline-1.0.141/checkerOsd.c
++++ timeline-1.0.141/checkerOsd.c
+@@ -339,8 +339,14 @@
+ 							{ // verschiedene Kanäle, genug Devices?
+ 								bool nofree=true;
+ 								
++#if APIVERSNUM >= 10500
++								cDevice *cd1=cDevice::GetDevice(ch1,-1,false);
++								cDevice *cd2=cDevice::GetDevice(ch2,-1,false);
++#else
+ 								cDevice *cd1=cDevice::GetDevice(ch1);
+-								cDevice *cd2=cDevice::GetDevice(ch2),*cdt;
++								cDevice *cd2=cDevice::GetDevice(ch2);
++#endif
++								cDevice *cdt;
+ 								if (cd1->DeviceNumber()!=cd2->DeviceNumber())
+ 								{ // Sonderfall: ch2 kann gar nicht auf Device von ch1 empfangen werden
+ 									nofree=false;
diff --git a/plugins/timeline/patches/timeline-1.0.141-vdr-1.5.3.diff b/plugins/timeline/patches/timeline-1.0.141-vdr-1.5.3.diff
new file mode 100644
index 0000000..98b8a11
--- /dev/null
+++ b/plugins/timeline/patches/timeline-1.0.141-vdr-1.5.3.diff
@@ -0,0 +1,42 @@
+--- timeline-1.0.141/checkerOsd.c.orig  2007-03-11 18:01:45.000000000 -0700
++++ timeline-1.0.141/checkerOsd.c	2007-06-11 18:16:11.000000000 -0700
+@@ -246,7 +246,11 @@
+ 								localtime_r(&start1t,&day1);
+ 								sprintf(line1,"%s %04d-%02d-%02d (%s):",tr("Conflict on"),day1.tm_year+1900,day1.tm_mon+1,day1.tm_mday,tr("same input device"));
+ 								sprintf(line2,"%02d:%02d-%02d:%02d, (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,ct1->Priority(),ch1->Name(),ct1->File());
++#if VDRVERSNUM >= 10503
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays(),false),ct2->Priority(),ch2->Name(),ct2->File());
++#else
+ 								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays()),ct2->Priority(),ch2->Name(),ct2->File());
++#endif
+ 							}
+ 						}
+ 						else if (!ct1->IsSingleEvent() && ct2->IsSingleEvent())
+@@ -276,7 +280,11 @@
+ 							{
+ 								localtime_r(&start1t,&day1);
+ 								sprintf(line1,"%s %04d-%02d-%02d (%s):",tr("Conflict on"),day1.tm_year+1900,day1.tm_mon+1,day1.tm_mday,tr("same input device"));
++#if VDRVERSNUM >= 10503
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays(),false),ct1->Priority(),ch1->Name(),ct1->File());
++#else
+ 								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays()),ct1->Priority(),ch1->Name(),ct1->File());
++#endif
+ 								sprintf(line3,"%02d:%02d-%02d:%02d, (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->Priority(),ch2->Name(),ct2->File());
+ 							}
+ 						}
+@@ -313,9 +321,15 @@
+ 							}
+ 							if (hasmatched)
+ 							{
++#if VDRVERSNUM >= 10503
++								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(0,mdays,false),tr("same input device"));
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays(),false),ct1->Priority(),ch1->Name(),ct1->File());
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays(),false),ct2->Priority(),ch2->Name(),ct2->File());
++#else
+ 								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(0,mdays),tr("same input device"));
+ 								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays()),ct1->Priority(),ch1->Name(),ct1->File());
+ 								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays()),ct2->Priority(),ch2->Name(),ct2->File());
++#endif
+ 							}
+ 						}
+ 						else // ct1->IsSingleEvent() && ct2->IsSingleEvent()
diff --git a/plugins/timeline/plugin.sh b/plugins/timeline/plugin.sh
new file mode 100644
index 0000000..03eb797
--- /dev/null
+++ b/plugins/timeline/plugin.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis)
+# von Marc Wernecke - www.zulu-entertainment.de
+# 14.09.2008
+#
+# vdr-timeline
+
+# defaults
+source ./../../x-vdr.conf
+source ./../../setup.conf
+source ./../../functions
+
+WEB="http://www.u32.de/download/vdr-timeline-1.0.141-kw160.tar.gz"
+VERSION="timeline-1.0.141-kw160"
+LINK="timeline"
+
+VAR=`basename $WEB`
+DIR=`pwd`
+
+# plugin entfernen
+function clean_plugin() {
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -rf $LINK*
+  rm -f $VDRLIBDIR/libvdr-$LINK*
+  log "cleaning $LINK"
+}
+
+# plugin installieren
+function install_plugin() {
+  download_plugin
+  extract_plugin
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -f $LINK
+  ln -vfs $VERSION $LINK
+  patch_plugin
+
+  ## plugin specials - start ##
+
+  ## plugin specials - ende ##
+}
+
+# plugin commands
+if [ $# \> 0 ]; then
+  cmd=$1
+  cmd_plugin
+else
+  install_plugin
+  log "install-plugin fuer $VERSION ist fertig"
+fi
+
+exit 0