Version 0.5v0.5

- improved updating of moved or renamed recordings - updating should be faster now
- added patch and option to replace VDR's recordings menu; thanks to 'egal' from vdr-portal.de
- fixed the settings of tabs
- month of a recording was shown the wrong way - fixed

10 files changed, 64 insertions, 18 deletions

diff --git a/HISTORY b/HISTORY
index 81fdb01..7b68d46 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,14 @@
 VDR Plugin 'extrecmenu' Revision History
 ----------------------------------------
 
+2006-03-13: Version 0.5
+- improved updating of moved or renamed recordings - updating should be faster
+  now
+- added patch and option to replace VDR's recordings menu; thanks to 'egal'
+  from vdr-portal.de
+- fixed the settings of tabs
+- month of a recording was shown the wrong way - fixed
+
 2006-03-13: Version 0.4
 - add option to hide main menu entry
 - set tabs depending on the shown recordings details - looks more fancy and
diff --git a/extrecmenu.c b/extrecmenu.c
index e5a6774..aeb58c3 100644
--- a/extrecmenu.c
+++ b/extrecmenu.c
@@ -63,6 +63,9 @@ cMenuSetupPage *cPluginExtrecmenu::SetupMenu(void)
 
 bool cPluginExtrecmenu::SetupParse(const char *Name, const char *Value)
 {
+ if(!strcasecmp(Name,"IsOrgRecMenu"))
+  return (mysetup.ReplaceOrgRecMenu==false); // vdr-replace patch
+
  if(!strcasecmp(Name,"ShowRecDate"))
   mysetup.ShowRecDate=atoi(Value);
  else
@@ -75,7 +78,10 @@ bool cPluginExtrecmenu::SetupParse(const char *Name, const char *Value)
     if(!strcasecmp(Name,"HideMainMenuEntry"))
      mysetup.HideMainMenuEntry=atoi(Value);
     else
-     return false;
+     if(!strcasecmp(Name,"ReplaceOrgRecMenu"))
+      mysetup.ReplaceOrgRecMenu=atoi(Value);
+     else
+      return false;
  return true;
 }
 
diff --git a/extrecmenu.h b/extrecmenu.h
index 613bdf1..a828f17 100644
--- a/extrecmenu.h
+++ b/extrecmenu.h
@@ -1,6 +1,6 @@
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.4";
+static const char *VERSION        = "0.5";
 static const char *DESCRIPTION    = "Extended recordings menu";
 static const char *MAINMENUENTRY  = "ExtRecMenu";
 
diff --git a/i18n.c b/i18n.c
index 6488471..b6e89ac 100644
--- a/i18n.c
+++ b/i18n.c
@@ -59,5 +59,8 @@ const tI18nPhrase Phrases[] = {
   { "Hide main menu entry",
     "Hauptmenüeintrag ausblenden",
   },
+  { "Replace original recordings menu",
+    "Originales Aufzeichnungsmenü ersetzen",
+  },
   { NULL }
   };
diff --git a/mymenumoverecording.c b/mymenumoverecording.c
index 198198f..6435c51 100644
--- a/mymenumoverecording.c
+++ b/mymenumoverecording.c
@@ -174,7 +174,8 @@ eOSState myMenuMoveRecording::MoveRec()
   if(result)
   {
    // update recordings list
-   Recordings.Update(true);
+   Recordings.AddByName(newfilename);
+   Recordings.Del(recording,false);
    // update menu
    menurecordings->Set(true);
    // close move-recordings-menu
diff --git a/mymenurecordings.c b/mymenurecordings.c
index 573d1c9..3fa1b2c 100644
--- a/mymenurecordings.c
+++ b/mymenurecordings.c
@@ -70,7 +70,7 @@ myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level)
    }   
    free(indexfilename);
 
-   snprintf(RecDate,sizeof(RecDate),"%02d.%02d.%02d",t.tm_mday,t.tm_mon,t.tm_year%100);
+   snprintf(RecDate,sizeof(RecDate),"%02d.%02d.%02d",t.tm_mday,t.tm_mon+1,t.tm_year%100);
    snprintf(RecTime,sizeof(RecTime),"%02d:%02d",t.tm_hour,t.tm_min);
    asprintf(&title,"%s%s%s%s%s%s%c%s",
                    (mysetup.ShowRecDate?RecDate:""),
@@ -112,10 +112,10 @@ void myMenuRecordingsItem::IncrementCounter(bool IsNew)
 myMenuRecordings::myMenuRecordings(const char *Base,int Level):cOsdMenu(Base?Base:tr("Extended recordings menu"))
 {
  // set tabs
- if(mysetup.ShowRecDate&&mysetup.ShowRecTime&&mysetup.ShowRecLength) // all details are shown
+ if(mysetup.ShowRecDate&&mysetup.ShowRecTime) // all details are shown
   SetCols(8,6,4);
  else
-  if(mysetup.ShowRecDate&&!mysetup.ShowRecTime&&mysetup.ShowRecLength) // recording time is not shown
+  if(mysetup.ShowRecDate&&!mysetup.ShowRecTime) // recording time is not shown
    SetCols(8,4);
   else
    if(!mysetup.ShowRecDate&&mysetup.ShowRecTime&&mysetup.ShowRecLength) // recording date is not shown
@@ -132,13 +132,6 @@ myMenuRecordings::myMenuRecordings(const char *Base,int Level):cOsdMenu(Base?Bas
  
  Display();
  Set();
- /*
- if(Current()<0)
-  SetCurrent(First());
- else
-  if(myReplayControl::LastReplayed&&Open())
-   return;
- */
  Display();
  SetHelpKeys();
 }
@@ -179,8 +172,6 @@ void myMenuRecordings::SetHelpKeys()
 
 void myMenuRecordings::Set(bool Refresh)
 {
-// const char *currentrecording=myReplayControl::LastReplayed();
-
  cThreadLock RecordingsLock(&Recordings);
  Clear();
  Recordings.Sort();
@@ -479,11 +470,11 @@ eOSState myMenuRecordings::ProcessKey(eKeys Key)
                    break;
                   }
     case kBlue: return Info();
-    case kNone: if(Recordings.StateChanged(recordingsstate))
-                 Set(true);
     default: break;
    }
   }
