Allow use of audiopwmio in place of audioio

deshipu · deshipu · commit d0f1c46d7f87 · 2021-08-30T19:50:25.000+02:00
diff --git a/meowbit/audioio.py b/meowbit/audioio.py
diff --git a/meowbit/ugame.py b/meowbit/ugame.py
@@ -3,6 +3,7 @@
 import busio
 import time
 import keypad
+import audiocore
 
 
 K_X = 0x01
@@ -51,15 +52,27 @@ def get_pressed(self):
         return buttons
 
 
-class DummyAudio:
-    def play(self, f, loop=False):
-        pass
+class _Audio:
+    last_audio = None
+
+    def __init__(self):
+        self.muted = True
+        self.buffer = bytearray(128)
+        self.audio = board.BUZZ
+
+    def play(self, audio_file, loop=False):
+        if self.muted:
+            return
+        self.stop()
+        wave = audiocore.WaveFile(audio_file, self.buffer)
+        self.audio.play(wave, loop=loop)
 
     def stop(self):
-        pass
+        self.audio.stop()
+
+    def mute(self, value=True):
+        self.muted = value
 
-    def mute(self, mute):
-        pass
 
-audio = DummyAudio()
+audio = _Audio()
 buttons = _Buttons()
diff --git a/stage.py b/stage.py
@@ -1,12 +1,16 @@
 import time
 import array
 import digitalio
-import audioio
-import struct
 try:
-    import audiocore
+    import audioio
 except ImportError:
-    audiocore = audioio
+    pass
+else:
+    try:
+        import audiocore
+    except ImportError:
+        audiocore = audioio
+import struct
 
 import _stage
 
@@ -160,7 +164,10 @@ def __init__(self, speaker_pin, mute_pin=None):
             self.mute_pin.switch_to_output(value=not self.muted)
         else:
             self.mute_pin = None
-        self.audio = audioio.AudioOut(speaker_pin)
+        if audioio is None:
+            self.audio = audiopwmio.PWMAudioOut(speaker_pin)
+        else:
+            self.audio = audioio.AudioOut(speaker_pin)
 
     def play(self, audio_file, loop=False):
         """
