Revoked 'Fixed numbering frames' to not break compatibility within the stable 2.0.x

1 files changed, 4 insertions, 4 deletions

diff --git a/recording.c b/recording.c
index a35d0ee6..19efa42e 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.91.1.5 2014/02/06 11:04:03 kls Exp $
+ * $Id: recording.c 2.91.1.6 2014/02/08 10:57:26 kls Exp $
  */
 
 #include "recording.h"
@@ -2394,7 +2394,7 @@ cString IndexToHMSF(int Index, bool WithFrame, double FramesPerSecond)
      Sign = "-";
      }
   double Seconds;
-  int f = int(modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond);
+  int f = int(modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond + 1);
   int s = int(Seconds);
   int m = s / 60 % 60;
   int h = s / 3600;
@@ -2407,9 +2407,9 @@ int HMSFToIndex(const char *HMSF, double FramesPerSecond)
   int h, m, s, f = 1;
   int n = sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f);
   if (n == 1)
-     return h; // plain frame number
+     return h - 1; // plain frame number
   if (n >= 3)
-     return int(round((h * 3600 + m * 60 + s) * FramesPerSecond)) + f;
+     return int(round((h * 3600 + m * 60 + s) * FramesPerSecond)) + f - 1;
   return 0;
 }