From a2e9f7b300fd7ec5604faa37806b4af137c9a9d8 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Thu, 28 Aug 2014 15:22:54 +0300 Subject: [PATCH] wave: fix filename argument usage --- amodem/calib.py | 4 ++-- amodem/wave.py | 2 +- scripts/wave.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amodem/calib.py b/amodem/calib.py index 7881283..bbf93f3 100644 --- a/amodem/calib.py +++ b/amodem/calib.py @@ -14,7 +14,7 @@ fmt = 'coherence={:.3f} amplitude={:.3f} phase={:+.1f} peak={:.3f}\n' def send(wave_play=wave.play): - p = wave_play('-', stdin=wave.sp.PIPE, stderr=open('/dev/null')) + p = wave_play(stdin=wave.sp.PIPE, stderr=open('/dev/null')) try: while True: try: @@ -26,7 +26,7 @@ def send(wave_play=wave.play): def recv(wave_record=wave.record, reporter=sys.stdout.write): - p = wave_record('-', stdout=wave.sp.PIPE) + p = wave_record(stdout=wave.sp.PIPE) try: while True: data = p.stdout.read(len(sig_dump)) diff --git a/amodem/wave.py b/amodem/wave.py index 0cab7bd..d272a55 100644 --- a/amodem/wave.py +++ b/amodem/wave.py @@ -16,7 +16,7 @@ bytes_per_second = bytes_per_sample * Fs audio_format = 'S{}_LE'.format(bits_per_sample) # PCM signed little endian -def launch(tool, fname, **kwargs): +def launch(tool, fname='-', **kwargs): args = [tool, fname, '-q', '-f', audio_format, '-c', '1', '-r', str(Fs)] log.debug('running: %r', args) p = sp.Popen(args=args, **kwargs) diff --git a/scripts/wave.py b/scripts/wave.py index 115fae0..d4e4a48 100755 --- a/scripts/wave.py +++ b/scripts/wave.py @@ -21,7 +21,7 @@ player.add_argument( player.set_defaults(func=wave.play) args = parser.parse_args() -p = args.func(args.filename) +p = args.func(fname=args.filename) import sys exitcode = 0