From 41ac60e2a09b20c87433e9b03e9f4af32c9e2cc6 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 25 May 2018 21:56:37 +0000 Subject: [PATCH] 2018-05-25 Fred Gleason * Merged pull request #000197, "Issue 195 rlm_filewrite filename wildcards". --- ChangeLog | 3 +++ lib/rdrlmhost.cpp | 8 ++++---- lib/rdrlmhost.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48c68b54..18215dc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16912,3 +16912,6 @@ 2018-05-25 Fred Gleason * Merged pull request #000194, "Fixed bug in GetStream() where return value from HPI_OutStreamOpen was ignored". +2018-05-25 Fred Gleason + * Merged pull request #000197, "Issue 195 rlm_filewrite filename + wildcards". diff --git a/lib/rdrlmhost.cpp b/lib/rdrlmhost.cpp index 9080b7bb..9d79a622 100644 --- a/lib/rdrlmhost.cpp +++ b/lib/rdrlmhost.cpp @@ -533,10 +533,10 @@ const char *RLMGetStringValue(void *ptr,const char *filename, const char *RLMDateTimeDecode(void *ptr, const char *format, const char *svc_name) { - RLMHost *host=(RLMHost *)ptr; + RDRLMHost *host=(RDRLMHost *)ptr; strncpy(host->plugin_value_string, - RDDateTimeDecode(format,QDateTime::currentDateTime(), - rdstation_conf,air_config, - svc_name),1024); + RDDateTimeDecode(format,QDateTime::currentDateTime(), + rda->station(),rda->config(), + svc_name),1024); return host->plugin_value_string; } diff --git a/lib/rdrlmhost.h b/lib/rdrlmhost.h index d1ad9cb5..d294b14f 100644 --- a/lib/rdrlmhost.h +++ b/lib/rdrlmhost.h @@ -99,7 +99,7 @@ class RDRLMHost : public QObject const char *section,const char *label, const char *default_value); friend const char *RLMDateTimeDecode(void *ptr, const char *format, - const char *svc_name); + const char *svc_name); char plugin_value_string[1024]; };