2019-01-04 Fred Gleason <fredg@paravelsystems.com>

* Added a 'pypad_inno713.py' PyPAD script.
	* Removed the 'rlm_inno713' RLM.

ChangeLog

@@ -18269,3 +18269,6 @@
 2019-01-04 Fred Gleason <fredg@paravelsystems.com>
 	* Added a 'pypad_xds.py' PyPAD script.
 	* Removed the 'rlm_xds' RLM.
+2019-01-04 Fred Gleason <fredg@paravelsystems.com>
+	* Added a 'pypad_inno713.py' PyPAD script.
+	* Removed the 'rlm_inno713' RLM.

apis/PyPAD/scripts/Makefile.am

@@ -26,6 +26,8 @@ install-exec-am:
 	cp pypad_ando.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_ando.exemplar
 	../../../helpers/install_python.sh pypad_filewrite.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_filewrite.py
 	cp pypad_filewrite.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_filewrite.exemplar
+	../../../helpers/install_python.sh pypad_inno713.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_inno713.py
+	cp pypad_inno713.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_inno713.exemplar
 	../../../helpers/install_python.sh pypad_live365.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_live365.py
 	cp pypad_live365.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_live365.exemplar
 	../../../helpers/install_python.sh pypad_liqcomp.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_liqcomp.py
@@ -48,6 +50,8 @@ uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_ando.py
 	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_filewrite.exemplar
 	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_filewrite.py
+	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_inno713.exemplar
+	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_inno713.py
 	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_live365.exemplar
 	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_live365.py
 	rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_liqcomp.exemplar
@@ -69,6 +73,8 @@ EXTRA_DIST = pypad_ando.exemplar\
              pypad_ando.py\
              pypad_filewrite.exemplar\
              pypad_filewrite.py\
+             pypad_inno713.exemplar\
+             pypad_inno713.py\
              pypad_liqcomp.exemplar\
              pypad_liqcomp.py\
              pypad_live365.exemplar\

apis/PyPAD/scripts/pypad_inno713.exemplar

@@ -0,0 +1,117 @@
+; This is the configuration for the 'rlm_inno713.py' script for 
+; Rivendell, which can be used to output Now & Next data to one or more
+; Innovonics model 713 RDS encoders.
+
+; Section Header
+;
+; One section per remote RDS unit is configured, starting with 'Rds1' and 
+; working up consecutively
+[Rds1]
+
+; Two methods of connecting to the unit are supported: TCP/IP or serial.
+;
+; *****************************************************************************
+; TCP/IP Connection Settings
+;  IP Address
+;
+; The IP address of the UDP port to send updates to, in dotted-quad notation.
+; If using a serial connection, leave this entry blank!
+IpAddress=127.0.0.1
+
+; UDP Port
+;
+; The UDP port number to send updates to, in the range 0 - 65,535.
+UdpPort=10001
+; *****************************************************************************
+
+; *****************************************************************************
+; Serial Connection Settings
+; 
+; The device file that corresponds to the serial device that is connected
+; to the unit.  If using a TCP/IP connection, leave this entry blank!
+;Device=/dev/ttyS0
+
+; Serial Baud Rate (in bps)
+Speed=9600
+
+; Parity (0=none, 1=even, 2=odd)
+Parity=0
+
+; Number of bits per data 'word'.
+WordSize=8
+; *****************************************************************************
+
+; Output Strings.  The PAD data to output each time RDAirPlay changes
+; play state, including any wildcards as placeholders for metadata values.
+;
+; For the list of supported wildcards. see the 'Metadata Wildcards' section
+; of the Rivendell Operations Guide.
+PsString=
+DynamicPsString=%t
+RadiotextString=%a
+
+; Log Selection
+;
+; Set the status for each log to 'Yes', 'No' or 'Onair' to indicate whether
+; state changes on that log should be output on this udp port.  If set
+; to 'Onair', then output will be generated only if RDAirPlays OnAir flag
+; is active.
+MasterLog=Yes
+Aux1Log=Yes
+Aux2Log=Yes
+VLog101=No
+VLog102=No
+VLog103=No
+VLog104=No
+VLog105=No
+VLog106=No
+VLog107=No
+VLog108=No
+VLog109=No
+VLog110=No
+VLog111=No
+VLog112=No
+VLog113=No
+VLog114=No
+VLog115=No
+VLog116=No
+VLog117=No
+VLog118=No
+VLog119=No
+VLog120=No
+
+
+; Additional RDS encoders can be configured by adding new sections...
+;[Rds2]
+;IpAddress=192.168.10.22
+;UdpPort=6789
+;Device=/dev/ttyS0
+;Speed=9600
+;Parity=0
+;WordSize=8
+;PsString=
+;DynamicPsString=%t
+;RadiotextString=%a
+;MasterLog=Yes
+;Aux1Log=No
+;Aux2Log=Onair
+;VLog101=No
+;VLog102=No
+;VLog103=No
+;VLog104=No
+;VLog105=No
+;VLog106=No
+;VLog107=No
+;VLog108=No
+;VLog109=No
+;VLog110=No
+;VLog111=No
+;VLog112=No
+;VLog113=No
+;VLog114=No
+;VLog115=No
+;VLog116=No
+;VLog117=No
+;VLog118=No
+;VLog119=No
+;VLog120=No

