Compare commits
4 Commits
basic
...
8d0c9edf5d
| Author | SHA1 | Date | |
|---|---|---|---|
| 8d0c9edf5d | |||
| 1da2e30d4c | |||
| 9ff38aa875 | |||
| 3b869851b8 |
6
Pipfile
6
Pipfile
@@ -7,12 +7,16 @@ name = "pypi"
|
|||||||
websockets = "*"
|
websockets = "*"
|
||||||
watchfiles = "*"
|
watchfiles = "*"
|
||||||
async-tkinter-loop = "*"
|
async-tkinter-loop = "*"
|
||||||
|
mido = "*"
|
||||||
|
python-rtmidi = "*"
|
||||||
|
pyaudio = "*"
|
||||||
|
aubio = "*"
|
||||||
websocket-client = "*"
|
websocket-client = "*"
|
||||||
|
|
||||||
[dev-packages]
|
[dev-packages]
|
||||||
|
|
||||||
[requires]
|
[requires]
|
||||||
python_version = "3"
|
python_version = "3.12"
|
||||||
|
|
||||||
[scripts]
|
[scripts]
|
||||||
main = "python main.py"
|
main = "python main.py"
|
||||||
|
|||||||
285
settings.json
285
settings.json
@@ -7,91 +7,13 @@
|
|||||||
],
|
],
|
||||||
"settings": {
|
"settings": {
|
||||||
"colors": [
|
"colors": [
|
||||||
"#968a00"
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00"
|
||||||
],
|
],
|
||||||
"brightness": 21,
|
"brightness": 9,
|
||||||
"pattern": "off",
|
"pattern": "off",
|
||||||
"delay": 99,
|
"delay": 50
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"pulse": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"n_chase": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#968a00"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"rainbow": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"blink": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dj": {
|
"dj": {
|
||||||
@@ -101,104 +23,13 @@
|
|||||||
"settings": {
|
"settings": {
|
||||||
"colors": [
|
"colors": [
|
||||||
"#0000ff",
|
"#0000ff",
|
||||||
"#ff0000"
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
],
|
],
|
||||||
"brightness": 73,
|
"brightness": 6,
|
||||||
"pattern": "transition",
|
"pattern": "flicker",
|
||||||
"delay": 10000,
|
"delay": 520
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"rainbow": {
|
|
||||||
"colors": [
|
|
||||||
"#00006a"
|
|
||||||
],
|
|
||||||
"delay": 17,
|
|
||||||
"n1": 1,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ffff00",
|
|
||||||
"#0000ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"blink": {
|
|
||||||
"colors": [
|
|
||||||
"#0000d0"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"delay": 1002,
|
|
||||||
"colors": [
|
|
||||||
"#006600",
|
|
||||||
"#0000ff"
|
|
||||||
],
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#ff0000"
|
|
||||||
],
|
|
||||||
"delay": 10000,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10
|
|
||||||
},
|
|
||||||
"n_chase": {
|
|
||||||
"n1": 11,
|
|
||||||
"n2": 11,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"delay": 99,
|
|
||||||
"colors": [
|
|
||||||
"#0000ff"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle": {
|
"middle": {
|
||||||
@@ -217,19 +48,7 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"patterns": {
|
|
||||||
"flicker": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sides": {
|
"sides": {
|
||||||
@@ -246,19 +65,7 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "on",
|
"pattern": "on",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"outside": {
|
"outside": {
|
||||||
@@ -273,36 +80,8 @@
|
|||||||
"#000000"
|
"#000000"
|
||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "transition",
|
"pattern": "on",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"n1": -17,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle1": {
|
"middle1": {
|
||||||
@@ -318,16 +97,7 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"flicker": {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle2": {
|
"middle2": {
|
||||||
@@ -343,10 +113,7 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"patterns": {
|
|
||||||
"flicker": {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle3": {
|
"middle3": {
|
||||||
@@ -362,10 +129,7 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"patterns": {
|
|
||||||
"flicker": {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle4": {
|
"middle4": {
|
||||||
@@ -381,19 +145,18 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520,
|
"delay": 520
|
||||||
"patterns": {
|
|
||||||
"flicker": {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"patterns": [
|
"patterns": [
|
||||||
"on",
|
"on",
|
||||||
"off",
|
"off",
|
||||||
"rainbow",
|
"blink",
|
||||||
"transition",
|
"rainbow_cycle",
|
||||||
"n_chase",
|
"color_transition",
|
||||||
|
"theater_chase",
|
||||||
|
"flicker",
|
||||||
"pulse"
|
"pulse"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
1048
src/main.py
1048
src/main.py
File diff suppressed because it is too large
Load Diff
380
src/midi.py
380
src/midi.py
@@ -1,105 +1,311 @@
|
|||||||
import mido
|
import mido
|
||||||
import asyncio
|
import asyncio
|
||||||
import time
|
import networking
|
||||||
import networking # <--- This will now correctly import your module
|
import socket
|
||||||
|
import json
|
||||||
|
import logging # Added logging import
|
||||||
|
import time # Added for initial state read
|
||||||
|
import tkinter as tk
|
||||||
|
from tkinter import ttk, messagebox # Import messagebox for confirmations
|
||||||
|
|
||||||
|
|
||||||
async def midi_to_websocket_listener(midi_port_index: int, websocket_uri: str):
|
# Configure logging
|
||||||
"""
|
DEBUG_MODE = True # Set to False for INFO level logging
|
||||||
Listens to a specific MIDI port and sends data to a WebSocket server
|
logging.basicConfig(level=logging.DEBUG if DEBUG_MODE else logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
when Note 32 (and 33) is pressed.
|
|
||||||
"""
|
|
||||||
delay = 100 # Default delay value
|
|
||||||
|
|
||||||
# 1. Get MIDI port name
|
# TCP Server Configuration
|
||||||
|
TCP_HOST = "127.0.0.1"
|
||||||
|
TCP_PORT = 65432
|
||||||
|
|
||||||
|
# Sound Control Server Configuration (for sending reset)
|
||||||
|
SOUND_CONTROL_HOST = "127.0.0.1"
|
||||||
|
SOUND_CONTROL_PORT = 65433
|
||||||
|
|
||||||
|
class MidiHandler:
|
||||||
|
def __init__(self, midi_port_index: int, websocket_uri: str):
|
||||||
|
self.midi_port_index = midi_port_index
|
||||||
|
self.websocket_uri = websocket_uri
|
||||||
|
self.ws_client = networking.WebSocketClient(websocket_uri)
|
||||||
|
self.delay = 100 # Default delay value, controlled by MIDI controller
|
||||||
|
self.brightness = 100 # Default brightness value, controlled by MIDI controller
|
||||||
|
self.tcp_host = TCP_HOST
|
||||||
|
self.tcp_port = TCP_PORT
|
||||||
|
self.beat_sending_enabled = True # New: Local flag for beat sending
|
||||||
|
self.sound_control_host = SOUND_CONTROL_HOST
|
||||||
|
self.sound_control_port = SOUND_CONTROL_PORT
|
||||||
|
# RGB controlled by CC 30/31/32 (default green)
|
||||||
|
self.color_r = 0
|
||||||
|
self.color_g = 255
|
||||||
|
self.color_b = 0
|
||||||
|
# Generic parameters controlled via CC
|
||||||
|
# Raw CC-driven parameters (0-127)
|
||||||
|
self.n1 = 10
|
||||||
|
self.n2 = 10
|
||||||
|
# Current state for GUI display
|
||||||
|
self.current_bpm: float | None = None
|
||||||
|
self.current_pattern: str = ""
|
||||||
|
self.beat_index: int = 0
|
||||||
|
|
||||||
|
def _current_color_hex(self) -> str:
|
||||||
|
r = max(0, min(255, int(self.color_r)))
|
||||||
|
g = max(0, min(255, int(self.color_g)))
|
||||||
|
b = max(0, min(255, int(self.color_b)))
|
||||||
|
return f"#{r:02x}{g:02x}{b:02x}"
|
||||||
|
|
||||||
|
async def _send_reset_to_sound(self):
|
||||||
|
try:
|
||||||
|
reader, writer = await asyncio.open_connection(self.sound_control_host, self.sound_control_port)
|
||||||
|
cmd = "RESET_TEMPO\n".encode('utf-8')
|
||||||
|
writer.write(cmd)
|
||||||
|
await writer.drain()
|
||||||
|
resp = await reader.read(100)
|
||||||
|
logging.info(f"[MidiHandler - Control] Sent RESET_TEMPO, response: {resp.decode().strip()}")
|
||||||
|
writer.close()
|
||||||
|
await writer.wait_closed()
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[MidiHandler - Control] Failed to send RESET_TEMPO: {e}")
|
||||||
|
|
||||||
|
async def _handle_tcp_client(self, reader, writer):
|
||||||
|
addr = writer.get_extra_info('peername')
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Connected by {addr}") # Changed to info
|
||||||
|
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
data = await reader.read(4096) # Read up to 4KB of data
|
||||||
|
if not data:
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Client {addr} disconnected.") # Changed to info
|
||||||
|
break
|
||||||
|
|
||||||
|
message = data.decode().strip()
|
||||||
|
logging.debug(f"[MidiHandler - TCP Server] Received from {addr}: {message}") # Changed to debug
|
||||||
|
|
||||||
|
if self.beat_sending_enabled:
|
||||||
|
try:
|
||||||
|
# Attempt to parse as float (BPM) from sound.py
|
||||||
|
bpm_value = float(message)
|
||||||
|
self.current_bpm = bpm_value
|
||||||
|
# On each beat, trigger currently selected pattern
|
||||||
|
if not self.current_pattern:
|
||||||
|
logging.debug("[Beat] No pattern selected yet; ignoring beat")
|
||||||
|
else:
|
||||||
|
payload = {
|
||||||
|
"0": {
|
||||||
|
"pattern": self.current_pattern,
|
||||||
|
"delay": self.delay,
|
||||||
|
"colors": [self._current_color_hex()],
|
||||||
|
"brightness": self.brightness,
|
||||||
|
"num_leds": 200,
|
||||||
|
"n1": self.n1,
|
||||||
|
"n2": self.n2,
|
||||||
|
"n": self.beat_index,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.beat_index = (self.beat_index + 1) % 1000000
|
||||||
|
logging.debug(f"[Beat] Triggering pattern '{self.current_pattern}' with payload: {payload}")
|
||||||
|
await self.ws_client.send_data(payload)
|
||||||
|
except ValueError:
|
||||||
|
logging.warning(f"[MidiHandler - TCP Server] Received non-BPM message from {addr}, not forwarding: {message}") # Changed to warning
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[MidiHandler - TCP Server] Error processing received message from {addr}: {e}") # Changed to error
|
||||||
|
else:
|
||||||
|
logging.debug(f"[MidiHandler - TCP Server] Beat received from {addr} but sending to WebSocket is disabled: {message}") # Changed to debug
|
||||||
|
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Client handler for {addr} cancelled.") # Changed to info
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[MidiHandler - TCP Server] Error handling client {addr}: {e}") # Changed to error
|
||||||
|
finally:
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Closing connection for {addr}") # Changed to info
|
||||||
|
writer.close()
|
||||||
|
await writer.wait_closed()
|
||||||
|
|
||||||
|
async def _midi_tcp_server(self):
|
||||||
|
server = await asyncio.start_server(
|
||||||
|
lambda r, w: self._handle_tcp_client(r, w), self.tcp_host, self.tcp_port)
|
||||||
|
|
||||||
|
addrs = ', '.join(str(sock.getsockname()) for sock in server.sockets)
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Serving on {addrs}") # Changed to info
|
||||||
|
|
||||||
|
async with server:
|
||||||
|
await server.serve_forever()
|
||||||
|
|
||||||
|
async def _read_initial_cc_state(self, port, timeout_s: float = 0.5):
|
||||||
|
"""Read initial CC values from the MIDI device for a short period to populate state."""
|
||||||
|
start = time.time()
|
||||||
|
while time.time() - start < timeout_s:
|
||||||
|
msg = port.receive(block=False)
|
||||||
|
if msg and msg.type == 'control_change':
|
||||||
|
if msg.control == 36:
|
||||||
|
self.delay = msg.value * 4
|
||||||
|
logging.info(f"[Init] Delay set to {self.delay} ms from CC36")
|
||||||
|
elif msg.control == 33:
|
||||||
|
self.brightness = round((msg.value / 127) * 100)
|
||||||
|
logging.info(f"[Init] Brightness set to {self.brightness} from CC33")
|
||||||
|
elif msg.control == 30:
|
||||||
|
self.color_r = round((msg.value / 127) * 255)
|
||||||
|
logging.info(f"[Init] Red set to {self.color_r} from CC30")
|
||||||
|
elif msg.control == 31:
|
||||||
|
self.color_g = round((msg.value / 127) * 255)
|
||||||
|
logging.info(f"[Init] Green set to {self.color_g} from CC31")
|
||||||
|
elif msg.control == 32:
|
||||||
|
self.color_b = round((msg.value / 127) * 255)
|
||||||
|
logging.info(f"[Init] Blue set to {self.color_b} from CC32")
|
||||||
|
elif msg.control == 34:
|
||||||
|
self.n1 = int(msg.value)
|
||||||
|
logging.info(f"[Init] n1 set to {self.n1} from CC34")
|
||||||
|
elif msg.control == 35:
|
||||||
|
self.n2 = int(msg.value)
|
||||||
|
logging.info(f"[Init] n2 set to {self.n2} from CC35")
|
||||||
|
elif msg.control == 27:
|
||||||
|
self.beat_sending_enabled = (msg.value == 127)
|
||||||
|
logging.info(f"[Init] Beat sending {'ENABLED' if self.beat_sending_enabled else 'DISABLED'} from CC27")
|
||||||
|
await asyncio.sleep(0.001)
|
||||||
|
|
||||||
|
async def _midi_listener(self):
|
||||||
|
logging.info("Midi function") # Changed to info
|
||||||
|
"""
|
||||||
|
Listens to a specific MIDI port and sends data to a WebSocket server
|
||||||
|
when Note 32 (and 33) is pressed.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# 1. Get MIDI port name
|
||||||
|
port_names = mido.get_input_names()
|
||||||
|
if not port_names:
|
||||||
|
logging.warning("No MIDI input ports found. Please connect your device.") # Changed to warning
|
||||||
|
return
|
||||||
|
if not (0 <= self.midi_port_index < len(port_names)):
|
||||||
|
logging.error(f"Error: MIDI port index {self.midi_port_index} out of range. Available ports: {port_names}") # Changed to error
|
||||||
|
logging.info("Available ports:") # Changed to info
|
||||||
|
for i, name in enumerate(port_names):
|
||||||
|
logging.info(f" {i}: {name}") # Changed to info
|
||||||
|
return
|
||||||
|
|
||||||
|
midi_port_name = port_names[self.midi_port_index]
|
||||||
|
logging.info(f"Selected MIDI input port: {midi_port_name}") # Changed to info
|
||||||
|
|
||||||
|
try:
|
||||||
|
with mido.open_input(midi_port_name) as port:
|
||||||
|
logging.info(f"MIDI port '{midi_port_name}' opened. Press Ctrl+C to stop.") # Changed to info
|
||||||
|
# Read initial controller state briefly
|
||||||
|
await self._read_initial_cc_state(port)
|
||||||
|
while True:
|
||||||
|
msg = port.receive(block=False) # Non-blocking read
|
||||||
|
if msg:
|
||||||
|
logging.debug(msg) # Changed to debug
|
||||||
|
match msg.type:
|
||||||
|
case 'note_on':
|
||||||
|
logging.debug(f" Note ON: Note={msg.note}, Velocity={msg.velocity}, Channel={msg.channel}") # Changed to debug
|
||||||
|
# Bind patterns starting at MIDI note 36
|
||||||
|
pattern_bindings: list[tuple[str, dict]] = [
|
||||||
|
("pulse", {"n1": 120, "n2": 120}),
|
||||||
|
("flicker", {}),
|
||||||
|
("alternating", {"n1": 6, "n2": 6}),
|
||||||
|
("n_chase", {"n1": 5, "n2": 5}),
|
||||||
|
("fill_range", {"n1": 10, "n2": 20}),
|
||||||
|
("rainbow", {}),
|
||||||
|
("specto", {"n1": 20}),
|
||||||
|
("radiate", {"n1": 8}),
|
||||||
|
]
|
||||||
|
idx = msg.note - 36
|
||||||
|
if 0 <= idx < len(pattern_bindings):
|
||||||
|
pattern_name, extra = pattern_bindings[idx]
|
||||||
|
self.current_pattern = pattern_name
|
||||||
|
# Apply any immediate param tweaks from binding to local state
|
||||||
|
if "n1" in extra:
|
||||||
|
self.n1 = extra["n1"]
|
||||||
|
if "n2" in extra:
|
||||||
|
self.n2 = extra["n2"]
|
||||||
|
logging.info(f"[Select] Pattern selected via note {msg.note}: {self.current_pattern} (n1={self.n1}, n2={self.n2})")
|
||||||
|
else:
|
||||||
|
logging.debug(f"Note {msg.note} not bound to a pattern (base 36, {len(pattern_bindings)} entries)")
|
||||||
|
|
||||||
|
case 'control_change':
|
||||||
|
match msg.control:
|
||||||
|
case 36:
|
||||||
|
self.delay = msg.value * 4 # Update instance delay
|
||||||
|
logging.info(f"Delay set to {self.delay} ms by MIDI controller") # Changed to info
|
||||||
|
case 27:
|
||||||
|
if msg.value == 127:
|
||||||
|
self.beat_sending_enabled = True
|
||||||
|
logging.info("[MidiHandler - Listener] Beat sending ENABLED by MIDI control.") # Changed to info
|
||||||
|
elif msg.value == 0:
|
||||||
|
self.beat_sending_enabled = False
|
||||||
|
logging.info("[MidiHandler - Listener] Beat sending DISABLED by MIDI control.") # Changed to info
|
||||||
|
case 29:
|
||||||
|
if msg.value == 127:
|
||||||
|
logging.info("[MidiHandler - Listener] RESET_TEMPO requested by control 29.")
|
||||||
|
await self._send_reset_to_sound()
|
||||||
|
case 33:
|
||||||
|
# Map 0-127 to 0-100 brightness scale
|
||||||
|
self.brightness = round((msg.value / 127) * 100)
|
||||||
|
logging.info(f"Brightness set to {self.brightness} by MIDI controller (CC33)")
|
||||||
|
case 30:
|
||||||
|
# Red 0-127 -> 0-255
|
||||||
|
self.color_r = round((msg.value / 127) * 255)
|
||||||
|
logging.info(f"Red set to {self.color_r}")
|
||||||
|
case 31:
|
||||||
|
# Green 0-127 -> 0-255
|
||||||
|
self.color_g = round((msg.value / 127) * 255)
|
||||||
|
logging.info(f"Green set to {self.color_g}")
|
||||||
|
case 32:
|
||||||
|
# Blue 0-127 -> 0-255
|
||||||
|
self.color_b = round((msg.value / 127) * 255)
|
||||||
|
logging.info(f"Blue set to {self.color_b}")
|
||||||
|
case 34:
|
||||||
|
self.n1 = int(msg.value)
|
||||||
|
logging.info(f"n1 set to {self.n1} by MIDI controller (CC34)")
|
||||||
|
case 35:
|
||||||
|
self.n2 = int(msg.value)
|
||||||
|
logging.info(f"n2 set to {self.n2} by MIDI controller (CC35)")
|
||||||
|
|
||||||
|
await asyncio.sleep(0.001) # Important: Yield control to asyncio event loop
|
||||||
|
|
||||||
|
except mido.PortsError as e:
|
||||||
|
logging.error(f"Error opening MIDI port '{midi_port_name}': {e}") # Changed to error
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logging.info(f"MIDI listener cancelled.") # Changed to info
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"An unexpected error occurred in MIDI listener: {e}") # Changed to error
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
try:
|
||||||
|
await self.ws_client.connect()
|
||||||
|
logging.info(f"[MidiHandler] WebSocket client connected to {self.ws_client.uri}") # Changed to info
|
||||||
|
|
||||||
|
await asyncio.gather(
|
||||||
|
self._midi_listener(),
|
||||||
|
self._midi_tcp_server()
|
||||||
|
)
|
||||||
|
except mido.PortsError as e:
|
||||||
|
logging.error(f"[MidiHandler] Error opening MIDI port: {e}") # Changed to error
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logging.info("[MidiHandler] Tasks cancelled due to program shutdown.") # Changed to info
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.info("\n[MidiHandler] Program interrupted by user.") # Changed to info
|
||||||
|
finally:
|
||||||
|
logging.info("[MidiHandler] Main program finished. Closing WebSocket client...") # Changed to info
|
||||||
|
await self.ws_client.close()
|
||||||
|
logging.info("[MidiHandler] WebSocket client closed.") # Changed to info
|
||||||
|
|
||||||
|
def print_midi_ports():
|
||||||
|
logging.info("\n--- Available MIDI Input Ports ---") # Changed to info
|
||||||
port_names = mido.get_input_names()
|
port_names = mido.get_input_names()
|
||||||
if not port_names:
|
if not port_names:
|
||||||
print("No MIDI input ports found. Please connect your device.")
|
logging.warning("No MIDI input ports found.") # Changed to warning
|
||||||
return
|
else:
|
||||||
if not (0 <= midi_port_index < len(port_names)):
|
|
||||||
print(f"Error: MIDI port index {midi_port_index} out of range. Available ports: {port_names}")
|
|
||||||
print("Available ports:")
|
|
||||||
for i, name in enumerate(port_names):
|
for i, name in enumerate(port_names):
|
||||||
print(f" {i}: {name}")
|
logging.info(f" {i}: {name}") # Changed to info
|
||||||
return
|
logging.info("----------------------------------") # Changed to info
|
||||||
|
|
||||||
midi_port_name = port_names[midi_port_index]
|
|
||||||
print(f"Selected MIDI input port: {midi_port_name}")
|
|
||||||
|
|
||||||
# 2. Initialize WebSocket client (using your actual networking.py)
|
|
||||||
ws_client = networking.WebSocketClient(websocket_uri)
|
|
||||||
|
|
||||||
try:
|
|
||||||
# 3. Connect WebSocket
|
|
||||||
await ws_client.connect()
|
|
||||||
print(f"WebSocket client connected to {ws_client.uri}")
|
|
||||||
|
|
||||||
# 4. Open MIDI port and start listening loop
|
|
||||||
with mido.open_input(midi_port_name) as port:
|
|
||||||
print(f"MIDI port '{midi_port_name}' opened. Press Ctrl+C to stop.")
|
|
||||||
while True:
|
|
||||||
msg = port.receive(block=False) # Non-blocking read
|
|
||||||
if msg:
|
|
||||||
match msg.type:
|
|
||||||
case 'note_on':
|
|
||||||
print(f" Note ON: Note={msg.note}, Velocity={msg.velocity}, Channel={msg.channel}")
|
|
||||||
match msg.note:
|
|
||||||
case 32:
|
|
||||||
await ws_client.send_data({
|
|
||||||
"names": ["1"],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "pulse",
|
|
||||||
"delay": delay,
|
|
||||||
"colors": ["#00ff00"],
|
|
||||||
"brightness": 100,
|
|
||||||
"num_leds": 200,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
case 33:
|
|
||||||
await ws_client.send_data({
|
|
||||||
"names": ["2"],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "chase",
|
|
||||||
"speed": 10,
|
|
||||||
"color": "#00FFFF",
|
|
||||||
}
|
|
||||||
})
|
|
||||||
case 'control_change':
|
|
||||||
match msg.control:
|
|
||||||
case 36:
|
|
||||||
|
|
||||||
delay = msg.value * 4
|
|
||||||
print(f"Delay set to {delay} ms")
|
|
||||||
|
|
||||||
await asyncio.sleep(0.001) # Important: Yield control to asyncio event loop
|
|
||||||
|
|
||||||
except mido.PortsError as e:
|
|
||||||
print(f"Error opening MIDI port '{midi_port_name}': {e}")
|
|
||||||
except asyncio.CancelledError:
|
|
||||||
print(f"MIDI listener cancelled.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"An unexpected error occurred: {e}")
|
|
||||||
finally:
|
|
||||||
# 5. Disconnect WebSocket and clean up
|
|
||||||
# This assumes your WebSocketClient has a ._connected attribute or similar way to check state.
|
|
||||||
# If your client's disconnect method is safe to call even if not connected, you can simplify.
|
|
||||||
await ws_client.close()
|
|
||||||
print("MIDI listener stopped and cleaned up.")
|
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
|
print_midi_ports()
|
||||||
# --- Configuration ---
|
# --- Configuration ---
|
||||||
MIDI_PORT_INDEX = 1 # <--- IMPORTANT: Change this to the correct index for your device
|
MIDI_PORT_INDEX = 1 # <--- IMPORTANT: Change this to the correct index for your device
|
||||||
WEBSOCKET_SERVER_URI = "ws://192.168.4.1:80/ws"
|
WEBSOCKET_SERVER_URI = "ws://192.168.4.1:80/ws"
|
||||||
# --- End Configuration ---
|
# --- End Configuration ---
|
||||||
|
|
||||||
try:
|
midi_handler = MidiHandler(MIDI_PORT_INDEX, WEBSOCKET_SERVER_URI)
|
||||||
await midi_to_websocket_listener(MIDI_PORT_INDEX, WEBSOCKET_SERVER_URI)
|
await midi_handler.run()
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("\nProgram interrupted by user.")
|
|
||||||
finally:
|
|
||||||
print("Main program finished.")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
asyncio.run(main())
|
asyncio.run(main())
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import json
|
|
||||||
|
|
||||||
class Settings(dict):
|
|
||||||
SETTINGS_FILE = "settings.json"
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
super().__init__()
|
|
||||||
self.load() # Load settings from file during initialization
|
|
||||||
|
|
||||||
def save(self):
|
|
||||||
try:
|
|
||||||
j = json.dumps(self, indent=4)
|
|
||||||
with open(self.SETTINGS_FILE, 'w') as file:
|
|
||||||
file.write(j)
|
|
||||||
print("Settings saved successfully.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error saving settings: {e}")
|
|
||||||
|
|
||||||
def load(self):
|
|
||||||
try:
|
|
||||||
with open(self.SETTINGS_FILE, 'r') as file:
|
|
||||||
loaded_settings = json.load(file)
|
|
||||||
self.update(loaded_settings)
|
|
||||||
print("Settings loaded successfully.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading settings {e}")
|
|
||||||
self.save()
|
|
||||||
278
src/sound.py
278
src/sound.py
@@ -4,121 +4,207 @@ import pyaudio
|
|||||||
import aubio
|
import aubio
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from time import sleep
|
from time import sleep
|
||||||
import websocket # pip install websocket-client
|
|
||||||
import json
|
import json
|
||||||
|
import socket
|
||||||
|
import time
|
||||||
|
import logging # Added logging import
|
||||||
|
import asyncio # Re-added asyncio import
|
||||||
|
import threading # Added threading for control server
|
||||||
|
|
||||||
seconds = 10 # how long this script should run (if not using infinite loop)
|
# Configure logging
|
||||||
|
DEBUG_MODE = True # Set to False for INFO level logging
|
||||||
|
logging.basicConfig(level=logging.DEBUG if DEBUG_MODE else logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
|
|
||||||
bufferSize = 512
|
# TCP Server Configuration (assuming midi.py runs this)
|
||||||
windowSizeMultiple = 2 # or 4 for higher accuracy, but more computational cost
|
MIDI_TCP_HOST = "127.0.0.1"
|
||||||
|
MIDI_TCP_PORT = 65432
|
||||||
|
|
||||||
audioInputDeviceIndex = 7 # use 'arecord -l' to check available audio devices
|
# Sound Control Server Configuration (for midi.py to control sound.py)
|
||||||
audioInputChannels = 1
|
SOUND_CONTROL_HOST = "127.0.0.1"
|
||||||
|
SOUND_CONTROL_PORT = 65433
|
||||||
|
|
||||||
pa = pyaudio.PyAudio()
|
class SoundBeatDetector:
|
||||||
|
def __init__(self, tcp_host: str, tcp_port: int):
|
||||||
|
self.tcp_host = tcp_host
|
||||||
|
self.tcp_port = tcp_port
|
||||||
|
self.tcp_socket = None
|
||||||
|
self.connected_to_midi = False
|
||||||
|
self.reconnect_delay = 1 # seconds
|
||||||
|
# Note: beat_sending_enabled is not used in this simplified flow
|
||||||
|
|
||||||
print("Available audio input devices:")
|
self.bufferSize = 512
|
||||||
info = pa.get_host_api_info_by_index(0)
|
self.windowSizeMultiple = 2
|
||||||
num_devices = info.get('deviceCount')
|
self.audioInputDeviceIndex = 7
|
||||||
found_device = False
|
self.audioInputChannels = 1
|
||||||
for i in range(0, num_devices):
|
|
||||||
device_info = pa.get_device_info_by_host_api_device_index(0, i)
|
|
||||||
if (device_info.get('maxInputChannels')) > 0:
|
|
||||||
print(f" Input Device id {i} - {device_info.get('name')}")
|
|
||||||
if i == audioInputDeviceIndex:
|
|
||||||
found_device = True
|
|
||||||
|
|
||||||
if not found_device:
|
self.pa = pyaudio.PyAudio()
|
||||||
print(f"Warning: Audio input device index {audioInputDeviceIndex} not found or has no input channels.")
|
|
||||||
# Consider exiting or picking a default if necessary
|
|
||||||
|
|
||||||
try:
|
logging.info("Available audio input devices:")
|
||||||
audioInputDevice = pa.get_device_info_by_index(audioInputDeviceIndex)
|
info = self.pa.get_host_api_info_by_index(0)
|
||||||
audioInputSampleRate = int(audioInputDevice['defaultSampleRate'])
|
num_devices = info.get('deviceCount')
|
||||||
except Exception as e:
|
found_device = False
|
||||||
print(f"Error getting audio device info for index {audioInputDeviceIndex}: {e}")
|
for i in range(0, num_devices):
|
||||||
pa.terminate()
|
device_info = self.pa.get_device_info_by_host_api_device_index(0, i)
|
||||||
exit()
|
if (device_info.get('maxInputChannels')) > 0:
|
||||||
|
logging.info(f" Input Device id {i} - {device_info.get('name')}")
|
||||||
|
if i == self.audioInputDeviceIndex:
|
||||||
|
found_device = True
|
||||||
|
|
||||||
# create the aubio tempo detection:
|
if not found_device:
|
||||||
hopSize = bufferSize
|
logging.warning(f"Audio input device index {self.audioInputDeviceIndex} not found or has no input channels.")
|
||||||
winSize = hopSize * windowSizeMultiple
|
|
||||||
tempoDetection = aubio.tempo(method='default', buf_size=winSize, hop_size=hopSize, samplerate=audioInputSampleRate)
|
|
||||||
|
|
||||||
# --- WebSocket Setup ---
|
try:
|
||||||
websocket_url = "ws://192.168.4.1:80/ws"
|
audioInputDevice = self.pa.get_device_info_by_index(self.audioInputDeviceIndex)
|
||||||
ws = None
|
self.audioInputSampleRate = int(audioInputDevice['defaultSampleRate'])
|
||||||
try:
|
except Exception as e:
|
||||||
ws = websocket.create_connection(websocket_url)
|
logging.error(f"Error getting audio device info for index {self.audioInputDeviceIndex}: {e}")
|
||||||
print(f"Successfully connected to WebSocket at {websocket_url}")
|
self.pa.terminate()
|
||||||
except Exception as e:
|
exit()
|
||||||
print(f"Failed to connect to WebSocket: {e}. Data will not be sent over WebSocket.")
|
|
||||||
# --- End WebSocket Setup ---
|
|
||||||
|
|
||||||
# this function gets called by the input stream, as soon as enough samples are collected from the audio input:
|
self.hopSize = self.bufferSize
|
||||||
def readAudioFrames(in_data, frame_count, time_info, status):
|
self.winSize = self.hopSize * self.windowSizeMultiple
|
||||||
global ws # Allow modification of the global ws variable
|
self.tempoDetection = aubio.tempo(method='default', buf_size=self.winSize, hop_size=self.hopSize, samplerate=self.audioInputSampleRate)
|
||||||
|
|
||||||
signal = np.frombuffer(in_data, dtype=np.float32)
|
self.inputStream = None
|
||||||
|
self._control_thread = None
|
||||||
|
|
||||||
beat = tempoDetection(signal)
|
self._connect_to_midi_server()
|
||||||
if beat:
|
self._start_control_server() # Start control server in background
|
||||||
bpm = tempoDetection.get_bpm()
|
|
||||||
print(f"beat! (running with {bpm:.2f} bpm)") # Use f-string for cleaner formatting, removed extra bells
|
|
||||||
data_to_send = {
|
|
||||||
"names": ["1"],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "pulse",
|
|
||||||
"delay": 10,
|
|
||||||
"colors": ["#00ff00"],
|
|
||||||
"brightness": 10,
|
|
||||||
"num_leds": 200,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
if ws: # Only send if the websocket connection is established
|
def reset_tempo_detection(self):
|
||||||
|
"""Re-initializes the aubio tempo detection object."""
|
||||||
|
logging.info("[SoundBeatDetector] Resetting tempo detection.")
|
||||||
|
self.tempoDetection = aubio.tempo(method='default', buf_size=self.winSize, hop_size=self.hopSize, samplerate=self.audioInputSampleRate)
|
||||||
|
|
||||||
|
def _control_server_loop(self):
|
||||||
|
srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
try:
|
||||||
|
srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||||
|
srv.bind((SOUND_CONTROL_HOST, SOUND_CONTROL_PORT))
|
||||||
|
srv.listen(5)
|
||||||
|
logging.info(f"[SoundBeatDetector - Control] Listening on {SOUND_CONTROL_HOST}:{SOUND_CONTROL_PORT}")
|
||||||
|
while True:
|
||||||
|
conn, addr = srv.accept()
|
||||||
|
with conn:
|
||||||
|
logging.info(f"[SoundBeatDetector - Control] Connection from {addr}")
|
||||||
|
try:
|
||||||
|
data = conn.recv(1024)
|
||||||
|
if not data:
|
||||||
|
continue
|
||||||
|
command = data.decode().strip()
|
||||||
|
logging.debug(f"[SoundBeatDetector - Control] Received command: {command}")
|
||||||
|
if command == "RESET_TEMPO":
|
||||||
|
self.reset_tempo_detection()
|
||||||
|
response = "OK: Tempo reset\n"
|
||||||
|
else:
|
||||||
|
response = "ERROR: Unknown command\n"
|
||||||
|
conn.sendall(response.encode('utf-8'))
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[SoundBeatDetector - Control] Error handling control message: {e}")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[SoundBeatDetector - Control] Server error: {e}")
|
||||||
|
finally:
|
||||||
try:
|
try:
|
||||||
ws.send(json.dumps(data_to_send))
|
srv.close()
|
||||||
# print("Sent data over WebSocket") # Optional: for debugging
|
except Exception:
|
||||||
except websocket.WebSocketConnectionClosedException:
|
pass
|
||||||
print("WebSocket connection closed, attempting to reconnect...")
|
|
||||||
ws = None # Mark as closed, connection will need to be re-established if desired
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error sending over WebSocket: {e}")
|
|
||||||
|
|
||||||
return (in_data, pyaudio.paContinue)
|
def _start_control_server(self):
|
||||||
|
if self._control_thread and self._control_thread.is_alive():
|
||||||
|
return
|
||||||
|
self._control_thread = threading.Thread(target=self._control_server_loop, daemon=True)
|
||||||
|
self._control_thread.start()
|
||||||
|
|
||||||
|
def _connect_to_midi_server(self):
|
||||||
|
if self.tcp_socket:
|
||||||
|
self.tcp_socket.close()
|
||||||
|
self.tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
self.tcp_socket.settimeout(self.reconnect_delay)
|
||||||
|
try:
|
||||||
|
logging.info(f"[SoundBeatDetector] Attempting to connect to MIDI TCP server at {self.tcp_host}:{self.tcp_port}...")
|
||||||
|
self.tcp_socket.connect((self.tcp_host, self.tcp_port))
|
||||||
|
self.tcp_socket.setblocking(0)
|
||||||
|
self.connected_to_midi = True
|
||||||
|
logging.info(f"[SoundBeatDetector] Successfully connected to MIDI TCP server.")
|
||||||
|
except (socket.error, socket.timeout) as e:
|
||||||
|
logging.error(f"[SoundBeatDetector] Failed to connect to MIDI TCP server: {e}")
|
||||||
|
self.connected_to_midi = False
|
||||||
|
|
||||||
# create and start the input stream
|
# Removed _handle_control_client and _control_server (replaced by simple threaded server)
|
||||||
try:
|
|
||||||
inputStream = pa.open(format=pyaudio.paFloat32,
|
|
||||||
input=True,
|
|
||||||
channels=audioInputChannels,
|
|
||||||
input_device_index=audioInputDeviceIndex,
|
|
||||||
frames_per_buffer=bufferSize,
|
|
||||||
rate=audioInputSampleRate,
|
|
||||||
stream_callback=readAudioFrames)
|
|
||||||
|
|
||||||
inputStream.start_stream()
|
def readAudioFrames(self, in_data, frame_count, time_info, status):
|
||||||
print("\nAudio stream started. Detecting beats. Press Ctrl+C to stop.")
|
signal = np.frombuffer(in_data, dtype=np.float32)
|
||||||
|
|
||||||
# Loop to keep the script running, allowing graceful shutdown
|
beat = self.tempoDetection(signal)
|
||||||
while inputStream.is_active():
|
if beat:
|
||||||
sleep(0.1) # Small delay to prevent busy-waiting
|
bpm = self.tempoDetection.get_bpm()
|
||||||
|
logging.debug(f"beat! (running with {bpm:.2f} bpm)") # Changed to debug
|
||||||
|
bpm_message = str(bpm)
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
if self.connected_to_midi and self.tcp_socket:
|
||||||
print("\nKeyboardInterrupt: Stopping script gracefully.")
|
try:
|
||||||
except Exception as e:
|
message_bytes = (bpm_message + "\n").encode('utf-8')
|
||||||
print(f"An error occurred with the audio stream: {e}")
|
self.tcp_socket.sendall(message_bytes)
|
||||||
finally:
|
logging.debug(f"[SoundBeatDetector] Sent BPM to MIDI TCP server: {bpm_message}") # Changed to debug
|
||||||
# Ensure streams and resources are closed
|
except socket.error as e:
|
||||||
if 'inputStream' in locals() and inputStream.is_active():
|
logging.error(f"[SoundBeatDetector] Error sending BPM to MIDI TCP server: {e}. Attempting to reconnect...")
|
||||||
inputStream.stop_stream()
|
self.connected_to_midi = False
|
||||||
if 'inputStream' in locals() and not inputStream.is_stopped():
|
self._connect_to_midi_server()
|
||||||
inputStream.close()
|
elif not self.connected_to_midi:
|
||||||
pa.terminate()
|
logging.warning("[SoundBeatDetector] Not connected to MIDI TCP server, attempting to reconnect...") # Changed to warning
|
||||||
if ws:
|
self._connect_to_midi_server()
|
||||||
print("Closing WebSocket connection.")
|
else:
|
||||||
ws.close()
|
logging.warning("[SoundBeatDetector] TCP socket not initialized, cannot send BPM.") # Changed to warning
|
||||||
|
|
||||||
print("Script finished.")
|
return (in_data, pyaudio.paContinue)
|
||||||
|
|
||||||
|
def start_stream(self):
|
||||||
|
try:
|
||||||
|
self.inputStream = self.pa.open(format=pyaudio.paFloat32,
|
||||||
|
input=True,
|
||||||
|
channels=self.audioInputChannels,
|
||||||
|
input_device_index=self.audioInputDeviceIndex,
|
||||||
|
frames_per_buffer=self.bufferSize,
|
||||||
|
rate=self.audioInputSampleRate,
|
||||||
|
stream_callback=self.readAudioFrames)
|
||||||
|
|
||||||
|
self.inputStream.start_stream()
|
||||||
|
logging.info("\nAudio stream started. Detecting beats. Press Ctrl+C to stop.")
|
||||||
|
|
||||||
|
while self.inputStream.is_active():
|
||||||
|
sleep(0.1)
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.info("\nKeyboardInterrupt: Stopping script gracefully.")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"An error occurred with the audio stream: {e}")
|
||||||
|
finally:
|
||||||
|
self.stop_stream()
|
||||||
|
|
||||||
|
def stop_stream(self):
|
||||||
|
if self.inputStream and self.inputStream.is_active():
|
||||||
|
self.inputStream.stop_stream()
|
||||||
|
if self.inputStream and not self.inputStream.is_stopped():
|
||||||
|
self.inputStream.close()
|
||||||
|
self.pa.terminate()
|
||||||
|
if self.tcp_socket and self.connected_to_midi:
|
||||||
|
logging.info("[SoundBeatDetector] Closing TCP socket.")
|
||||||
|
self.tcp_socket.close()
|
||||||
|
self.connected_to_midi = False
|
||||||
|
logging.info("SoundBeatDetector stopped.")
|
||||||
|
|
||||||
|
# Removed async def run(self)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
# TCP Server Configuration (should match midi.py)
|
||||||
|
MIDI_TCP_HOST = "127.0.0.1"
|
||||||
|
MIDI_TCP_PORT = 65432
|
||||||
|
|
||||||
|
sound_detector = SoundBeatDetector(MIDI_TCP_HOST, MIDI_TCP_PORT)
|
||||||
|
logging.info("Starting SoundBeatDetector...")
|
||||||
|
try:
|
||||||
|
sound_detector.start_stream()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.info("\nProgram interrupted by user.")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"An error occurred during main execution: {e}")
|
||||||
Reference in New Issue
Block a user