diff --git a/bin/musicPad b/bin/musicPad --- a/bin/musicPad +++ b/bin/musicPad @@ -15,7 +15,7 @@ postPad = 9 # 5 + autostop + 4 playlist = Playlist.fromShow(showconfig.getGraph(), showconfig.showUri()) for p in playlist.allSongPaths(): log.info("read %s", p) - inputWave = wave.open(p, 'r') + inputWave = wave.open(p, 'rb') outputDir = os.path.join(os.path.dirname(p), "pad") try: @@ -23,14 +23,14 @@ for p in playlist.allSongPaths(): except OSError: pass # exists outputPath = os.path.join(outputDir, os.path.basename(p)) - outputWave = wave.open(outputPath, 'w') + outputWave = wave.open(outputPath, 'wb') outputWave.setparams(inputWave.getparams()) bytesPerSecond = (inputWave.getnchannels() * inputWave.getsampwidth() * inputWave.getframerate()) - outputWave.writeframesraw("\x00" * (bytesPerSecond * introPad)) + outputWave.writeframesraw(b"\x00" * (bytesPerSecond * introPad)) outputWave.writeframesraw(inputWave.readframes(inputWave.getnframes())) - outputWave.writeframesraw("\x00" * (bytesPerSecond * postPad)) + outputWave.writeframesraw(b"\x00" * (bytesPerSecond * postPad)) outputWave.close() log.info("wrote %s", outputPath) diff --git a/light9/collector/collector_client.py b/light9/collector/collector_client.py --- a/light9/collector/collector_client.py +++ b/light9/collector/collector_client.py @@ -39,7 +39,7 @@ def sendToCollectorZmq(msg): return defer.succeed(0) -def sendToCollector(client, session, settings, useZmq=False): +def sendToCollector(client, session, settings: DeviceSettings, useZmq=False): """deferred to the time in seconds it took to get a response from collector""" sendTime = time.time() msg = toCollectorJson(client, session, settings).encode('utf8')