2018-12-20 Fred Gleason <fredg@paravelsystems.com>

* Added a 'pypad_liqcomp.py' PyPAD script.
	* Removed the 'rlm_liqcomp' RLM.
This commit is contained in:
Fred Gleason
2018-12-20 14:03:56 -05:00
parent ca76777c11
commit 8b16cb1b58
6 changed files with 175 additions and 432 deletions

View File

@@ -28,6 +28,8 @@ install-exec-am:
cp pypad_filewrite.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_filewrite.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
cp pypad_liqcomp.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_liqcomp.exemplar
../../../helpers/install_python.sh pypad_spinitron.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_spinitron.py
cp pypad_spinitron.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_spinitron.exemplar
../../../helpers/install_python.sh pypad_udp.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_udp.py
@@ -44,6 +46,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_filewrite.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
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_liqcomp.py
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_spinitron.exemplar
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_spinitron.py
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_udp.exemplar
@@ -57,6 +61,8 @@ EXTRA_DIST = pypad_ando.exemplar\
pypad_ando.py\
pypad_filewrite.exemplar\
pypad_filewrite.py\
pypad_liqcomp.exemplar\
pypad_liqcomp.py\
pypad_live365.exemplar\
pypad_live365.py\
pypad_spinitron.exemplar\

View File

@@ -0,0 +1,94 @@
; This is the configuration for the 'pypad_liqcomp.py' module for
; Rivendell, which can be used to output Now & Next data to one or more
; Liquid Compass Internet streaming encoders, using the following format:
;
; |<title>|<artist>|<cart-num>|<length>|<group>|<album>|<label>|<lf>
; Section Header
;
; One section per remote encoder is configured, starting with 'System1' and
; working up consecutively
[System1]
; IP Address
;
; The IP address of the remote encoder, in dotted-quad notation.
;IpAddress=192.168.10.22
IpAddress=127.0.0.1
; UDP Port
;
; The UDP port number of the remote encoder, in the range 0 - 65,535.
UdpPort=5273
; Field Definitions. The string to use to populate the <title>, <artist>,
; <album> and <label> fields sent to ANDO each time RDAirPlay changes play
; state. These can include wildcards as placeholders for metadata values.
; For the list of supported wildcards. see the 'Metadata Wildcards' section
; of the Rivendell Operations Guide.
Title=%t
Artist=%a
Album=%l
Label=%b
; 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 the RDAirPlay 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 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

View File

@@ -0,0 +1,72 @@
#!%PYTHON_BANGPATH%
# pypad_liqcomp.py
#
# Send PAD updates to a Liquid Compass stream 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 PyPAD
last_updates={}
def eprint(*args,**kwargs):
print(*args,file=sys.stderr,**kwargs)
def ProcessPad(update):
try:
last_updates[update.machine()]
except KeyError:
last_updates[update.machine()]=None
n=1
while(True):
section='System'+str(n)
try:
if update.shouldBeProcessed(section) and update.hasPadType(PyPAD.TYPE_NOW) and (last_updates[update.machine()] != update.startDateTimeString(PyPAD.TYPE_NOW)):
last_updates[update.machine()]=update.startDateTimeString(PyPAD.TYPE_NOW)
title=update.resolvePadFields(update.config().get(section,'Title'),PyPAD.ESCAPE_NONE)
artist=update.resolvePadFields(update.config().get(section,'Artist'),PyPAD.ESCAPE_NONE)
album=update.resolvePadFields(update.config().get(section,'Album'),PyPAD.ESCAPE_NONE)
label=update.resolvePadFields(update.config().get(section,'Label'),PyPAD.ESCAPE_NONE)
secs=update.padField(PyPAD.TYPE_NOW,PyPAD.FIELD_LENGTH)
group=update.padField(PyPAD.TYPE_NOW,PyPAD.FIELD_GROUP_NAME)
msg='|'+title+'|'+artist+'|'+str(update.padField(PyPAD.TYPE_NOW,PyPAD.FIELD_CART_NUMBER))+'|'+str(secs)+'|'+group+'|'+album+'|'+label+'|\n'
send_sock.sendto(msg.encode('utf-8'),
(update.config().get(section,'IpAddress'),int(update.config().get(section,'UdpPort'))))
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_liqcomp.py: you must specify a configuration file')
sys.exit(1)
rcvr.setCallback(ProcessPad)
rcvr.start(sys.argv[1],int(sys.argv[2]))