[ANNOUNCE]: graphlcd-0.1.4

metropolis:/usr/local/src/graphlcd-base-0.1.4 > make
make[1]: Entering directory `/usr/local/src/graphlcd-base-0.1.4/glcdgraphics'
make[1]: Für das Ziel »all« ist nichts zu tun.
make[1]: Leaving directory `/usr/local/src/graphlcd-base-0.1.4/glcdgraphics'
make[1]: Entering directory `/usr/local/src/graphlcd-base-0.1.4/glcddrivers'
g++ -g -O2 -Wall -Woverloaded-virtual -fPIC -c -D_GNU_SOURCE drivers.c
In file included from drivers.c:27:
avrctl.h:38: error: `uint16_t' was not declared in this scope
avrctl.h:38: error: Fehler beim Parsen before `,' token
make[1]: *** [drivers.o] Fehler 1
make[1]: Leaving directory `/usr/local/src/graphlcd-base-0.1.4/glcddrivers'
make: *** [all] Fehler 2

metropolis:/usr/local/src/vdr-1.4.3-2-bigpatch/PLUGINS/src/graphlcd-0.1.4 # make all
g++ -g -O2 -Wall -Woverloaded-virtual -fPIC -c -DPLUGIN_NAME_I18N='"graphlcd"' -D_GNU_SOURCE -I../DVB/include -I../../../include -I../DVB/include -I/usr/local/include display.c
display.c: In member function `void cGraphLCDDisplay::SetOsdTextItem(const
char*, bool)':
display.c:687: error: `WrapText' undeclared (first use this function)
display.c:687: error: (Each undeclared identifier is reported only once for
each function it appears in.)
display.c: In member function `void
cGraphLCDDisplay::DisplayReplay(tReplayState&;)':
display.c:1409: error: `WrapText' undeclared (first use this function)
display.c: In member function `void cGraphLCDDisplay::DisplayMessage()':
display.c:1674: error: `WrapText' undeclared (first use this function)
make: *** [display.o] Fehler 1

g++ -g -Wall -Woverloaded-virtual -c -DPLUGIN_NAME_I18N='"graphlcd"' -D_GNU_SOURCE -I/usr/include/vdr/include -I/usr/include -I/usr/local/include display.c
display.c: In member function `void cGraphLCDDisplay::SetOsdTextItem(const
   char*, bool)':
display.c:687: error: `WrapText' undeclared (first use this function)
display.c:687: error: (Each undeclared identifier is reported only once for
   each function it appears in.)
display.c: In member function `void
   cGraphLCDDisplay::DisplayReplay(tReplayState&)':
display.c:1409: error: `WrapText' undeclared (first use this function)
display.c: In member function `void cGraphLCDDisplay::DisplayMessage()':
display.c:1674: error: `WrapText' undeclared (first use this function)
make[1]: *** [display.o] Fehler 1
make[1]: Leaving directory `/usr/src/graphlcd-0.1.4'
make: *** [build-stamp] Fehler 2

g++ -g -Wall -Woverloaded-virtual -c -DPLUGIN_NAME_I18N='"graphlcd"' -D_GNU_SOURCE -I/usr/include/vdr/include -I/usr/include -I/usr/local/include widgets.c
In file included from widgets.c:2:
widgets.h:48: error: 'uint64_t' is used as a type, but is not defined as a
   type.
widgets.c: In member function `void cScroller::Reset()':
widgets.c:28: error: `lastUpdate' undeclared (first use this function)
widgets.c:28: error: (Each undeclared identifier is reported only once for each
   function it appears in.)
make[1]: *** [widgets.o] Fehler 1
make[1]: Leaving directory `/usr/local/src/graphlcd-0.1.4'
make: *** [build-stamp] Fehler 2

--- plugin.c.orig       Thu Feb  8 17:49:19 2007
+++ plugin.c    Thu Feb  8 18:44:38 2007
@@ -159,11 +159,13 @@
         esyslog("graphlcd: ERROR: Failed creating display object %s\n", mDisplayName.c_str());
         return false;
     }
