len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-07 05:35:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins: Oscilloscope & VU Meter: Support USB audio

Browse source 
Also show current mixer frequency in title of VU meter,
and adjust the menu title from "VU Meter Menu" to just
"VU Meter"

Change-Id: I5bf8f55a3c9874618cac939fe32a611ac96f52ff
This commit is contained in:
Christian Soffke 2025-11-23 23:33:19 +01:00
parent 0551c4a780
commit 4095b13d52
4 changed files with 91 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/plugins/oscilloscope.c
View file

@ -763,6 +763,8 @@ static bool one_frame_paused = false; /* Allow one frame to be drawn when paused
static long osc_delay; /* delay in 100ths of a tick */
static long osc_delay_error; /* delay fraction error accumulator */
static enum pcm_mixer_channel channel;
/* implementation */
@ -938,7 +940,7 @@ static int last_right;
static void get_peaks(int *left, int *right)
{
static struct pcm_peaks peaks;
rb->mixer_channel_calculate_peaks(PCM_MIXER_CHAN_PLAYBACK,
rb->mixer_channel_calculate_peaks(channel,
&peaks);
*left = peaks.left;
*right = peaks.right;
@ -1501,7 +1503,7 @@ static long anim_waveform_horizontal(void)
long cur_tick = *rb->current_tick;
if (rb->mixer_channel_status(PCM_MIXER_CHAN_PLAYBACK) != CHANNEL_PLAYING)
if (rb->mixer_channel_status(channel) != CHANNEL_PLAYING)
{
osd_lcd_update_prepare();
rb->lcd_hline(0, LCD_WIDTH-1, 1*LCD_HEIGHT/4);
@ -1695,7 +1697,7 @@ static long anim_waveform_vertical(void)
long cur_tick = *rb->current_tick;
if (rb->mixer_channel_status(PCM_MIXER_CHAN_PLAYBACK) != CHANNEL_PLAYING)
if (rb->mixer_channel_status(channel) != CHANNEL_PLAYING)
{
osd_lcd_update_prepare();
rb->lcd_vline(1*LCD_WIDTH/4, 0, LCD_HEIGHT-1);
@ -1838,7 +1840,7 @@ static long anim_waveform_vertical(void)
static void anim_waveform_exit(void)
{
/* Remove any buffer hook */
rb->mixer_channel_set_buffer_hook(PCM_MIXER_CHAN_PLAYBACK, NULL);
rb->mixer_channel_set_buffer_hook(channel, NULL);
#ifdef HAVE_SCHEDULER_BOOSTCTRL
/* Remove our boost */
rb->cancel_cpu_boost();
@ -1906,7 +1908,7 @@ static void graphmode_setup(void)
#ifdef OSCILLOSCOPE_GRAPHMODE
if (osc.graphmode == GRAPH_WAVEFORM)
{
rb->mixer_channel_set_buffer_hook(PCM_MIXER_CHAN_PLAYBACK,
rb->mixer_channel_set_buffer_hook(channel,
waveform_buffer_callback);
#ifdef HAVE_SCHEDULER_BOOSTCTRL
rb->trigger_cpu_boost(); /* Just looks better */
@ -1914,7 +1916,7 @@ static void graphmode_setup(void)
}
else
{
rb->mixer_channel_set_buffer_hook(PCM_MIXER_CHAN_PLAYBACK,
rb->mixer_channel_set_buffer_hook(channel,
NULL);
#ifdef HAVE_SCHEDULER_BOOSTCTRL
rb->cancel_cpu_boost();
@ -2005,6 +2007,21 @@ static void osc_setup(void)
graphmode_setup();
}
#ifdef USB_ENABLE_AUDIO
void switch_channel(enum pcm_mixer_channel new_channel)
{
/* Remove any buffer hook */
rb->mixer_channel_set_buffer_hook(channel, NULL);
channel = new_channel;
#ifdef OSCILLOSCOPE_GRAPHMODE
if (osc.graphmode == GRAPH_WAVEFORM)
rb->mixer_channel_set_buffer_hook(channel, waveform_buffer_callback);
#endif
}
#endif /* USB_ENABLE_AUDIO */
enum plugin_status plugin_start(const void* parameter)
{
bool exit = false;
@ -2012,10 +2029,25 @@ enum plugin_status plugin_start(const void* parameter)
int lastbutton = BUTTON_NONE;
#endif
channel = PCM_MIXER_CHAN_PLAYBACK;
osc_setup();
while (!exit)
{
#ifdef USB_ENABLE_AUDIO
if (rb->usb_audio_get_playing())
{
if (channel != PCM_MIXER_CHAN_USBAUDIO)
switch_channel(PCM_MIXER_CHAN_USBAUDIO);
}
else
{
if (channel != PCM_MIXER_CHAN_PLAYBACK)
switch_channel(PCM_MIXER_CHAN_PLAYBACK);
}
#endif /* USB_ENABLE_AUDIO */
long delay = oscilloscope_draw();
if (delay <= 0)