Merge pull request adafruit#1094 from kattni/cp-essentials-audioout-update

Update AudioOut examples.

Author: kattni

CircuitPython_Essentials/CircuitPython_Audio_Out_Tone.py

@@ -1,10 +1,22 @@
 import time
 import array
 import math
-import audioio
 import board
 import digitalio
 
+try:
+    from audiocore import RawSample
+except ImportError:
+    from audioio import RawSample
+
+try:
+    from audioio import AudioOut
+except ImportError:
+    try:
+        from audiopwmio import PWMAudioOut as AudioOut
+    except ImportError:
+        pass  # not always supported by every board!
+
 button = digitalio.DigitalInOut(board.A1)
 button.switch_to_input(pull=digitalio.Pull.UP)
 
@@ -15,8 +27,8 @@
 for i in range(length):
     sine_wave[i] = int((1 + math.sin(math.pi * 2 * i / length)) * tone_volume * (2 ** 15 - 1))
 
-audio = audioio.AudioOut(board.A0)
-sine_wave_sample = audioio.RawSample(sine_wave)
+audio = AudioOut(board.A0)
+sine_wave_sample = RawSample(sine_wave)
 
 while True:
     if not button.value:

CircuitPython_Essentials/CircuitPython_Audio_Out_Wave.py

@@ -1,14 +1,26 @@
 import time
-import audioio
 import board
 import digitalio
 
+try:
+    from audiocore import WaveFile
+except ImportError:
+    from audioio import WaveFile
+
+try:
+    from audioio import AudioOut
+except ImportError:
+    try:
+        from audiopwmio import PWMAudioOut as AudioOut
+    except ImportError:
+        pass  # not always supported by every board!
+
 button = digitalio.DigitalInOut(board.A1)
 button.switch_to_input(pull=digitalio.Pull.UP)
 
 wave_file = open("StreetChicken.wav", "rb")
-wave = audioio.WaveFile(wave_file)
-audio = audioio.AudioOut(board.A0)
+wave = WaveFile(wave_file)
+audio = AudioOut(board.A0)
 
 while True:
     audio.play(wave)