apis/PyPAD/scripts/pypad_inno713.py

@@ -0,0 +1,99 @@
+#!%PYTHON_BANGPATH%
+
+# pypad_inno713.py
+#
+# Send Now & Next updates to an Innovonics 713 RDS encoder
+#
+#   (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
+#
+#   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
+#   published by the Free Software Foundation.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+import sys
+import socket
+import configparser
+import serial
+import PyPAD
+
+def eprint(*args,**kwargs):
+    print(*args,file=sys.stderr,**kwargs)
+
+
+def ProcessPad(update):
+    n=1
+    while(True):
+        section='Rds'+str(n)
+        try:
+            if update.shouldBeProcessed(section) and update.hasPadType(PyPAD.TYPE_NOW):
+                dps=''
+                if(len(update.config().get(section,'DynamicPsString'))!=0):
+                    dps='DPS='+update.resolvePadFields(update.config().get(section,'DynamicPsString'),PyPAD.ESCAPE_NONE)+'\r\n'
+                ps=''
+                if(len(update.config().get(section,'PsString'))!=0):
+                    ps='PS='+update.resolvePadFields(update.config().get(section,'PsString'),PyPAD.ESCAPE_NONE)+'\r\n'
+                text=''
+                if(len(update.config().get(section,'RadiotextString'))!=0):
+                    text='TEXT='+update.resolvePadFields(update.config().get(section,'RadiotextString'),PyPAD.ESCAPE_NONE)+'\r\n'
+                try:
+                    #
+                    # Use serial output
+                    #
+                    tty_dev=update.config().get(section,'Device')
+                    speed=int(update.config().get(section,'Speed'))
+                    parity=serial.PARITY_NONE
+                    if int(update.config().get(section,'Parity'))==1:
+                        parity=serial.PARITY_EVEN
+                    if int(update.config().get(section,'Parity'))==2:
+                        parity=serial.PARITY_ODD
+                    bytesize=int(update.config().get(section,'WordSize'))
+                    dev=serial.Serial(tty_dev,speed,parity=parity,bytesize=bytesize)
+                    if(len(dps)!=0):
+                        dev.write(dps.encode('utf-8'))
+                    if(len(ps)!=0):
+                        dev.write(ps.encode('utf-8'))
+                    if(len(text)!=0):
+                        dev.write(text.encode('utf-8'))
+                    dev.close()
+
+                except configparser.NoOptionError:
+                    #
+                    # Use UDP output
+                    #
+                    ipaddr=update.config().get(section,'IpAddress')
+                    port=int(update.config().get(section,'UdpPort'))
+                    if(len(dps)!=0):
+                        send_sock.sendto(dps.encode('utf-8'),(ipaddr,port))
+                    if(len(ps)!=0):
+                        send_sock.sendto(ps.encode('utf-8'),(ipaddr,port))
+                    if(len(text)!=0):
+                        send_sock.sendto(text.encode('utf-8'),(ipaddr,port))
+            n=n+1
+        except configparser.NoSectionError:
+            return
+
+#
+# 'Main' function
+#
+# Create Send Socket
+#
+send_sock=socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
+
+rcvr=PyPAD.Receiver()
+try:
+    rcvr.setConfigFile(sys.argv[3])
+except IndexError:
+    eprint('pypad_inno713.py: you must specify a configuration file')
+    sys.exit(1)
+rcvr.setCallback(ProcessPad)
+rcvr.start(sys.argv[1],int(sys.argv[2]))

apis/rlm/Makefile-example

@@ -20,7 +20,6 @@
 
 OBJS = 
        rlm_icecast2.rlm\
