From a5861283c96da11f6a52b219840ef6155ad84f0a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 14 Oct 2017 11:22:35 -0400 Subject: [PATCH] 2017-10-14 Fred Gleason * Implemented resolution of date wildcards for the RLM 'Path' and 'Argument' parameters. --- ChangeLog | 3 +++ rdairplay/rlmhost.cpp | 13 +++++++------ rdairplay/rlmhost.h | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20987b25..66d0a005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16096,3 +16096,6 @@ RDAdmin(1). 2017-10-14 Fred Gleason * Implemented a '%r' wildcard for Rivendell Host Name. +2017-10-14 Fred Gleason + * Implemented resolution of date wildcards for the RLM 'Path' and + 'Argument' parameters. diff --git a/rdairplay/rlmhost.cpp b/rdairplay/rlmhost.cpp index cb428723..911f56a3 100644 --- a/rdairplay/rlmhost.cpp +++ b/rdairplay/rlmhost.cpp @@ -2,7 +2,7 @@ // // A container class for a Rivendell Loadable Module host. // -// (C) Copyright 2008,2016 Fred Gleason +// (C) Copyright 2008,2016-2017 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,20 +22,21 @@ #include #include -#include +#include #include +#include #include -#include -#include +#include "globals.h" +#include "rlmhost.h" RLMHost::RLMHost(const QString &path,const QString &arg, QSocketDevice *udp_socket,QObject *parent) : QObject(parent) { - plugin_path=path; - plugin_arg=arg; + plugin_path=RDDateDecode(path,QDate::currentDate(),air_config); + plugin_arg=RDDateDecode(arg,QDate::currentDate(),air_config); plugin_udp_socket=udp_socket; plugin_handle=NULL; plugin_start_sym=NULL; diff --git a/rdairplay/rlmhost.h b/rdairplay/rlmhost.h index c334e6db..3a7e59f0 100644 --- a/rdairplay/rlmhost.h +++ b/rdairplay/rlmhost.h @@ -2,7 +2,7 @@ // // A container class for a Rivendell Loadable Module host. // -// (C) Copyright 2008,2016 Fred Gleason +// (C) Copyright 2008,2016-2017 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,9 +29,10 @@ #include #include -#include -#include #include +#include +#include + #include "../rlm/rlm.h" class RLMHost : public QObject