Sound code total remake

cmu_graphics/cmu_graphics.py

@@ -208,8 +208,44 @@ def __iter__(self): return iter(self._shape)
     def __len__(self): return len(self._shape._shapes)
 
 class Sound(object):
+    number_of_sounds = 0
     def __init__(self, url):
-        self.sound = slNewSound(url)
+        if not pygame.mixer.get_init():
+            pygame.mixer.init()
+            pygame.mixer.set_num_channels(1)
+
+        if not isinstance(url, str):
+            callSpec = '{className}.{attr}'.format(className=t('Sound'), attr=t('url'))
+            err = t(
+                    '{{error}}: {{callSpec}} should be {{typeName}} (but {{value}} is of type {{valueType}})',
+                    {'error': t('TypeError'), 'callSpec': callSpec, 'typeName': 'string', 'value': repr(url), 'valueType': type(url).__name__}
+                    )
+            raise Exception(err)
+
+        Sound.number_of_sounds += 1
+        if pygame.mixer.get_num_channels()==Sound.number_of_sounds:
+            pygame.mixer.set_num_channels(Sound.number_of_sounds * 2)
+
+        if url.startswith('file://'):
+            url = url.split('//')[-1]
+        if url.startswith('http'):
+            for i in range(10):
+                try:
+                    response = webrequest.get(url)
+                    self.sound = io.BytesIO(response.read())
+                except:
+                    if i<9:
+                        continue
+                    else:
+                        raise Exception('Failed to load sound data')
+                break
+        elif hasattr(__main__, '__file__'):
+            self.sound = os.path.abspath(os.path.join(__main__.__file__, "..", url))
+        else:
+            self.sound = os.path.abspath(os.path.join(os.getcwd(), url))
+
+        self.sound = pygame.mixer.Sound(self.sound)
+        self.channel = None
 
     def play(self, **kwargs):
         default_kwargs = {'loop': False, 'restart': False}
@@ -227,10 +263,34 @@ def play(self, **kwargs):
             raise Exception('The loop argument to Sound.play must be True or False, got ' + repr(loop))
         if not isinstance(restart, bool):
             raise Exception('The restart argument to Sound.play must be True or False, got ' + repr(restart))
-        self.sound.play(loop, restart)
+
+        loop = -1 if loop else 0
+        if not self.channel or not self.channel.get_busy():
+            self.channel = self.sound.play(loops=loop)
+        elif restart and self.channel.get_sound() != self.sound:
+            self.channel = self.sound.play(loops=loop)
+        elif restart:
+            self.channel.stop()
+            self.channel = self.sound.play(loops=loop)
+        else:
+            self.channel.unpause()
 
     def pause(self):
-        self.sound.pause()
+        self.channel.pause()
+
+    def setVolume(self, volume: float):
+        """
+        Volume in the range of 0.0 to 1.0 (inclusive)\n
+        If value < 0.0, the volume will not be changed\n
+        If value > 1.0, the volume will be set to 1.0
+        """
+        self.sound.set_volume(volume)
+
+    def getVolume(self):
+        """
+        Returns the volume (range: 0.0 - 1.0 (inclusive))
+        """
+        return self.sound.get_volume()
 
 SHAPES = [ Arc, Circle, Image, Label, Line, Oval,
             Polygon, Rect, RegularPolygon, Star, ]
@@ -295,7 +355,6 @@ def translateKeyName(keyName, originalLanguage):
     return KeyName(TRANSLATED_KEY_NAMES[originalLanguage].get(keyName, keyName))
 
 def cleanAndClose():
-    shape_logic.cleanSoundProcesses()
     try:
         app._app.callUserFn('onAppStop', (), redraw=False)
     except:
@@ -1012,6 +1071,7 @@ def interact(self):
 
 import os
 import sys
+import io
 from datetime import datetime
 from datetime import timedelta
 import json
@@ -1122,7 +1182,6 @@ def print_debug_info():
 slGet = sli.slGet
 rgb = sli.rgb
 gradient = sli.gradient
-slNewSound = sli.newSound
 toEnglish = sli.toEnglish
 accentCombinations = sli.accentCombinations
 t = sli.t

