tMerge pull request #1008 from romanz/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e34b72bbf7f31eb91166a76ac36db12e49b55ebb
DIR parent 27da96c1f80bfb5b744547894e1977978655f3f8
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 5 Feb 2015 15:03:13 +0100
Merge pull request #1008 from romanz/master
audio_modem: update plugin to work with latest amodem version.
Diffstat:
M plugins/audio_modem.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
DIR diff --git a/plugins/audio_modem.py b/plugins/audio_modem.py
t@@ -15,8 +15,7 @@ import platform
try:
import amodem.audio
- import amodem.recv
- import amodem.send
+ import amodem.main
import amodem.config
print_error('Audio MODEM is available.')
amodem.log.addHandler(amodem.logging.StreamHandler(sys.stderr))
t@@ -115,7 +114,7 @@ class Plugin(BasePlugin):
with self._audio_interface() as interface:
src = BytesIO(blob)
dst = interface.player()
- amodem.send.main(config=self.modem_config, src=src, dst=dst)
+ amodem.main.send(config=self.modem_config, src=src, dst=dst)
except Exception:
traceback.print_exc()
t@@ -132,7 +131,7 @@ class Plugin(BasePlugin):
with self._audio_interface() as interface:
src = interface.recorder()
dst = BytesIO()
- amodem.recv.main(config=self.modem_config, src=src, dst=dst)
+ amodem.main.recv(config=self.modem_config, src=src, dst=dst)
return dst.getvalue()
except Exception:
traceback.print_exc()