Skip to content

Commit 1f9eee3

Browse files
ThomasFarstrikeThomasFarstrike
committed
Rename AudioFlinger to AudioManager framework
1 parent a32a020 commit 1f9eee3

File tree

13 files changed

+76
-301
lines changed

13 files changed

+76
-301
lines changed

‎internal_filesystem/apps/com.micropythonos.musicplayer/assets/music_player.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import time
44

5-
from mpos import Activity, Intent, sdcard, get_event_name, AudioFlinger
5+
from mpos import Activity, Intent, sdcard, get_event_name, AudioManager
66

77
class MusicPlayer(Activity):
88

@@ -63,17 +63,17 @@ def onCreate(self):
6363
self._filename = self.getIntent().extras.get("filename")
6464
qr_screen = lv.obj()
6565
self._slider_label=lv.label(qr_screen)
66-
self._slider_label.set_text(f"Volume: {AudioFlinger.get_volume()}%")
66+
self._slider_label.set_text(f"Volume: {AudioManager.get_volume()}%")
6767
self._slider_label.align(lv.ALIGN.TOP_MID,0,lv.pct(4))
6868
self._slider=lv.slider(qr_screen)
6969
self._slider.set_range(0,16)
70-
self._slider.set_value(int(AudioFlinger.get_volume()/6.25), False)
70+
self._slider.set_value(int(AudioManager.get_volume()/6.25), False)
7171
self._slider.set_width(lv.pct(90))
7272
self._slider.align_to(self._slider_label,lv.ALIGN.OUT_BOTTOM_MID,0,10)
7373
def volume_slider_changed(e):
7474
volume_int = self._slider.get_value()*6.25
7575
self._slider_label.set_text(f"Volume: {volume_int}%")
76-
AudioFlinger.set_volume(volume_int)
76+
AudioManager.set_volume(volume_int)
7777
self._slider.add_event_cb(volume_slider_changed,lv.EVENT.VALUE_CHANGED,None)
7878
self._filename_label = lv.label(qr_screen)
7979
self._filename_label.align(lv.ALIGN.CENTER,0,0)
@@ -100,12 +100,12 @@ def onResume(self, screen):
100100
print("Not playing any file...")
101101
else:
102102
print(f"Playing file {self._filename}")
103-
AudioFlinger.stop()
103+
AudioManager.stop()
104104
time.sleep(0.1)
105105

106-
success = AudioFlinger.play_wav(
106+
success = AudioManager.play_wav(
107107
self._filename,
108-
stream_type=AudioFlinger.STREAM_MUSIC,
108+
stream_type=AudioManager.STREAM_MUSIC,
109109
on_complete=self.player_finished
110110
)
111111

@@ -125,7 +125,7 @@ def defocus_obj(self, obj):
125125
obj.set_style_border_width(0, lv.PART.MAIN)
126126

127127
def stop_button_clicked(self, event):
128-
AudioFlinger.stop()
128+
AudioManager.stop()
129129
self.finish()
130130

131131
def player_finished(self, result=None):

‎internal_filesystem/apps/com.micropythonos.soundrecorder/assets/sound_recorder.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import time
44

5-
from mpos import Activity, ui, AudioFlinger
5+
from mpos import Activity, ui, AudioManager
66

77

88
def _makedirs(path):
@@ -136,7 +136,7 @@ def onPause(self, screen):
136136

137137
def _update_status(self):
138138
"""Update status label based on microphone availability."""
139-
if AudioFlinger.has_microphone():
139+
if AudioManager.has_microphone():
140140
self._status_label.set_text("Microphone ready")
141141
self._status_label.set_style_text_color(lv.color_hex(0x00AA00), lv.PART.MAIN)
142142
self._record_button.remove_flag(lv.obj.FLAG.HIDDEN)
@@ -243,9 +243,9 @@ def _on_record_clicked(self, event):
243243
def _start_recording(self):
244244
"""Start recording audio."""
245245
print("SoundRecorder: _start_recording called")
246-
print(f"SoundRecorder: has_microphone() = {AudioFlinger.has_microphone()}")
246+
print(f"SoundRecorder: has_microphone() = {AudioManager.has_microphone()}")
247247

248-
if not AudioFlinger.has_microphone():
248+
if not AudioManager.has_microphone():
249249
print("SoundRecorder: No microphone available - aborting")
250250
return
251251

@@ -263,12 +263,12 @@ def _start_recording(self):
263263
return
264264

265265
# Start recording
266-
print(f"SoundRecorder: Calling AudioFlinger.record_wav()")
266+
print(f"SoundRecorder: Calling AudioManager.record_wav()")
267267
print(f" file_path: {file_path}")
268268
print(f" duration_ms: {self._current_max_duration_ms}")
269269
print(f" sample_rate: {self.SAMPLE_RATE}")
270270

271-
success = AudioFlinger.record_wav(
271+
success = AudioManager.record_wav(
272272
file_path=file_path,
273273
duration_ms=self._current_max_duration_ms,
274274
on_complete=self._on_recording_complete,
@@ -302,7 +302,7 @@ def _start_recording(self):
302302

303303
def _stop_recording(self):
304304
"""Stop recording audio."""
305-
AudioFlinger.stop()
305+
AudioManager.stop()
306306
self._is_recording = False
307307

308308
# Show "Saving..." status immediately (file finalization takes time on SD card)
@@ -364,13 +364,13 @@ def _on_play_clicked(self, event):
364364
"""Handle play button click."""
365365
if self._last_recording and not self._is_recording:
366366
# Stop any current playback
367-
AudioFlinger.stop()
367+
AudioManager.stop()
368368
time.sleep_ms(100)
369369

370370
# Play the recording
371-
success = AudioFlinger.play_wav(
371+
success = AudioManager.play_wav(
372372
self._last_recording,
373-
stream_type=AudioFlinger.STREAM_MUSIC,
373+
stream_type=AudioManager.STREAM_MUSIC,
374374
on_complete=self._on_playback_complete,
375375
volume=100
376376
)

‎internal_filesystem/lib/mpos/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from .config import SharedPreferences
99
from .net.connectivity_manager import ConnectivityManager
1010
from .net.wifi_service import WifiService
11-
from .audio.audioflinger import AudioFlinger
11+
from .audio.audiomanager import AudioManager
1212
from .net.download_manager import DownloadManager
1313
from .task_manager import TaskManager
1414
from .camera_manager import CameraManager
@@ -66,7 +66,7 @@
6666
"App",
6767
"Activity",
6868
"SharedPreferences",
69-
"ConnectivityManager", "DownloadManager", "WifiService", "AudioFlinger", "Intent",
69+
"ConnectivityManager", "DownloadManager", "WifiService", "AudioManager", "Intent",
7070
"ActivityNavigator", "AppManager", "TaskManager", "CameraManager", "BatteryManager",
7171
# Device and build info
7272
"DeviceInfo", "BuildInfo",

‎internal_filesystem/lib/mpos/audio/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# AudioFlinger - Centralized Audio Management Service for MicroPythonOS
1+
# AudioManager - Centralized Audio Management Service for MicroPythonOS
22
# Android-inspired audio routing with priority-based audio focus
33
# Simple routing: play_wav() -> I2S, play_rtttl() -> buzzer, record_wav() -> I2S mic
44

5-
from .audioflinger import AudioFlinger
5+
from .audiomanager import AudioManager

0 commit comments

Comments
 (0)