+  if(Recordings.StateChanged(recordingsstate))
+   Set(true);
   // go back if list is empty
   if(!Count())
    state=osBack;
diff --git a/mymenurenamerecording.c b/mymenurenamerecording.c
index 172cb40..1c93e73 100644
--- a/mymenurenamerecording.c
+++ b/mymenurenamerecording.c
@@ -50,7 +50,8 @@ eOSState myMenuRenameRecording::ProcessKey(eKeys Key)
     if(result)
     {
      // update recordings list
-     Recordings.Update(true);
+     Recordings.AddByName(newFileName);
+     Recordings.Del(recording);
      // update menu
      menurecordings->Set(true);
      return osBack;
diff --git a/mymenusetup.c b/mymenusetup.c
index f0d2cc7..5803e40 100644
--- a/mymenusetup.c
+++ b/mymenusetup.c
@@ -5,11 +5,13 @@ mySetup mysetup;
 myMenuSetup::myMenuSetup()
 {
  hidemainmenuentry=mysetup.HideMainMenuEntry;
+ replaceorgrecmenu=mysetup.ReplaceOrgRecMenu;
  showrecdate=mysetup.ShowRecDate;
  showrectime=mysetup.ShowRecTime;
  showreclength=mysetup.ShowRecLength;
  
  Add(new cMenuEditBoolItem(tr("Hide main menu entry"),&hidemainmenuentry));
+ Add(new cMenuEditBoolItem(tr("Replace original recordings menu"),&replaceorgrecmenu));
  Add(new cMenuEditBoolItem(tr("Show recording date"),&showrecdate));
  Add(new cMenuEditBoolItem(tr("Show recording time"),&showrectime));
  Add(new cMenuEditBoolItem(tr("Show recording length"),&showreclength));
@@ -18,6 +20,7 @@ myMenuSetup::myMenuSetup()
 void myMenuSetup::Store()
 {
  SetupStore("HideMainMenuEntry",mysetup.HideMainMenuEntry=hidemainmenuentry);
+ SetupStore("ReplaceOrgRecMenu",mysetup.ReplaceOrgRecMenu=replaceorgrecmenu);
  SetupStore("ShowRecDate",mysetup.ShowRecDate=showrecdate);
  SetupStore("ShowRecTime",mysetup.ShowRecTime=showrectime);
  SetupStore("ShowRecLength",mysetup.ShowRecLength=showreclength);
diff --git a/mymenusetup.h b/mymenusetup.h
index 7dde4bb..3a70a1d 100644
--- a/mymenusetup.h
+++ b/mymenusetup.h
@@ -7,6 +7,7 @@ class mySetup
   int ShowRecTime;
   int ShowRecLength;
   int HideMainMenuEntry;
+  int ReplaceOrgRecMenu;
 };
 
 extern mySetup mysetup;
@@ -18,6 +19,7 @@ class myMenuSetup:public cMenuSetupPage
   int showrectime;
   int showreclength;
   int hidemainmenuentry;
+  int replaceorgrecmenu;
  protected:
   virtual void Store();
  public:
diff --git a/patches/vdr-1.3.43-extrecmenu.diff b/patches/vdr-1.3.43-extrecmenu.diff
new file mode 100644
index 0000000..6e980f0
--- /dev/null
+++ b/patches/vdr-1.3.43-extrecmenu.diff
@@ -0,0 +1,31 @@
+--- menu.c.org	2006-02-20 16:20:18.000000000 +0100
++++ menu.c	2006-03-13 14:27:33.000000000 +0100
+@@ -2897,7 +2897,11 @@
+ 		       break;
+     case osChannels:   AddSubMenu(new cMenuChannels); break;
+     case osTimers:     AddSubMenu(new cMenuTimers); break;
+-    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
++    case osRecordings: {
++		        cPlugin *p = cPluginManager::GetPlugin("extrecmenu");
++    		        (p && !p->SetupParse("IsOrgRecMenu", "0")) ? AddSubMenu((cOsdMenu *)p->MainMenuAction()) : AddSubMenu(new cMenuRecordings(NULL, 0, true));
++		       }
++		       break;
+     case osSetup:      AddSubMenu(new cMenuSetup); break;
+     case osCommands:   AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
+     default: break;
+@@ -3044,7 +3048,14 @@
+ 		       break;
+     case osChannels:   return AddSubMenu(new cMenuChannels);
+     case osTimers:     return AddSubMenu(new cMenuTimers);
+-    case osRecordings: return AddSubMenu(new cMenuRecordings);
++    case osRecordings: {
++			cPlugin *p = cPluginManager::GetPlugin("extrecmenu");
++            	        if (p && !p->SetupParse("IsOrgRecMenu", "0"))
++			    return AddSubMenu((cOsdMenu *)p->MainMenuAction());
++			else
++			    return AddSubMenu(new cMenuRecordings);
++		       }
++		       break;
+     case osSetup:      return AddSubMenu(new cMenuSetup);
+     case osCommands:   return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands));
+     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {