From dee1225fa4d5de99b414b3748a21ef43e522818e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Mon, 18 Jan 2021 12:55:47 +0100
Subject: [PATCH] Made the functions cRecordingInfo::SetData() and
 cRecordingInfo::SetAux() public

---
 CONTRIBUTORS | 1 +
 HISTORY      | 4 +++-
 recording.c  | 8 ++++----
 recording.h  | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cd242b6d..0586bd79 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1226,6 +1226,7 @@ Peter Bieringer <pb@bieringer.de>
  for suggesting to ignore lines tagged with '#' in the 'info.vdr' file of a recording
  for reporting a problem with the backslash ('\') in parameters when executing
  external commands
+ for making the functions cRecordingInfo::SetData() and cRecordingInfo::SetAux() public
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
diff --git a/HISTORY b/HISTORY
index ee6ba7ad..8c5f03c0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9578,7 +9578,7 @@ Video Disk Recorder Revision History
   given (reported by Manuel Reimer).
 - Fixed handling $(PKG_CONFIG) in newplugin (thanks to Winfried Köhler).
 
-2021-01-15:
+2021-01-18:
 
 - Fixed strreplace() to handle NULL strings (reported by Jürgen Schneider).
 - Somewhere down the road the 'x' bit of Doxyfile.filter got lost, so the
@@ -9597,3 +9597,5 @@ Video Disk Recorder Revision History
 - If an event in the Schedules menu is marked with a 'T' or 'I' and the user presses the
   Red button to edit the timer, spawned timers are now preferred over pattern timers
   in case there is more than one timer that will match that event.
+- Made the functions cRecordingInfo::SetData() and cRecordingInfo::SetAux() public
+  (thanks to Peter Bieringer).
diff --git a/recording.c b/recording.c
index 2e2ceefa..758f3a90 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 5.2 2021/01/01 15:26:27 kls Exp $
+ * $Id: recording.c 5.3 2021/01/18 12:55:47 kls Exp $
  */
 
 #include "recording.h"
@@ -430,11 +430,11 @@ cRecordingInfo::~cRecordingInfo()
 
 void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description)
 {
-  if (!isempty(Title))
+  if (Title)
      ((cEvent *)event)->SetTitle(Title);
-  if (!isempty(ShortText))
+  if (ShortText)
      ((cEvent *)event)->SetShortText(ShortText);
-  if (!isempty(Description))
+  if (Description)
      ((cEvent *)event)->SetDescription(Description);
 }
 
diff --git a/recording.h b/recording.h
index 6f26f2f6..208bd8b5 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 5.1 2020/12/26 15:49:01 kls Exp $
+ * $Id: recording.h 5.2 2021/01/18 12:55:47 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -74,8 +74,6 @@ private:
   char *fileName;
   cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
   bool Read(FILE *f);
-  void SetData(const char *Title, const char *ShortText, const char *Description);
-  void SetAux(const char *Aux);
 public:
   cRecordingInfo(const char *FileName);
   ~cRecordingInfo();
@@ -93,6 +91,8 @@ public:
   bool Write(FILE *f, const char *Prefix = "") const;
   bool Read(void);
   bool Write(void) const;
+  void SetData(const char *Title, const char *ShortText, const char *Description);
+  void SetAux(const char *Aux);
   };
 
 class cRecording : public cListObject {
@@ -150,7 +150,7 @@ public:
        ///< Returns the full path name to the recording directory, including the
        ///< video directory and the actual '*.rec'. For disk file access use.
   const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
-  const cRecordingInfo *Info(void) const { return info; }
+  cRecordingInfo *Info(void) const { return info; }
   const char *PrefixFileName(char Prefix);
   int HierarchyLevels(void) const;
   void ResetResume(void) const;