Version 0.0.10-jw2v0.0.10-jw2release/v0.0.10-jw2

7 files changed, 232 insertions, 31 deletions

diff --git a/HISTORY b/HISTORY
index 317036c..72620bd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 VDR Plugin 'lcdproc' Revision History
 ------------------------------------
 
+2006-11-12: Version 0.0.10-jw2
+- added new simple recording status (can be configured via the setup)
+- added german translations
+- removed unused PrioWait parameter (can somebody tell me, what this should wait for?)
+- fixed some typos in the readme file
+
 2006-09-24: Version 0.0.10-jw1
 - speedup in EPG handling
 - adapted to VDR 1.4.2
diff --git a/README b/README
index 326121e..7f2e4fd 100644
--- a/README
+++ b/README
@@ -46,7 +46,7 @@ So the card status among other things can be indecated by led.
 Brief description of the setup menue:
 
 FullCycle / TimeDateCycle 
-  during recording the some displays toggle between time/date and card status
+  during recording the same display toggles between time/date and card status
   FullCycle (seconds) is the time for a complete cycle while
   TimeDateCycle (seconds) is the duration where time/date is shown.
 
@@ -73,6 +73,10 @@ OutputNumber
   implemented by Mattia Rossi <mattia@technologist.com> 
   sets how many output pins should be used to indicate 
   states like on/off, card status, ...
+  
+RecordingStatus
+  configures whether the recording status is displayed "detailed" 
+  (for every dvb card) or only "simple".
 
 
 LCDproc is available at http://lcdproc.omnipotent.net/