cmu_graphics/shape_logic.py

@@ -2289,52 +2289,6 @@ def scalexy(self, varName, k, scaleAnchor = None):
         trans[i][i] = k
         self.multMat(trans)
 
-class CMUSound(object):
-    processes = []
-    def __init__(self, url):
-        current_directory = os.path.dirname(__file__)
-        sound_path = os.path.join(current_directory, 'sound.py')
-        self.soundProcess = subprocess.Popen(
-            [sys.executable, sound_path], stdout=subprocess.PIPE,
-            stdin=subprocess.PIPE, stderr=subprocess.PIPE,
-            cwd=current_directory)
-        CMUSound.processes.append(self.soundProcess)
-        self.sendProcessMessage({'url': url})
-
-    def sendProcessMessage(self, message):
-        packet = bytes(json.dumps(message) + '\n', encoding='utf-8')
-        self.soundProcess.stdin.write(packet)
-        self.soundProcess.stdin.flush()
-        self.soundProcess.stdout.readline()
-        self.soundProcess.poll()
-        if self.soundProcess.returncode is not None and self.soundProcess.returncode != 0:
-            print(self.soundProcess.stderr.read().decode('utf-8'))
-            raise Exception('Exception in Sound.')
-
-    def play(self, doLoop, doRestart):
-        self.sendProcessMessage({
-            'command': 'play',
-            'kwargs': {
-                'doLoop': doLoop,
-                'doRestart': doRestart
-            }
-        })
-
-    def pause(self):
-        self.sendProcessMessage({
-            'command': 'pause',
-            'kwargs': {}
-        })
-
-    def __del__(self):
-        self.soundProcess.kill()
-
-def cleanSoundProcesses():
-    for p in CMUSound.processes: p.kill()
-
-# clean up processes when the interpreter closes
-atexit.register(cleanSoundProcesses)
-
 class CMUImage(PolygonWithTransform):
     def __init__(self, attrs):
         if attrs is not None:
@@ -3046,11 +3000,6 @@ def gradient(self, *colors, start=None, **kwargs):
 
         return Gradient(list(colors), 'center' if start is None else start)
 
-    def newSound(self, url):
-        checkArgCount(None, t('Sound'), [t('url')], (url,))
-        checkString(t('Sound'), t('url'), url, False)
-        return CMUSound(url)
-
     def slNew(self, className, args):
         return (objConstructors[className])(args)
 

tests/test_image_gen.py

@@ -40,7 +40,7 @@ def is_mac_pip_ci():
     is_mac = sys.platform == 'darwin'
     is_pip = 'pip' in os.getenv('TOX_ENV_NAME', '')
     is_ci = os.environ.get('CI', False)
-    return is_ci and is_mac and is_pip 
+    return is_ci and is_mac and is_pip
 
 def compare_images(path_1, path_2, test_name, test_piece_i, threshold=25):
     image_1 = Image.open(path_1)
@@ -89,10 +89,8 @@ def generate_test_source(test, run_fn, extras='', language='en'):
     source_code = ''
     source_code += 'import sys'
     source_code += '\nimport os'
-    if sys.platform == 'darwin':
-        source_code += '\nos.environ["SDL_VIDEODRIVER"] = "dummy"'
-    if sys.platform == 'win32':
-        source_code += '\nos.environ["SDL_AUDIODRIVER"] = "dummy"'
+    source_code += '\nos.environ["SDL_VIDEODRIVER"] = "dummy"'
+    source_code += '\nos.environ["SDL_AUDIODRIVER"] = "dummy"'
     source_code += '\nsys.path.insert(0, os.path.dirname(os.path.dirname(os.path.realpath(__file__))))'
     source_code += '\nfrom cmu_graphics import *\n'
     source_code += "setLanguage('%s')\n" % (language)

tests/test_sound.py

@@ -3,5 +3,7 @@
 CMU_GRAPHICS_DEBUG = True
 from cmu_graphics import *
 
+os.environ["SDL_AUDIODRIVER"] = "dummy"
+
 music = Sound('https://s3.amazonaws.com/cmu-cs-academy.lib.prod/sounds/Liberty_bell_march.mp3')
 os._exit(0)