+/* Verhalten wie 0.1.3 wiederherstellen
     if (mLcd->Init() != 0)
     {
         esyslog("graphlcd: ERROR: Failed initializing display %s\n", mDisplayName.c_str());
         return false;
     }
+*/
     cfgDir = ConfigDirectory(PLUGIN_NAME);
     if (!cfgDir)
         return false;
--- display.c.orig      Thu Feb  8 17:49:26 2007
+++ display.c   Thu Feb  8 18:49:03 2007
@@ -162,6 +162,13 @@


 void cGraphLCDDisplay::Action(void)
 {
+
+    if (mLcd->Init() != 0)
+    {
+        esyslog("graphlcd: ERROR: Failed initializing display \n");
+        return;
+    }
+
     bitmap = new GLCD::cBitmap(mLcd->Width(), mLcd->Height());
     if (!bitmap)
     {

diff -u /tmp/graphlcd-base-0.1.4/glcddrivers/driver.h ./driver.h
--- /tmp/graphlcd-base-0.1.4/glcddrivers/driver.h       2006-08-27 17:27:15.000000000 +0200
+++ ./driver.h  2007-02-09 18:14:25.000000000 +0100
@@ -15,6 +15,12 @@
 #ifndef _GLCDDRIVERS_DRIVER_H_
 #define _GLCDDRIVERS_DRIVER_H_
 
+#include <string>
+#include <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
 namespace GLCD
 {
 
diff -u /tmp/graphlcd-base-0.1.4/glcddrivers/drivers.c ./drivers.c
--- /tmp/graphlcd-base-0.1.4/glcddrivers/drivers.c      2007-01-14 14:40:01.000000000 +0100
+++ ./drivers.c 2007-02-09 18:10:57.000000000 +0100
@@ -10,6 +10,7 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 
 #include "drivers.h"
 #include "simlcd.h"


diff -u /tmp/graphlcd-base-0.1.4/glcddrivers/drivers.h ./drivers.h
--- /tmp/graphlcd-base-0.1.4/glcddrivers/drivers.h      2007-01-14 14:40:01.000000000 +0100
+++ ./drivers.h 2007-02-09 18:10:27.000000000 +0100
@@ -12,6 +12,8 @@
 #ifndef _GLCDDRIVERS_DRIVERS_H_
 #define _GLCDDRIVERS_DRIVERS_H_
 
+
+#include <stdio.h>
 #include <string>

--- state.c     2007-02-12 18:49:10.000000000 +0100
+++ /tmp/state.c        2007-02-12 18:42:12.000000000 +0100
@@ -126,12 +126,13 @@
 #endif
 {
     //printf("graphlcd plugin: cGraphLCDState::Replaying %s\n", Name);
+    printf("graphlcd plugin: cGraphLCDState::Replaying %s - %i\n", Name, GraphLCDSetup.PluginActive);
     if (GraphLCDSetup.PluginActive)
     {
 #if VDRVERSNUM < 10338
         if (Name)
 #else
-        if (On)
+        if (On && Name)
 #endif
         {
             mutex.Lock();
@@ -168,7 +169,7 @@
                         }
                         if (bFound) //found MP3-Plugin replaymessage
                         {
-                            unsigned int j;
+                            unsigned int j,k;
                             // get loopmode
                             replay.loopmode = Name;
                             replay.loopmode = replay.loopmode.substr (0, 5);
@@ -187,7 +188,23 @@


                             if (strlen(Name+i+j) > 0)
                             { //if name isn't empty, then copy
-                                replay.name = Name + i + j;
+                                   char *atsep = strstr(Name + i + j, " - ");
+                                   if (atsep != NULL)
+                                   {
+                                           int atoff = (atsep + 3) - (Name +i +j);
+
+                                           char newName[strlen(Name)];
+                                           strncpy(newName, Name + i + j, atoff-2);
+                                           *(newName + atoff - 2) = '\n';
+                                           strcpy(newName + atoff - 1, Name + i + j + atoff);
+                                           printf("GRAPHLCD: Name = '%s' i:%i j:%i k:%i \n",Name,i,j,atoff);
+                                           printf("GRAPHLCD:  NEW = '%s'\n", newName);
+                                           replay.name = newName;
+                                   }
+                                   else
+                                   {
+                                           replay.name = Name + i + j;
+                                   }
                             }
                             else
                             { //if Name empty, set fallback title