diff --git a/turntable/cli.py b/turntable/cli.py index 2efd379..f44b7ef 100644 --- a/turntable/cli.py +++ b/turntable/cli.py @@ -1,9 +1,10 @@ import logging -from turntable import application +from turntable import application, turntable def main() -> None: with application.run() as events: while event := events.get(): - logging.info("Event: %s", event) + if not isinstance(event, turntable.Audio): + logging.info("Event: %s", event) diff --git a/turntable/gui.py b/turntable/gui.py index e599e38..20ae41f 100644 --- a/turntable/gui.py +++ b/turntable/gui.py @@ -1,52 +1,103 @@ import logging import queue +from statistics import fmean +from typing import Iterable, List, Optional, Tuple, Union +import numpy as np # type: ignore import pyglet # type: ignore import pyglet.clock # type: ignore +import scipy.signal # type: ignore from turntable import application, turntable + +class Plot: + def __init__( + self, + x: int, + y: int, + width: int, + height: int, + bars: int = 20, + bar_width: int = 40, + color: Tuple[int, int, int] = (255, 255, 255), + batch: Optional[pyglet.graphics.Batch] = None, + ) -> None: + self.x = x + self.y = y + self.width = width + self.height = height + self.bars = bars + self.bar_width = bar_width + self.color = color + self.batch = batch or pyglet.graphics.Batch() + self.lines: List[pyglet.shapes.Line] = [] + + def update(self, data): + heights = scipy.signal.resample(data, self.bars) * self.height / 2 ** 16 + self.lines = [ + pyglet.shapes.Line( + self.x + x / self.bars * self.width, + 0, + self.x + x / self.bars * self.width, + y, + width=self.bar_width, + color=self.color, + batch=self.batch, + ) + for x, y in enumerate(heights) + ] + + def draw(self) -> None: + self.batch.draw() + + def main(): window = pyglet.window.Window(fullscreen=True) with application.run() as events: label = pyglet.text.Label( "", - font_name='Noto Sans', + font_name="Noto Sans", font_size=36, - x = window.width // 2, - y = window.height // 2, - anchor_x = 'center', - anchor_y = 'center') + x=window.width // 2, + y=window.height // 2, + anchor_x="center", + anchor_y="center", + ) + batch = pyglet.graphics.Batch() + plot = Plot( + x=0, + y=0, + width=window.width, + height=window.height, + bars=40, + bar_width=window.width // 45, + color=(139, 0, 139), + batch=batch, + ) @window.event def on_draw(): window.clear() + batch.draw() label.draw() def check_events(dt): try: event = events.get(False) - logging.info("Event: %s", event) - logging.info("Label: %s", label) if isinstance(event, turntable.StartedPlaying): label.text = "" elif isinstance(event, turntable.StoppedPlaying): label.text = "" elif isinstance(event, turntable.NewMetadata): label.text = event.title + elif isinstance(event, turntable.Audio): + data = np.fromstring(event.pcm.raw, dtype=np.int16) + fft = abs(np.fft.fft(data).real) + fft = fft[: len(fft) // 2] + plot.update(fft) except queue.Empty: ... - except: - logging.exception("Oops") - pyglet.clock.schedule_interval_soft(check_events, 0.5) + pyglet.clock.schedule(check_events) pyglet.app.run() - # icecast.set_title("") - # while event := events.get(): - # logging.info("Event: %s", event) - # if isinstance(event, StartedPlaying): - # icecast.set_title("") - # elif isinstance(event, StoppedPlaying): - # icecast.set_title("") - # elif isinstance(event, NewMetadata): - # icecast.set_title(event.title) diff --git a/turntable/models.py b/turntable/models.py index d954281..1bd839f 100644 --- a/turntable/models.py +++ b/turntable/models.py @@ -43,6 +43,9 @@ class PCM: for i in range(0, len(self._data), self.framesize): yield PCM(self.framerate, self.channels, self.raw[i : i + self.framesize]) + def __len__(self) -> int: + return len(self._data) // self.framesize + def append(self, other: "PCM") -> None: if other.framerate != self.framerate or other.channels != self.channels: raise ValueError("Cannot append incompatible PCM audio") diff --git a/turntable/turntable.py b/turntable/turntable.py index e73c036..efb007b 100644 --- a/turntable/turntable.py +++ b/turntable/turntable.py @@ -55,6 +55,9 @@ class StoppedPlaying(Event): class NewMetadata(Event): title: str +@dataclass +class Audio(Event): + pcm: PCM class PCMRecognizer(BaseRecognizer): @staticmethod @@ -103,6 +106,7 @@ class Turntable(Process): logger.info("Initializing Turntable") while fragment := self.pcm_in.get(): self.buffer.append(fragment) + self.events_out.put(Audio(fragment)) maximum = audioop.max(fragment.raw, 2) self.update_audiolevel(maximum)