diff --git a/i18n.c b/i18n.c
index c2c86d3..4d3d953 100644
--- a/i18n.c
+++ b/i18n.c
@@ -36,7 +36,7 @@ const tI18nPhrase Phrases[] = {
     "Scanning for EPG info.",// TODO
   },
   { "FullCycle",
-    "FullCycle",// TODO
+    "Zyklusdauer Statuszeile",// TODO
     "FullCycle",// TODO
     "FullCycle",// TODO
     "FullCycle",// TODO
@@ -53,7 +53,7 @@ const tI18nPhrase Phrases[] = {
     "FullCycle",// TODO
   },
   { "TimeDateCycle",
-    "TimeDateCycle",// TODO
+    "davon Dauer Zeitanzeige",// TODO
     "TimeDateCycle",// TODO
     "TimeDateCycle",// TODO
     "TimeDateCycle",// TODO
@@ -70,7 +70,7 @@ const tI18nPhrase Phrases[] = {
     "TimeDateCycle",// TODO
   },
   { "VolumeKeep",
-    "VolumeKeep",// TODO
+    "Anzeigedauer Lautstärke",// TODO
     "VolumeKeep",// TODO
     "VolumeKeep",// TODO
     "VolumeKeep",// TODO
@@ -87,7 +87,7 @@ const tI18nPhrase Phrases[] = {
     "VolumeKeep",// TODO
   },
   { "Scrollwait",
-    "Scrollwait",// TODO
+    "Zeit bis Text rollen",// TODO
     "Scrollwait",// TODO
     "Scrollwait",// TODO
     "Scrollwait",// TODO
@@ -104,7 +104,7 @@ const tI18nPhrase Phrases[] = {
     "Scrollwait",// TODO
   },
   { "Scrollspeed",
-    "Scrollspeed",// TODO
+    "Rollgeschwindigkeit",// TODO
     "Scrollspeed",// TODO
     "Scrollspeed",// TODO
     "Scrollspeed",// TODO
@@ -121,7 +121,7 @@ const tI18nPhrase Phrases[] = {
     "Scrollspeed",// TODO
   },
   { "Charmap",
-    "Charmap",// TODO
+    "Zeichenkodierung",// TODO
     "Charmap",// TODO
     "Charmap",// TODO
     "Charmap",// TODO
@@ -138,7 +138,7 @@ const tI18nPhrase Phrases[] = {
     "Charmap",// TODO
   },
   { "AltShift",
-    "AltShift",// TODO
+    "Alternative \"Heartbeat\"-Signalisierung",// TODO
     "AltShift",// TODO
     "AltShift",// TODO
     "AltShift",// TODO
@@ -155,7 +155,7 @@ const tI18nPhrase Phrases[] = {
     "AltShift",// TODO
   },
   { "BackLight",
-    "BackLight",// TODO
+    "Hintergrundbeleuchtung",// TODO
     "BackLight",// TODO
     "BackLight",// TODO
     "BackLight",// TODO
@@ -172,6 +172,7 @@ const tI18nPhrase Phrases[] = {
     "BackLight",// TODO
   },
   { "OutputNumber",
+    "Zahl der Ausgänge am LCD",// TODO
     "OutputNumber",// TODO
     "OutputNumber",// TODO
     "OutputNumber",// TODO
@@ -186,7 +187,186 @@ const tI18nPhrase Phrases[] = {
     "OutputNumber",// TODO
     "OutputNumber",// TODO
     "OutputNumber",// TODO
-    "OutputNumber",// TODO
+  },
+  {
+    "RECORDING", // this string has to be exactly 9 characters long for proper display layout
+    "AUFNAHME ",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",
+    "RECORDING",    
+  },
+  {
+    "Recording status",
+    "Aufnahmestatus",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+    "Recording status",
+  },
+  {
+    "simple",
+    "einfach",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+    "simple",
+  },
+  {
+    "detailed",
+    "ausführlich",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+    "detailed",
+  },
+  {
+    "off",
+    "aus",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+    "off",
+  },
+  {
+    "on",
+    "an",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+    "on",
+  },
+  {
+    "SetClientPriority",
+    "Anzeigepriorität auf Normal setzen",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+    "SetClientPriority",
+  },
+  {
+    "NormalClientPriority",
+    "Normale Anzeigeprorität",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+    "NormalClientPriority",
+  },
+  {
+    "HighClientPriority",
+    "Hohe Anzeigepriorität",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+    "HighClientPriority",
+  },
+  {
+    "BackLightWait",
+    "Dauer Hintergrundbeleuchtung",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",
+    "BackLightWait",    
   },
   { NULL }
   };
diff --git a/lcd.c b/lcd.c
index abd95dd..c5f9b76 100644
--- a/lcd.c
+++ b/lcd.c
@@ -598,9 +598,14 @@ void cLcd::GetTimeDateStat( char *string, unsigned int OutStateData[] ) {
   }
 
   if ( offset || ( ShowStates && ((t%LcdSetup.FullCycle) >= LcdSetup.TimeCycle) )) {
-    for (i=0; i<LCDMAXCARDS; i++) {
-      snprintf(string+offset,5," %d:%c", i,States[ OutStateData[i] ] );
-      offset+=4;
+    if (LcdSetup.RecordingStatus == 0) {
+      for (i=0; i<LCDMAXCARDS; i++) {
+       snprintf(string+offset,5," %d:%c", i,States[ OutStateData[i] ] );
+       offset+=4;  
+      }
+    }
+    else {
+      snprintf(string,wid+1,"<%s %02d:%02d:%02d>", tr("RECORDING"), now->tm_hour, now->tm_min,now->tm_sec);
     }
   }
 
diff --git a/lcdproc.c b/lcdproc.c
index 8a38fc1..d515730 100644
--- a/lcdproc.c
+++ b/lcdproc.c
@@ -16,7 +16,7 @@
 #include "lcd.h"
 #include "lcdtranstbl.h"
 
-static const char *VERSION        = "0.0.10-jw1";
+static const char *VERSION        = "0.0.10-jw2";
 static const char *MAINMENUENTRY  = NULL;
 static const char *DESCRIPTION    = "LCDproc output";
 
@@ -45,9 +45,6 @@ static const char * OutputFunctionText[]= {"Off",
                                            "User2",
                                            "User3"};
 
-
-static const char * PrioBackFunctionText[]= {"Off", "On", "Auto"};
-
 class cLcdFeed : public cStatus {
 protected:
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
@@ -305,15 +302,6 @@ cOsdMenu *cPluginLcd::MainMenuAction(void)
   return NULL;
 }
 
-class cMenuSetupLcd : public cMenuSetupPage {
-  private:
-     cLcdSetup newLcdSetup;	  
-  protected:
-     virtual void Store(void);
-  public:
-     cMenuSetupLcd(void);
-};
-
 // --- cMenuEditStraTrItem -----------------------------------------------------
 
 class cMenuEditStraTrItem : public cMenuEditIntItem {
@@ -337,8 +325,26 @@ void cMenuEditStraTrItem::Set(void)
   SetValue(strings[*value]);
 }
 
+// --- cMenuSetupLcd -----------------------------------------------------------
+
+class cMenuSetupLcd : public cMenuSetupPage {
+  private:
+    cLcdSetup newLcdSetup;    
+    const char * RecordingStatusText[2];
+    const char * PrioBackFunctionText[3];
+  protected:
+     virtual void Store(void);
+  public:
+     cMenuSetupLcd(void);
+};
+
 cMenuSetupLcd::cMenuSetupLcd(void)
 {
+  PrioBackFunctionText[0] = tr("off");
+  PrioBackFunctionText[1] = tr("on");
+  PrioBackFunctionText[2] = tr("auto");
+  RecordingStatusText[0] = tr("detailed");
+  RecordingStatusText[1] = tr("simple");
   char str2[30];
   newLcdSetup=LcdSetup;	 
   Add(new cMenuEditIntItem( tr("FullCycle"),           &newLcdSetup.FullCycle,1,999));
@@ -353,12 +359,12 @@ cMenuSetupLcd::cMenuSetupLcd(void)
   Add(new cMenuEditIntItem( tr("NormalClientPriority"),&newLcdSetup.ClientPrioN,0,255));
   Add(new cMenuEditIntItem( tr("HighClientPriority"),  &newLcdSetup.ClientPrioH,0,255));
   Add(new cMenuEditIntItem( tr("BackLightWait"),       &newLcdSetup.BackLightWait,1,99));
-  Add(new cMenuEditIntItem( tr("PrioWait"),            &newLcdSetup.PrioWait,1,99));
   Add(new cMenuEditIntItem( tr("OutputNumber"),        &newLcdSetup.OutputNumber));
   for (int i =0 ; i <  newLcdSetup.OutputNumber; i++){
     sprintf(str2,"%s %d",tr("OutputNumber"),i);
     Add(new cMenuEditStraTrItem( str2, &newLcdSetup.OutputFunction[i],14, OutputFunctionText));
   }
+  Add(new cMenuEditStraItem( tr("Recording status"),   &newLcdSetup.RecordingStatus, 2, RecordingStatusText));
 }
 
 void cMenuSetupLcd::Store(void)
@@ -376,12 +382,12 @@ void cMenuSetupLcd::Store(void)
   SetupStore("ClientPrioN", LcdSetup.ClientPrioN = newLcdSetup.ClientPrioN);
   SetupStore("ClientPrioH", LcdSetup.ClientPrioH = newLcdSetup.ClientPrioH);
   SetupStore("BackLightWait", LcdSetup.ClientPrioH = newLcdSetup.BackLightWait);
-  SetupStore("PrioWait",    LcdSetup.ClientPrioH = newLcdSetup.PrioWait);
   SetupStore("OutputNumber",LcdSetup.OutputNumber   = newLcdSetup.OutputNumber);
   for (int i =0 ; i <  newLcdSetup.OutputNumber; i++){
     sprintf(str2,"OutputNumber %d",i);
     SetupStore(str2,   LcdSetup.OutputFunction[i]   = newLcdSetup.OutputFunction[i]);
   }
+  SetupStore("RecordingStatus", LcdSetup.RecordingStatus = newLcdSetup.RecordingStatus);  
 }
 
 
@@ -406,7 +412,6 @@ bool cPluginLcd::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "ClientPrioN"))  LcdSetup.ClientPrioN = atoi(Value);
   else if (!strcasecmp(Name, "ClientPrioH"))  LcdSetup.ClientPrioH = atoi(Value);
   else if (!strcasecmp(Name, "BackLightWait"))  LcdSetup.BackLightWait = atoi(Value);
-  else if (!strcasecmp(Name, "PrioWait"))     LcdSetup.PrioWait = atoi(Value);
   else if (!strcasecmp(Name, "OutputNumber")) LcdSetup.OutputNumber= atoi(Value);
   else if (!strcasecmp(Name, "OutputNumber 0")) LcdSetup.OutputFunction[0]   = atoi(Value);
   else if (!strcasecmp(Name, "OutputNumber 1")) LcdSetup.OutputFunction[1]   = atoi(Value);
@@ -418,6 +423,7 @@ bool cPluginLcd::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "OutputNumber 7")) LcdSetup.OutputFunction[7]   = atoi(Value);
   else if (!strcasecmp(Name, "OutputNumber 8")) LcdSetup.OutputFunction[8]   = atoi(Value);
   else if (!strcasecmp(Name, "OutputNumber 9")) LcdSetup.OutputFunction[9]   = atoi(Value);
+  else if (!strcasecmp(Name, "RecordingStatus")) LcdSetup.RecordingStatus   = atoi(Value);
   else
   return false;
   return true;
diff --git a/setup.c b/setup.c
index 28c348e..be6c35c 100644
--- a/setup.c
+++ b/setup.c
@@ -16,9 +16,9 @@ cLcdSetup::cLcdSetup(void)
   ClientPrioH =  16; 
   SetPrio     =   0; 
   BackLightWait = 0; 
-  PrioWait    =   0; 
   OutputNumber   =  0;
   for (int i = 0; i < LCDMAXOUTPUTS; i++)
     OutputFunction[i] = 0;
+  RecordingStatus = 0;
 }
 
diff --git a/setup.h b/setup.h
index df931fc..7c7c872 100644
--- a/setup.h
+++ b/setup.h
@@ -17,9 +17,9 @@ public:
   int ClientPrioN;
   int ClientPrioH;
   int BackLightWait;
-  int PrioWait;  
   int OutputNumber;
   int OutputFunction[LCDMAXOUTPUTS];
+  int RecordingStatus;
 public:
   cLcdSetup(void);
   };