DVR: timerec/autorec - move recording source note from creator to com…

…ment to keep creator for IP addr or username only
tvheadend · May 21, 2015 · 3a4dbc9 · 3a4dbc9
1 parent f5d0a52
commit 3a4dbc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
@@ -771,13 +771,13 @@ dvr_entry_create_by_autorec(epg_broadcast_t *e, dvr_autorec_entry_t *dae)
   }
 
   snprintf(buf, sizeof(buf), "Auto recording%s%s",
-           dae->dae_creator ? " by: " : "",
-           dae->dae_creator ?: "");
+           dae->dae_comment ? ": " : "",
+           dae->dae_comment ?: "");
 
   dvr_entry_create_by_event(idnode_uuid_as_str(&dae->dae_config->dvr_id), e,
                             dae->dae_start_extra, dae->dae_stop_extra,
-                            dae->dae_owner, buf, dae, dae->dae_pri, dae->dae_retention,
-                            dae->dae_comment);
+                            dae->dae_owner, dae->dae_creator,
+                            dae, dae->dae_pri, dae->dae_retention, buf);
 }
 
 /**

diff --git a/src/dvr/dvr_timerec.c b/src/dvr/dvr_timerec.c
@@ -151,14 +151,14 @@ dvr_timerec_check(dvr_timerec_entry_t *dte)
 
   title = dvr_timerec_title(dte, &tm_start);
   snprintf(buf, sizeof(buf), "Time recording%s%s",
-           dte->dte_creator ? " by: " : "",
-           dte->dte_creator ?: "");
+           dte->dte_comment ? ": " : "",
+           dte->dte_comment ?: "");
   de = dvr_entry_create_(idnode_uuid_as_str(&dte->dte_config->dvr_id),
                          NULL, dte->dte_channel,
                          start, stop, 0, 0, title, NULL,
-                         NULL, NULL, NULL, dte->dte_owner, buf,
+                         NULL, NULL, NULL, dte->dte_owner, dte->dte_creator,
                          NULL, dte, dte->dte_pri, dte->dte_retention,
-                         dte->dte_comment);
+                         buf);
 
   return;