Replace simpleaudio with QSoundEffects

piket_client/gui.py

@@ -2,11 +2,12 @@
 Provides the graphical front-end for Piket.
 """
 import collections
+import itertools
 import logging
 import math
 import os
 import sys
-from typing import Deque
+from typing import Deque, Iterator
 
 import qdarkstyle
 
@@ -26,7 +27,8 @@ from PySide2.QtWidgets import (
     QWidget,
 )
 from PySide2.QtGui import QIcon
-from PySide2.QtCore import QObject, QSize, Qt, Signal, Slot
+from PySide2.QtCore import QObject, QSize, Qt, Signal, Slot, QUrl
+from PySide2.QtMultimedia import QSoundEffect
 
 # pylint: enable=E0611
 
@@ -35,7 +37,7 @@ try:
 except ImportError:
     dbus = None
 
-from piket_client.sound import PLOP_WAVE, UNDO_WAVE
+from piket_client.sound import PLOP_PATH, UNDO_PATH
 from piket_client.model import (
     Person,
     ConsumptionType,
@@ -49,11 +51,6 @@ import piket_client.logger
 LOG = logging.getLogger(__name__)
 
 
-def plop() -> None:
-    """ Asynchronously play the plop sound. """
-    PLOP_WAVE.play()
-
-
 class NameButton(QPushButton):
     """ Wraps a QPushButton to provide a counter. """
 
@@ -99,7 +96,7 @@ class NameButton(QPushButton):
         LOG.debug("Button clicked.")
         result = self.person.add_consumption(self.active_id)
         if result:
-            plop()
+            self.window().play_plop()
             self.setText(self.current_label)
             self.consumption_created.emit(result)
         else:
@@ -177,6 +174,9 @@ class PiketMainWindow(QMainWindow):
 
     consumption_type_changed = Signal(str)
 
+    plop_loop: Iterator[QSoundEffect]
+    undo_loop: Iterator[QSoundEffect]
+
     def __init__(self) -> None:
         LOG.debug("Initializing PiketMainWindow.")
         super().__init__()
@@ -292,6 +292,17 @@ class PiketMainWindow(QMainWindow):
 
         self.addToolBar(self.toolbar)
 
+        # Load sounds
+        plops = [QSoundEffect(self) for _ in range(7)]
+        for qse in plops:
+            qse.setSource(QUrl.fromLocalFile(str(PLOP_PATH)))
+        self.plop_loop = itertools.cycle(plops)
+
+        undos = [QSoundEffect(self) for _ in range(5)]
+        for qse in undos:
+            qse.setSource(QUrl.fromLocalFile(str(UNDO_PATH)))
+        self.undo_loop = itertools.cycle(undos)
+
         # Initialize main widget
         self.main_widget = NameButtons(self.ct_ag.actions()[0].data(), self)
         self.consumption_type_changed.connect(self.main_widget.consumption_type_changed)
@@ -337,7 +348,7 @@ class PiketMainWindow(QMainWindow):
                 person.set_active(True)
 
             else:
-                person = Person(full_name=name, display_name=None, )
+                person = Person(full_name=name, display_name=None,)
                 person.create()
 
             assert self.main_widget is not None
@@ -379,7 +390,7 @@ class PiketMainWindow(QMainWindow):
 
     def do_undo(self) -> None:
         """ Undo the last marked consumption. """
-        UNDO_WAVE.play()
+        next(self.undo_loop).play()
 
         to_undo = self.undo_queue.pop()
         LOG.warning("Undoing consumption %s", to_undo)
@@ -423,6 +434,9 @@ class PiketMainWindow(QMainWindow):
         icon = QIcon(os.path.join(self.icons_dir, filename))
         return icon
 
+    def play_plop(self) -> None:
+        next(self.plop_loop).play()
+
 
 def main() -> None:
     """ Main entry point of GUI client. """

piket_client/sound.py

@@ -2,16 +2,14 @@
 Provides functions related to playing sounds.
 """
 
-import os
+import pathlib
 
-import simpleaudio as sa
 
-
-SOUNDS_DIR = os.path.join(os.path.dirname(__file__), "sounds")
+SOUND_PATH = pathlib.Path(__file__).parent / "sounds"
 """ Contains the absolute path to the sounds directory. """
 
-PLOP_WAVE = sa.WaveObject.from_wave_file(os.path.join(SOUNDS_DIR, "plop.wav"))
-""" SimpleAudio WaveObject containing the plop sound. """
+PLOP_PATH = SOUND_PATH / "plop.wav"
+""" Path to the "plop" sound. """
 
-UNDO_WAVE = sa.WaveObject.from_wave_file(os.path.join(SOUNDS_DIR, "undo.wav"))
-""" SimpleAudio WaveObject containing the undo sound. """
+UNDO_PATH = SOUND_PATH / "undo.wav"
+""" Path to the "undo" sound". """