From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 7 Mar 2018 09:27:42 +0000 (+0100)
Subject: DVR: return back dvr_entry_create_by_event() - wrong merge
X-Git-Tag: v4.2.6~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ac7b120c3e9bd54eb45c94402c84c0f7f9bfd0a;p=thirdparty%2Ftvheadend.git

DVR: return back dvr_entry_create_by_event() - wrong merge
---

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 01b319cad..e6ad8174c 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -1073,6 +1073,26 @@ dvr_entry_create_htsp(int enabled, const char *config_uuid,
                            comment);
 }
 
+dvr_entry_t *
+dvr_entry_create_by_event(int enabled, const char *config_uuid,
+                          epg_broadcast_t *e,
+                          time_t start_extra, time_t stop_extra,
+                          const char *owner,
+                          const char *creator, dvr_autorec_entry_t *dae,
+                          dvr_prio_t pri, int retention, int removal,
+                          const char *comment)
+{
+  if(!e->channel || !e->episode || !e->episode->title)
+    return NULL;
+  return dvr_entry_create_(enabled, config_uuid, e,
+                           e->channel, e->start, e->stop,
+                           start_extra, stop_extra,
+                           NULL, NULL, NULL, NULL,
+                           LIST_FIRST(&e->episode->genre),
+                           owner, creator, dae, NULL, pri,
+                           retention, removal, comment);
+}
+
 /**
  * Return the event for the last segment.
  */