diff --git a/ChangeLog b/ChangeLog index 9372fb33..1a9dade5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22354,3 +22354,6 @@ with 'Include Music Import Markers in Finished Logs' and 'Include Traffic Import Markers in Finished Logs' checkboxes in the 'Edit Service' dialog in rdadmin(1). +2021-08-31 Fred Gleason + * Added support for [NowGroups] and [NextGroups] sections in + PyPAD script configurations. diff --git a/apis/pypad/api/pypad.py b/apis/pypad/api/pypad.py index 9497e52e..3cec995b 100644 --- a/apis/pypad/api/pypad.py +++ b/apis/pypad/api/pypad.py @@ -2,7 +2,7 @@ # # PAD processor for Rivendell # -# (C) Copyright 2018-2020 Fred Gleason +# (C) Copyright 2018-2021 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 @@ -772,7 +772,9 @@ class Receiver(object): self.__timer_callback=None self.__timer_interval=None self.__config_parser=None - + self.__active_now_groups=[] + self.__active_next_groups=[] + def __pypad_Process(self,pad): self.__pad_callback(pad) @@ -850,9 +852,26 @@ class Receiver(object): self.__config_parser.read_file(fp) fp.close() + # Build lists of active groups + if self.__config_parser.has_section('NowGroups'): + self.__active_now_groups=self.__loadGroups('NowGroups') + if self.__config_parser.has_section('NextGroups'): + self.__active_next_groups=self.__loadGroups('NextGroups') + return self.__config_parser + def __loadGroups(self,section): + grp_list=[] + grp_num=1 + line='Group'+str(grp_num) + while(self.__config_parser.has_option(section,line)): + grp_list.append(self.__config_parser.get(section,line)) + grp_num=grp_num+1 + line='Group'+str(grp_num) + return grp_list + + def start(self,hostname,port): """ Connect to a Rivendell system and begin processing PAD events. @@ -906,7 +925,9 @@ class Receiver(object): linebytes=line.decode('utf-8','replace') msg+=linebytes if linebytes=='\r\n': - self.__pypad_Process(Update(json.loads(msg),self.__config_parser,rd_config)) + jdata=json.loads(msg) + if (not self.__active_now_groups and not self.__active_next_groups) or (jdata['padUpdate'] is not None and jdata['padUpdate']['now'] is not None and jdata['padUpdate']['now']['groupName'] in self.__active_now_groups) or (jdata['padUpdate'] is not None and jdata['padUpdate']['next'] is not None and jdata['padUpdate']['next']['groupName'] in self.__active_next_groups): + self.__pypad_Process(Update(jdata,self.__config_parser,rd_config)) msg="" line=bytes() if self.__timer_interval!=None: diff --git a/apis/pypad/scripts/pypad_ando.exemplar b/apis/pypad/scripts/pypad_ando.exemplar index 56aeb8d7..99c7ea59 100644 --- a/apis/pypad/scripts/pypad_ando.exemplar +++ b/apis/pypad/scripts/pypad_ando.exemplar @@ -66,34 +66,24 @@ VLog119=No VLog120=No -; Additional ANDO systems can be configured by adding new sections... -;[System2] -;IpAddress=192.168.10.22 -;UdpPort=6789 -;Title=%u -;Artist=%a -;Album=%p -;Label= -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_filewrite.exemplar b/apis/pypad/scripts/pypad_filewrite.exemplar index 5b8ca4bc..24ed278b 100644 --- a/apis/pypad/scripts/pypad_filewrite.exemplar +++ b/apis/pypad/scripts/pypad_filewrite.exemplar @@ -70,32 +70,24 @@ VLog119=No VLog120=No -; Additional files can be written by adding new sections... +[NowGroups] +; Group Selection ; -;[File2] -;Filename=/home/rd/foo2.txt -;Append=1 -;FormatString=%t by %a\r\n -;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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_httpget.exemplar b/apis/pypad/scripts/pypad_httpget.exemplar index 1b3bbd7c..97280862 100644 --- a/apis/pypad/scripts/pypad_httpget.exemplar +++ b/apis/pypad/scripts/pypad_httpget.exemplar @@ -60,31 +60,24 @@ VLog119=No VLog120=No -; Additional HTTPS GET URLs can be configured by adding new -; sections... +[NowGroups] +; Group Selection ; -;[Url2] -;URL=https://some.otherplace.com/metadata.php?key=somekey&artist=%a&title=%t -;MasterLog=No -;Aux1Log=Yes -;Aux2Log=No -;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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_icecast2.exemplar b/apis/pypad/scripts/pypad_icecast2.exemplar index d9fa656f..7870659f 100644 --- a/apis/pypad/scripts/pypad_icecast2.exemplar +++ b/apis/pypad/scripts/pypad_icecast2.exemplar @@ -73,34 +73,24 @@ VLog119=No VLog120=No -; Additional Icecast2 mountpoints can be configured by adding new sections... -;[Icecast2] -;Username=source -;Password=letmein -;Hostname=anotherone.example.com -;Tcpport=80 -;Mountpoint=moreaudio.mp3 -;FormatString=%t by %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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_inno713.exemplar b/apis/pypad/scripts/pypad_inno713.exemplar index c049e9d0..5a9b48ae 100644 --- a/apis/pypad/scripts/pypad_inno713.exemplar +++ b/apis/pypad/scripts/pypad_inno713.exemplar @@ -81,37 +81,24 @@ 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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_ino713_tcp.exemplar b/apis/pypad/scripts/pypad_ino713_tcp.exemplar index d4a3f1ca..58fc6b18 100644 --- a/apis/pypad/scripts/pypad_ino713_tcp.exemplar +++ b/apis/pypad/scripts/pypad_ino713_tcp.exemplar @@ -67,34 +67,25 @@ VLog118=No VLog119=No VLog120=No -; Additional RDS encoders can be configured by adding new sections... -;[Rds2] -;IpAddress=192.168.10.22 -;TcpPort=6789 -;Delay=20 -;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 + +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_liqcomp.exemplar b/apis/pypad/scripts/pypad_liqcomp.exemplar index cb4816f7..4b688889 100644 --- a/apis/pypad/scripts/pypad_liqcomp.exemplar +++ b/apis/pypad/scripts/pypad_liqcomp.exemplar @@ -61,33 +61,24 @@ VLog119=No VLog120=No -; Additional encoders can be configured by adding new sections... -;[System2] -;IpAddress=192.168.10.22 -;UdpPort=6789 -;Title=%u -;Artist=%a -;Album=%p -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_live365.exemplar b/apis/pypad/scripts/pypad_live365.exemplar index fd62b1b4..f09bee16 100644 --- a/apis/pypad/scripts/pypad_live365.exemplar +++ b/apis/pypad/scripts/pypad_live365.exemplar @@ -63,35 +63,24 @@ VLog119=No VLog120=No -; Additional Live365 stations can be configured by adding new -; sections... +[NowGroups] +; Group Selection ; -;[Station2] -;MemberName=your_station -;Password=changeme -;TitleString=%t -;ArtistString=%a -;AlbumString=%l -;MasterLog=No -;Aux1Log=Yes -;Aux2Log=No -;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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_nautel.exemplar b/apis/pypad/scripts/pypad_nautel.exemplar index 619cbc41..2f745fbf 100644 --- a/apis/pypad/scripts/pypad_nautel.exemplar +++ b/apis/pypad/scripts/pypad_nautel.exemplar @@ -119,72 +119,25 @@ VLog118=No VLog119=No VLog120=No -; Additional RDS encoders can be configured by adding new sections... -;[Rds2] -;IpAddress=192.168.10.22 -;TcpPort=6789 -;Delay=20 -;ProgramService= -;DynamicPS=%t -;RadioText=%a -;;PICode= ***SET THIS IN YOUR TRANSMITTER PER THE RDS/RDBS SPEC*** -;ProgramType=0 -;ProgramTypeName= -;TrafficProgram=0 -;TrafficAnnouncement=0 -;AltFreq1=107 -;AltFreq2=107 -;AltFreq3=107 -;AltFreq4=107 -;AltFreq5=107 -;AltFreq6=107 -;AltFreq7=107 -;AltFreq8=107 -;AltFreq9=107 -;AltFreq10=107 -;AltFreq11=107 -;AltFreq12=107 -;AltFreq13=107 -;AltFreq14=107 -;AltFreq15=107 -;AltFreq16=107 -;AltFreq17=107 -;AltFreq18=107 -;AltFreq19=107 -;AltFreq20=107 -;AltFreq21=107 -;AltFreq22=107 -;AltFreq23=107 -;AltFreq24=107 -;AltFreq25=107 -;DecoderInfo=3 -;MusicSpeech=1 -;Date= -;Time= -;UTCOffset=39 -;Cont= -;DPSRate=0 -;DPSMode=0 -;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 + +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_serial.exemplar b/apis/pypad/scripts/pypad_serial.exemplar index e5ee3223..f02534ee 100644 --- a/apis/pypad/scripts/pypad_serial.exemplar +++ b/apis/pypad/scripts/pypad_serial.exemplar @@ -83,34 +83,24 @@ VLog119=No VLog120=No -; Additional serial ports can be configured by adding new sections... -;[Serial2] -;Device=/dev/ttyS1 -;Speed=9600 -;Parity=0 -;WordSize=8 -;FormatString=%t -;ProcessNullUpdates=0 -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_shoutcast1.exemplar b/apis/pypad/scripts/pypad_shoutcast1.exemplar index 80b9369d..1e15ed9e 100644 --- a/apis/pypad/scripts/pypad_shoutcast1.exemplar +++ b/apis/pypad/scripts/pypad_shoutcast1.exemplar @@ -69,34 +69,24 @@ VLog119=No VLog120=No -; Additional Shoutcast server instances can be configured by adding new -; sections... +[NowGroups] +; Group Selection ; -;[Shoutcast2] -;Password=letmein -;Hostname=anotherone.example.com -;Tcpport=80 -;FormatString=%t by %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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_spinitron.exemplar b/apis/pypad/scripts/pypad_spinitron.exemplar index 1aa322b8..77584d2d 100644 --- a/apis/pypad/scripts/pypad_spinitron.exemplar +++ b/apis/pypad/scripts/pypad_spinitron.exemplar @@ -91,42 +91,24 @@ VLog119=No VLog120=No -; Additional Spinitron instances can be configured by adding new -; sections... +[NowGroups] +; Group Selection ; -;[Spinitron2] -;MajorVersion=2 -;Station=abcd -;Username=metoo -;Password=letmein -;APIKey=some_different_key -;Title=%t -;Artist=%a -;Album=%l -;Label=%b -;Composer=%m -;Conductor=%r -;Notes=%u -;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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_spottrap.exemplar b/apis/pypad/scripts/pypad_spottrap.exemplar index c270a943..959f6e19 100644 --- a/apis/pypad/scripts/pypad_spottrap.exemplar +++ b/apis/pypad/scripts/pypad_spottrap.exemplar @@ -89,35 +89,24 @@ VLog119=No VLog120=No -; Additional Rules can be configured by adding new sections... -;[Rule2] -;GroupName=TEST -;MinimumLength=0 -;MaximumLength=1000000 -;FormatString=Artist: %a%r -;DefaultFormatString=Artist: %a%r -;IpAddress=192.168.10.30 -;UdpPort=6789 -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_tunein.exemplar b/apis/pypad/scripts/pypad_tunein.exemplar index 7586d03f..422ab969 100644 --- a/apis/pypad/scripts/pypad_tunein.exemplar +++ b/apis/pypad/scripts/pypad_tunein.exemplar @@ -70,36 +70,24 @@ VLog119=No VLog120=No -; Additional TuneIn stations can be configured by adding new -; sections... +[NowGroups] +; Group Selection ; -;[Station2] -;StationID=s654321 -;PartnerID=changeme -;PartnerKey=changeme -;TitleString=%t -;ArtistString=%a -;AlbumString=%l -;MasterLog=No -;Aux1Log=Yes -;Aux2Log=No -;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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_udp.exemplar b/apis/pypad/scripts/pypad_udp.exemplar index 11c17840..91de1c05 100644 --- a/apis/pypad/scripts/pypad_udp.exemplar +++ b/apis/pypad/scripts/pypad_udp.exemplar @@ -74,32 +74,24 @@ VLog119=No VLog120=No -; Additional UDP destinations can be configured by adding new sections... -;[Udp2] -;FormatString=Artist: %a%r -;IpAddress=192.168.10.22 -;UdpPort=6789 -;ProcessNullUpdates=0 -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_urlwrite.exemplar b/apis/pypad/scripts/pypad_urlwrite.exemplar index 3db2976c..348cb82d 100644 --- a/apis/pypad/scripts/pypad_urlwrite.exemplar +++ b/apis/pypad/scripts/pypad_urlwrite.exemplar @@ -80,34 +80,24 @@ VLog119=No VLog120=No -; Additional files can be written by adding new sections... +[NowGroups] +; Group Selection ; -;[Url2] -;Url=file:///home/rd/somefile.txt -;Username=janedoe -;Password=crackme -;FormatString=%t by %a\r\n -;Encoding=0 -;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 +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_walltime.exemplar b/apis/pypad/scripts/pypad_walltime.exemplar index 8d4189c1..52b0c8ab 100644 --- a/apis/pypad/scripts/pypad_walltime.exemplar +++ b/apis/pypad/scripts/pypad_walltime.exemplar @@ -59,31 +59,24 @@ VLog119=No VLog120=No -; Additional WallTime units can be configured by adding new sections... -;[Walltime2] -;FormatString=Artist: %a -;IpAddress=192.168.10.22 -;UdpPort=6060 -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_xcmd.exemplar b/apis/pypad/scripts/pypad_xcmd.exemplar index 5e067943..3467187a 100644 --- a/apis/pypad/scripts/pypad_xcmd.exemplar +++ b/apis/pypad/scripts/pypad_xcmd.exemplar @@ -139,5 +139,24 @@ VLog119=No VLog120=No -; Additional RDS encoders can be configured by adding new sections... -;[XCmd2] +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_xds.exemplar b/apis/pypad/scripts/pypad_xds.exemplar index 161658e2..f806bb3c 100644 --- a/apis/pypad/scripts/pypad_xds.exemplar +++ b/apis/pypad/scripts/pypad_xds.exemplar @@ -71,34 +71,24 @@ VLog119=No VLog120=No -; Additional Vantive destinations can be configured by adding new sections... -;[Udp2] -;IpAddress=192.168.10.22 -;UdpPort=6789 -;TtyDevice=/dev/ttyS1 -;TtySpeed=19200 -;Repetitions=1 -;RepetitionDelay=100 -;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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... diff --git a/apis/pypad/scripts/pypad_xmpad.exemplar b/apis/pypad/scripts/pypad_xmpad.exemplar index bc6e4f29..162a79aa 100755 --- a/apis/pypad/scripts/pypad_xmpad.exemplar +++ b/apis/pypad/scripts/pypad_xmpad.exemplar @@ -78,34 +78,24 @@ VLog119=No VLog120=No -; Additional serial ports can be configured by adding new sections... -;[Serial2] -;Device=/dev/ttyS1 -;Speed=4800 -;Parity=0 -;WordSize=8 -;FormatString1=%t -;FormatString2=%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 +[NowGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'now' playing +; event. If no groups are listed here and in the [NextGroups] section, +; then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added... + +[NextGroups] +; Group Selection +; +; Filter updates according to the Group membership of the 'next' playing +; event. If no groups are listed here, If no groups are listed here and in +; the [NowGroups] section,then ALL updates will be forwarded +; without regard to Group. +; Group1=MUSIC +; Group2=LEGAL +; [...] ; Additional groups can be added...