-       rlm_inno713.rlm\
        rlm_shoutcast1.rlm\
        rlm_spottrap.rlm\
        rlm_test.rlm\

apis/rlm/Makefile.am

@@ -22,7 +22,6 @@
 AM_CFLAGS = -fPIC -Wall -I../
 
 RLM_MODULES = rlm_icecast2.rlm\
-              rlm_inno713.rlm\
               rlm_shoutcast1.rlm\
               rlm_spottrap.rlm\
               rlm_test.rlm\
@@ -49,7 +48,6 @@ header_HEADERS = rlm.h
 EXTRA_DIST = Makefile-example\
              rlm.h\
              rlm_icecast2.c\
-             rlm_inno713.c\
              rlm_shoutcast1.c\
              rlm_spottrap.c\
              rlm_test.c\

apis/rlm/rlm_inno713.c

@@ -1,494 +0,0 @@
-/* rlm_inno713.c
- *
- *   (C) Copyright 2009 Fred Gleason <fredg@paravelsystems.com>
- *
- *   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 published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public
- *   License along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This is a Rivendell Loadable Module.  It sends Now&Next PAD
- * to the Innovonics model 713 RDS encoder, as specified in the 
- * configuration file pointed to by the plugin argument.
- *
- * To compile this module, just do:
- * 
- *   gcc -shared -o rlm_inno713.rlm rlm_inno713.c
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-#include <rlm/rlm.h>
-
-int rlm_inno713_devs;
-char *rlm_inno713_addresses;
-uint16_t *rlm_inno713_ports;
-int *rlm_inno713_handles;
-char *rlm_inno713_dynamicpss;
-char *rlm_inno713_pss;
-char *rlm_inno713_radiotexts;
-int *rlm_inno713_masters;
-int *rlm_inno713_aux1s;
-int *rlm_inno713_aux2s;
-int *rlm_inno713_vlog101s;
-int *rlm_inno713_vlog102s;
-int *rlm_inno713_vlog103s;
-int *rlm_inno713_vlog104s;
-int *rlm_inno713_vlog105s;
-int *rlm_inno713_vlog106s;
-int *rlm_inno713_vlog107s;
-int *rlm_inno713_vlog108s;
-int *rlm_inno713_vlog109s;
-int *rlm_inno713_vlog110s;
-int *rlm_inno713_vlog111s;
-int *rlm_inno713_vlog112s;
-int *rlm_inno713_vlog113s;
-int *rlm_inno713_vlog114s;
-int *rlm_inno713_vlog115s;
-int *rlm_inno713_vlog116s;
-int *rlm_inno713_vlog117s;
-int *rlm_inno713_vlog118s;
-int *rlm_inno713_vlog119s;
-int *rlm_inno713_vlog120s;
-
-void rlm_inno713_Upcase(char *str)
-{
-  int i;
-
-  for(i=0;i<strlen(str);i++) {
-    str[i]=toupper(str[i]);
-  }
-}
-
-
-void rlm_inno713_SendString(void *ptr,const struct rlm_pad *now,
-			    const struct rlm_pad *next,const char *tag,
-			    const char *fmt,const char *addr,uint16_t port,
-			    int handle)
-{
-  char pkt[1024];
-
-  if(strlen(fmt)>0) {
-    const char *str=RLMResolveNowNext(ptr,now,next,fmt);
-    if(strlen(str)>0) {
-      sprintf(pkt,"%s=%s\r\n",tag,str);
-      rlm_inno713_Upcase(pkt);
-      if(strlen(addr)>0) {
-	RLMSendUdp(ptr,addr,port,pkt,strlen(pkt));
-      }
-      if(handle>=0) {
-	RLMSendSerial(ptr,handle,pkt,strlen(pkt));
-      }
-    }
-  }
-}
-			    
-
-int rlm_inno713_GetLogStatus(void *ptr,const char *arg,const char *section,
-			    const char *logname)
-{
-  const char *tag=RLMGetStringValue(ptr,arg,section,logname,"");
-  if(strcasecmp(tag,"yes")==0) {
-    return 1;
-  }
-  if(strcasecmp(tag,"on")==0) {
-    return 1;
-  }
-  if(strcasecmp(tag,"true")==0) {
-    return 1;
-  }
-  if(strcasecmp(tag,"no")==0) {
-    return 0;
-  }
-  if(strcasecmp(tag,"off")==0) {
-    return 0;
-  }
-  if(strcasecmp(tag,"false")==0) {
-    return 0;
-  }
-  if(strcasecmp(tag,"onair")==0) {
-    return 2;
-  }  
-  return 0;
-}
-
-
-void rlm_inno713_RLMStart(void *ptr,const char *arg)
-{
-  char address[17];
-  char section[256];
-  char errtext[256];
-  char device[256];
-  int speed;
-  int parity;
-  int wsize;
-  int i=1;
-
-  rlm_inno713_devs=0;
-  rlm_inno713_addresses=NULL;
-  rlm_inno713_ports=NULL;
-  rlm_inno713_handles=NULL;
-  rlm_inno713_dynamicpss=NULL;
-  rlm_inno713_masters=NULL;
-  rlm_inno713_aux1s=NULL;
-  rlm_inno713_aux2s=NULL;
-  rlm_inno713_vlog101s=NULL;
-  rlm_inno713_vlog102s=NULL;
-  rlm_inno713_vlog103s=NULL;
-  rlm_inno713_vlog104s=NULL;
-  rlm_inno713_vlog105s=NULL;
-  rlm_inno713_vlog106s=NULL;
-  rlm_inno713_vlog107s=NULL;
-  rlm_inno713_vlog108s=NULL;
-  rlm_inno713_vlog109s=NULL;
-  rlm_inno713_vlog110s=NULL;
-  rlm_inno713_vlog111s=NULL;
-  rlm_inno713_vlog112s=NULL;
-  rlm_inno713_vlog113s=NULL;
-  rlm_inno713_vlog114s=NULL;
-  rlm_inno713_vlog115s=NULL;
-  rlm_inno713_vlog116s=NULL;
-  rlm_inno713_vlog117s=NULL;
-  rlm_inno713_vlog118s=NULL;
-  rlm_inno713_vlog119s=NULL;
-  rlm_inno713_vlog120s=NULL;
-
-  sprintf(section,"Rds%d",i++);
-  strncpy(address,RLMGetStringValue(ptr,arg,section,"IpAddress",""),15);
-  strncpy(device,RLMGetStringValue(ptr,arg,section,"Device",""),256);
-  if((strlen(address)==0)&&(strlen(device)==0)) {
-    RLMLog(ptr,LOG_WARNING,"rlm_inno713: no RDS connections specified");
-    return;
-  }
-  while((strlen(address)>0)||(strlen(device)>0)) {
-    rlm_inno713_addresses=
-      realloc(rlm_inno713_addresses,
-	      (rlm_inno713_devs+1)*(rlm_inno713_devs+1)*16);
-    strcpy(rlm_inno713_addresses+16*rlm_inno713_devs,address);
-    rlm_inno713_ports=realloc(rlm_inno713_ports,
-			      (rlm_inno713_devs+1)*sizeof(uint16_t));
-    rlm_inno713_ports[rlm_inno713_devs]=
-      RLMGetIntegerValue(ptr,arg,section,"UdpPort",0);
-    speed=RLMGetIntegerValue(ptr,arg,section,"Speed",9600);
-    parity=RLMGetIntegerValue(ptr,arg,section,"Parity",0);
-    wsize=RLMGetIntegerValue(ptr,arg,section,"WordSize",8);
-    rlm_inno713_handles=realloc(rlm_inno713_handles,
-				(rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_handles[rlm_inno713_devs]=
-      RLMOpenSerial(ptr,device,speed,parity,wsize);
-    rlm_inno713_dynamicpss=realloc(rlm_inno713_dynamicpss,(rlm_inno713_devs+1)*256);
-    strncpy(rlm_inno713_dynamicpss+256*rlm_inno713_devs,
-	    RLMGetStringValue(ptr,arg,section,"DynamicPsString",""),256);
-
-    rlm_inno713_pss=realloc(rlm_inno713_pss,(rlm_inno713_devs+1)*256);
-    strncpy(rlm_inno713_pss+256*rlm_inno713_devs,
-	    RLMGetStringValue(ptr,arg,section,"PsString",""),256);
-    rlm_inno713_radiotexts=realloc(rlm_inno713_radiotexts,
-				   (rlm_inno713_devs+1)*256);
-    strncpy(rlm_inno713_radiotexts+256*rlm_inno713_devs,
-	    RLMGetStringValue(ptr,arg,section,"RadiotextString",""),256);
-    rlm_inno713_masters=realloc(rlm_inno713_masters,
-			    (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_masters[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"MasterLog");
-    rlm_inno713_aux1s=realloc(rlm_inno713_aux1s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_aux1s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"Aux1Log");
-    rlm_inno713_aux2s=realloc(rlm_inno713_aux2s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_aux2s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"Aux2Log");
-
-    rlm_inno713_vlog101s=realloc(rlm_inno713_vlog101s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog101s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog101");
-
-    rlm_inno713_vlog102s=realloc(rlm_inno713_vlog102s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog102s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog102");
-
-    rlm_inno713_vlog103s=realloc(rlm_inno713_vlog103s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog103s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog103");
-
-    rlm_inno713_vlog104s=realloc(rlm_inno713_vlog104s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog104s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog104");
-
-    rlm_inno713_vlog105s=realloc(rlm_inno713_vlog105s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog105s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog105");
-
-    rlm_inno713_vlog106s=realloc(rlm_inno713_vlog106s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog106s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog106");
-
-    rlm_inno713_vlog107s=realloc(rlm_inno713_vlog107s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog107s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog107");
-
-    rlm_inno713_vlog108s=realloc(rlm_inno713_vlog108s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog108s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog108");
-
-    rlm_inno713_vlog109s=realloc(rlm_inno713_vlog109s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog109s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog109");
-
-    rlm_inno713_vlog110s=realloc(rlm_inno713_vlog110s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog110s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog110");
-
-    rlm_inno713_vlog111s=realloc(rlm_inno713_vlog111s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog111s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog111");
-
-    rlm_inno713_vlog112s=realloc(rlm_inno713_vlog112s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog112s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog112");
-
-    rlm_inno713_vlog113s=realloc(rlm_inno713_vlog113s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog113s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog113");
-
-    rlm_inno713_vlog114s=realloc(rlm_inno713_vlog114s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog114s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog114");
-
-    rlm_inno713_vlog115s=realloc(rlm_inno713_vlog115s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog115s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog115");
-
-    rlm_inno713_vlog116s=realloc(rlm_inno713_vlog116s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog116s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog116");
-
-    rlm_inno713_vlog117s=realloc(rlm_inno713_vlog117s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog117s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog117");
-
-    rlm_inno713_vlog118s=realloc(rlm_inno713_vlog118s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog118s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog118");
-
-    rlm_inno713_vlog119s=realloc(rlm_inno713_vlog119s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog119s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog119");
-
-    rlm_inno713_vlog120s=realloc(rlm_inno713_vlog120s,
-			  (rlm_inno713_devs+1)*sizeof(int));
-    rlm_inno713_vlog120s[rlm_inno713_devs]=
-      rlm_inno713_GetLogStatus(ptr,arg,section,"VLog120");
-
-    sprintf(errtext,"rlm_inno713: configured destination \"%s:%d\"",address,
-	    rlm_inno713_ports[rlm_inno713_devs]);
-    RLMLog(ptr,LOG_INFO,errtext);
-    if(strlen(device)>0) {
-      if(rlm_inno713_handles[rlm_inno713_devs]<0) {
-	sprintf(errtext,"rlm_inno713: unable to open serial device \"%s\"",device);
-      }
-      else {
-	sprintf(errtext,"rlm_inno713: configured serial device \"%s\"",device);
-      }
-      RLMLog(ptr,LOG_INFO,errtext);
-    }
-    rlm_inno713_devs++;
-    sprintf(section,"Rds%d",i++);
-    strncpy(address,RLMGetStringValue(ptr,arg,section,"IpAddress",""),15);
-    strncpy(device,RLMGetStringValue(ptr,arg,section,"Device",""),256);
-  }
-}
-
-
-void rlm_inno713_RLMFree(void *ptr)
-{
-  int i;
-
-  free(rlm_inno713_addresses);
-  free(rlm_inno713_ports);
-  for(i=0;i<rlm_inno713_devs;i++) {
-    if(rlm_inno713_handles[i]>=0) {
-      RLMCloseSerial(ptr,rlm_inno713_handles[i]);
-    }
-  }
-  free(rlm_inno713_handles);
-  free(rlm_inno713_dynamicpss);
-  free(rlm_inno713_pss);
-  free(rlm_inno713_radiotexts);
-  free(rlm_inno713_masters);
-  free(rlm_inno713_aux1s);
-  free(rlm_inno713_aux2s);
-  free(rlm_inno713_vlog101s);
-  free(rlm_inno713_vlog102s);
-  free(rlm_inno713_vlog103s);
-  free(rlm_inno713_vlog104s);
-  free(rlm_inno713_vlog105s);
-  free(rlm_inno713_vlog106s);
-  free(rlm_inno713_vlog107s);
-  free(rlm_inno713_vlog108s);
-  free(rlm_inno713_vlog109s);
-  free(rlm_inno713_vlog110s);
-  free(rlm_inno713_vlog111s);
-  free(rlm_inno713_vlog112s);
-  free(rlm_inno713_vlog113s);
-  free(rlm_inno713_vlog114s);
-  free(rlm_inno713_vlog115s);
-  free(rlm_inno713_vlog116s);
-  free(rlm_inno713_vlog117s);
-  free(rlm_inno713_vlog118s);
-  free(rlm_inno713_vlog119s);
-  free(rlm_inno713_vlog120s);
-}
-
-
-void rlm_inno713_RLMPadDataSent(void *ptr,const struct rlm_svc *svc,
-			     const struct rlm_log *log,
-			     const struct rlm_pad *now,
-			     const struct rlm_pad *next)
-{
-  int i;
-  int flag=0;
-  char msg[1500];
-
-  for(i=0;i<rlm_inno713_devs;i++) {
-    switch(log->log_mach) {
-      case 0:
-	flag=rlm_inno713_masters[i];
-	break;
-
-      case 1:
-	flag=rlm_inno713_aux1s[i];
-	break;
-
-      case 2:
-	flag=rlm_inno713_aux2s[i];
-	break;
-
-    case 100:
-      flag=rlm_inno713_vlog101s[i];
-      break;
-
-    case 101:
-      flag=rlm_inno713_vlog102s[i];
-      break;
-
-    case 102:
-      flag=rlm_inno713_vlog103s[i];
-      break;
-
-    case 103:
-      flag=rlm_inno713_vlog104s[i];
-      break;
-
-    case 104:
-      flag=rlm_inno713_vlog105s[i];
-      break;
-
-    case 105:
-      flag=rlm_inno713_vlog106s[i];
-      break;
-
-    case 106:
-      flag=rlm_inno713_vlog107s[i];
-      break;
-
-    case 107:
-      flag=rlm_inno713_vlog108s[i];
-      break;
-
-    case 108:
-      flag=rlm_inno713_vlog109s[i];
-      break;
-
-    case 109:
-      flag=rlm_inno713_vlog110s[i];
-      break;
-
-    case 110:
-      flag=rlm_inno713_vlog111s[i];
-      break;
-
-    case 111:
-      flag=rlm_inno713_vlog112s[i];
-      break;
-
-    case 112:
-      flag=rlm_inno713_vlog113s[i];
-      break;
-
-    case 113:
-      flag=rlm_inno713_vlog114s[i];
-      break;
-
-    case 114:
-      flag=rlm_inno713_vlog115s[i];
-      break;
-
-    case 115:
-      flag=rlm_inno713_vlog116s[i];
-      break;
-
-    case 116:
-      flag=rlm_inno713_vlog117s[i];
-      break;
-
-    case 117:
-      flag=rlm_inno713_vlog118s[i];
-      break;
-
-    case 118:
-      flag=rlm_inno713_vlog119s[i];
-      break;
-
-    case 119:
-      flag=rlm_inno713_vlog120s[i];
-      break;
-    }
-    if((flag==1)||((flag==2)&&(log->log_onair!=0))) {
-      rlm_inno713_SendString(ptr,now,next,"DPS",rlm_inno713_dynamicpss+256*i,
-			     rlm_inno713_addresses+i*16,rlm_inno713_ports[i],
-			     rlm_inno713_handles[i]);
-      rlm_inno713_SendString(ptr,now,next,"PS",rlm_inno713_pss+256*i,
-			     rlm_inno713_addresses+i*16,rlm_inno713_ports[i],
-			     rlm_inno713_handles[i]);
-      rlm_inno713_SendString(ptr,now,next,"TEXT",rlm_inno713_radiotexts+256*i,
-			     rlm_inno713_addresses+i*16,rlm_inno713_ports[i],
-			     rlm_inno713_handles[i]);
-
-      const char *str=RLMResolveNowNext(ptr,now,next,rlm_inno713_pss+256*i);
-      snprintf(msg,1500,"rlm_inno713: sending pad update: \"%s\"",str);
-      RLMLog(ptr,LOG_INFO,msg);
-    }
-  }
-}

conf/rlm_inno713.conf

@@ -79,7 +79,7 @@ WordSize=8
 ;   %u   %U   User Definied
 ;   %o   %O   Outcue
 ;   %i   %I   Description
-PsString=
+PsString=PSPS
 DynamicPsString=%t
 RadiotextString=%a