Version 1.2-test1-am2av1.2-test1-am2a

- Fixed access to 001.vdr/00001.ts and index.vdr/index (Length in recordings list works again).

3 files changed, 19 insertions, 2 deletions

diff --git a/CHANGES.AM b/CHANGES.AM
index c2a878c..d246561 100644
--- a/CHANGES.AM
+++ b/CHANGES.AM
@@ -1,5 +1,8 @@
 Changes by Andreas Mair <andreas _AT_ vdr-developer.org>
 
+* 1.2-test1-AM2a
+- Fixed access to 001.vdr/00001.ts and index.vdr/index (Length in recordings list works again).
+
 * 1.2-test1-AM2
 - Adapt cutter thread to VDR v1.7.3.
 
diff --git a/extrecmenu.c b/extrecmenu.c
index f3f59cf..3d466ee 100644
--- a/extrecmenu.c
+++ b/extrecmenu.c
@@ -11,7 +11,7 @@
 
 using namespace std;
 
-static const char *VERSION        = "1.2-test1-am2";
+static const char *VERSION        = "1.2-test1-am2a";
 static const char *DESCRIPTION    = tr("Extended recordings menu");
 static const char *MAINMENUENTRY  = "ExtRecMenu";
 
diff --git a/mymenurecordings.c b/mymenurecordings.c
index 1563395..607785d 100644
--- a/mymenurecordings.c
+++ b/mymenurecordings.c
@@ -190,7 +190,14 @@ myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level)
       stringstream idbuffer;
     
       buffer=filename;
+#if VDRVERSNUM > 10703
+      if (isPesRecording)
+        buffer+="/001.vdr";
+      else
+        buffer+="/00001.ts";
+#else
       buffer+="/001.vdr";
+#endif
       if(access(buffer.c_str(),R_OK))
       {
         buffer=filename;
@@ -233,12 +240,19 @@ myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level)
       if(mysetup.ShowRecLength)
       {
         buffer=filename;
+#if VDRVERSNUM > 10703
+        if (isPesRecording)
+          buffer+="/index.vdr";
+        else
+          buffer+="/index";
+#else
         buffer+="/index.vdr";
+#endif
         struct stat statbuf;
         if(!stat(buffer.c_str(),&statbuf))
         {
           ostringstream strbuf;
-          strbuf << setw(3) << (int)(statbuf.st_size/12000) << "'";
+          strbuf << setw(3) << (int)(statbuf.st_size/12000) << "'"; //TODO: 12000 still OK for TS recordings?
           // replace leading spaces with fixed blank (right align)
           titlebuffer << myStrReplace(strbuf.str(),' ',Icons::FixedBlank()) << '\t';
         }