Don't use deprecated member access (introduced in VDR 1.7.21).

3 files changed, 48 insertions, 7 deletions

diff --git a/mymenueditrecording.c b/mymenueditrecording.c
index 6ce8db1..7776717 100644
--- a/mymenueditrecording.c
+++ b/mymenueditrecording.c
@@ -500,8 +500,13 @@ eOSState myMenuMoveRecording::ProcessKey(eKeys Key)
 myMenuRecordingDetails::myMenuRecordingDetails(cRecording *Recording):cOsdMenu(tr("Details"),12)
 {
   recording=Recording;
-  priority=recording->priority;
-  lifetime=recording->lifetime;
+#if VDRVERSNUM > 10720
+  priority = recording->Priority();
+  lifetime = recording->Lifetime();
+#else
+  priority = recording->priority;
+  lifetime = recording->lifetime;
+#endif
 
   Add(new cMenuEditIntItem(trVDR("Priority"),&priority,0,MAXPRIORITY));
   Add(new cMenuEditIntItem(trVDR("Lifetime"),&lifetime,0,MAXLIFETIME));
@@ -514,7 +519,14 @@ eOSState myMenuRecordingDetails::ProcessKey(eKeys Key)
   {
     if(Key==kOk)
     {
-      if((priority!=recording->priority)||(lifetime!=recording->lifetime))
+#if VDRVERSNUM > 10720
+      int old_priority = recording->Priority();
+      int old_lifetime = recording->Lifetime();
+#else
+      int old_priority = recording->priority;
+      int old_lifetime = recording->lifetime;
+#endif
+      if((priority!=old_priority)||(lifetime!=old_lifetime))
       {
 #if VDRVERSNUM > 10713
         if(recording->IsPesRecording())
diff --git a/mymenurecordings.c b/mymenurecordings.c
index 17bfbdf..15683f0 100644
--- a/mymenurecordings.c
+++ b/mymenurecordings.c
@@ -66,7 +66,12 @@ void myMenuRecordingInfo::Display(void)
   else
   {
     stringstream text;
-    text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
+#if VDRVERSNUM > 10720
+    time_t start = recording->Start();
+#else
+    time_t start = recording->start;
+#endif
+    text << *DateString(start) << ", " << *TimeString(start) << "\n\n";
 
     if(recording->Info()->Title())
     {
@@ -95,8 +100,15 @@ void myMenuRecordingInfo::Display(void)
     else
       text << tr("Size") << ": " << recmb << " MB\n";
 
-    text << trVDR("Priority") << ": " << recording->priority << "\n";
-    text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
+#if VDRVERSNUM > 10720
+    int prio = recording->Priority();
+    int lft = recording->Lifetime();
+#else
+    int prio = recording->priority;
+    int lft = recording->lifetime;
+#endif
+    text << trVDR("Priority") << ": " << prio << "\n";
+    text << trVDR("Lifetime") << ": " << lft << "\n";
 
     DisplayMenu()->SetText(text.str().c_str(),false);
     cStatus::MsgOsdTextItem(text.str().c_str());
@@ -192,7 +204,12 @@ myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level)
 
       // date and time of recording
       struct tm tm_r;
-      struct tm *t=localtime_r(&Recording->start,&tm_r);
+#if VDRVERSNUM > 10720
+      time_t start = Recording->Start();
+#else
+      time_t start = Recording->start;
+#endif
+      struct tm *t=localtime_r(&start,&tm_r);
 
       const char *c = strrchr(filename, '/');
       if (c)
diff --git a/tools.c b/tools.c
index b0ff06e..461f8e6 100644
--- a/tools.c
+++ b/tools.c
@@ -456,7 +456,11 @@ void WorkerThread::Cut(string From,string To)
     if(!(fromfile=fromfilename->Open()) || !(tofile=tofilename->Open()))
       return;
     fromfile->SetReadAhead(MEGABYTE(20));
+#if VDRVERSNUM > 10720
+    index=mark->Position();
+#else
     index=mark->position;
+#endif
     mark=frommarks.Next(mark);
     tomarks.Add(0);
     tomarks.Save();
@@ -543,7 +547,11 @@ void WorkerThread::Cut(string From,string To)
     if(!lastiframe)
       lastiframe=toindex->Last();
       
+#if VDRVERSNUM > 10720
+    if(mark && index >= mark->Position())
+#else
     if(mark && index >= mark->position)
+#endif
     {
       mark=frommarks.Next(mark);
       tomarks.Add(lastiframe);
@@ -552,7 +560,11 @@ void WorkerThread::Cut(string From,string To)
       tomarks.Save();
       if(mark)
       {
+#if VDRVERSNUM > 10720
+        index=mark->Position();
+#else
         index=mark->position;
+#endif
         mark=frommarks.Next(mark);
         currentfilenumber=0;
         cutin=true;