546d459696
Pass theme list & its entries around by reference rather than copying them. Fix bug in async icon loading that caused icons to be loaded multiple times. Original PR by @LiquidFenrir
95 lines
3.6 KiB
C
95 lines
3.6 KiB
C
/*
|
|
* This file is part of Anemone3DS
|
|
* Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
|
|
* * Requiring preservation of specified reasonable legal notices or
|
|
* author attributions in that material or in the Appropriate Legal
|
|
* Notices displayed by works containing it.
|
|
* * Prohibiting misrepresentation of the origin of that material,
|
|
* or requiring that modified versions of such material be marked in
|
|
* reasonable ways as different from the original version.
|
|
*/
|
|
|
|
#include "music.h"
|
|
#include "loading.h"
|
|
|
|
// Play a given audio struct
|
|
Result update_audio(audio_s * audio)
|
|
{
|
|
u32 size = audio->wave_buf[audio->buf_pos].nsamples * 4 - audio->data_read;
|
|
DEBUG("<update_audio> Audio Size: %ld\n", size);
|
|
if (audio->wave_buf[audio->buf_pos].status == NDSP_WBUF_DONE) // only run if the current selected buffer has already finished playing
|
|
{
|
|
DEBUG("<update_audio> Attempting ov_read\n");
|
|
int bitstream;
|
|
u32 read = ov_read(&audio->vf, (char *)audio->wave_buf[audio->buf_pos].data_vaddr + audio->data_read, size, &bitstream); // read 1 vorbis packet into wave buffer
|
|
DEBUG("<update_audio> ov_read successful\n");
|
|
|
|
if (read <= 0) // EoF or error
|
|
{
|
|
ov_clear(&audio->vf);
|
|
if (read == 0) // EoF
|
|
{
|
|
ov_open(fmemopen(audio->filebuf, audio->filesize, "rb"), &audio->vf, NULL, 0); // Reopen file. Don't need to reinit channel stuff since it's all the same as before
|
|
} else // Error :(
|
|
{
|
|
DEBUG("<update_audio> Vorbis play error: %ld\n", read);
|
|
ndspChnReset(0);
|
|
return MAKERESULT(RL_FATAL, RS_INVALIDARG, RM_APPLICATION, RD_NO_DATA);
|
|
}
|
|
} else
|
|
{
|
|
audio->data_read += read;
|
|
if (read == size) {
|
|
audio->data_read = 0;
|
|
ndspChnWaveBufAdd(0, &audio->wave_buf[audio->buf_pos]); // Add buffer to ndsp
|
|
audio->buf_pos = 1 - audio->buf_pos; // switch to other buffer to load and prepare it while the current one is playing
|
|
}
|
|
}
|
|
}
|
|
return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_APPLICATION, RD_SUCCESS);
|
|
}
|
|
|
|
void thread_audio(void * data) {
|
|
audio_s * audio = (audio_s *)data;
|
|
while(!audio->stop) {
|
|
update_audio(audio);
|
|
}
|
|
ndspChnWaveBufClear(0);
|
|
ndspChnReset(0);
|
|
ov_clear(&audio->vf);
|
|
free(audio->filebuf);
|
|
linearFree((void *)audio->wave_buf[0].data_vaddr);
|
|
linearFree((void *)audio->wave_buf[1].data_vaddr);
|
|
}
|
|
|
|
void play_audio(audio_s * audio) {
|
|
audio->playing_thread = threadCreate(thread_audio, audio, 0x1000, 0x3F, 1, false);
|
|
}
|
|
|
|
void stop_audio(audio_s ** audio_ptr) {
|
|
audio_s * audio = *audio_ptr;
|
|
if(audio->playing_thread)
|
|
{
|
|
audio->stop = true;
|
|
threadJoin(audio->playing_thread, U64_MAX);
|
|
threadFree(audio->playing_thread);
|
|
}
|
|
free(audio);
|
|
*audio_ptr = NULL;
|
|
}
|