The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-11-14 06:45:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

using custom callbacks for vorbis

Browse Source
This commit is contained in:
Alberto Fustinoni 2017-06-20 22:33:25 +09:00
parent 888eb45d4d
commit 818d9c7c6a
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/cd_hw/cdd.c
View File

@ -132,7 +132,27 @@ static const unsigned char waveHeader[28] =
/* vorbis file callbacks to use RFILEs*/ /* vorbis file callbacks to use RFILEs*/
#if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS) #if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS)
size_t fs_vorbis_read(void *ptr, size_t size, size_t nmemb, void *datasource)
{
return filestream_read(datasource, ptr, size*nmemb);
}
int fs_vorbis_seek(void *datasource, ogg_int64_t offset, int whence)
{
return filestream_seek(datasource, offset, whence);
}
int fs_vorbis_close (void *datasource)
{
return filestream_close(datasource);
}
long fs_vorbis_tell(void *datasource)
{
return filestream_tell(datasource);
}
ov_callbacks fs_ov_callbacks = { filestream_read, fs_vorbis_seek, fs_vorbis_close, fs_vorbis_tell };
#endif #endif
/* supported WAVE file extensions */ /* supported WAVE file extensions */
@ -275,7 +295,7 @@ int cdd_context_load(uint8 *state)
{ {
#ifdef DISABLE_MANY_OGG_OPEN_FILES #ifdef DISABLE_MANY_OGG_OPEN_FILES
/* VORBIS file need to be opened first */ /* VORBIS file need to be opened first */
ov_open(cdd.toc.tracks[cdd.index].fd,&cdd.toc.tracks[cdd.index].vf,0,0); ov_open_callbacks(cdd.toc.tracks[cdd.index].fd,&cdd.toc.tracks[cdd.index].vf,0,0,fs_ov_callbacks);
#endif #endif
/* VORBIS AUDIO track */ /* VORBIS AUDIO track */
ov_pcm_seek(&cdd.toc.tracks[cdd.index].vf, (lba * 588) - cdd.toc.tracks[cdd.index].offset); ov_pcm_seek(&cdd.toc.tracks[cdd.index].vf, (lba * 588) - cdd.toc.tracks[cdd.index].offset);
@ -489,7 +509,7 @@ int cdd_load(char *filename, char *header)
cdd.toc.tracks[cdd.toc.last].offset -= dataOffset; cdd.toc.tracks[cdd.toc.last].offset -= dataOffset;
} }
#if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS) #if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS)
else if (!ov_open(cdd.toc.tracks[cdd.toc.last].fd,&cdd.toc.tracks[cdd.toc.last].vf,0,0)) else if (!ov_open_callbacks(cdd.toc.tracks[cdd.toc.last].fd,&cdd.toc.tracks[cdd.toc.last].vf,0,0,fs_ov_callbacks))
{ {
/* retrieve stream infos */ /* retrieve stream infos */
vorbis_info *info = ov_info(&cdd.toc.tracks[cdd.toc.last].vf,-1); vorbis_info *info = ov_info(&cdd.toc.tracks[cdd.toc.last].vf,-1);
@ -793,7 +813,7 @@ int cdd_load(char *filename, char *header)
cdd.toc.last++; cdd.toc.last++;
} }
#if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS) #if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS)
else if (!ov_open(fd,&cdd.toc.tracks[cdd.toc.last].vf,0,0)) else if (!ov_open_callbacks(fd,&cdd.toc.tracks[cdd.toc.last].vf,0,0,fs_ov_callbacks))
{ {
/* retrieve stream infos */ /* retrieve stream infos */
vorbis_info *info = ov_info(&cdd.toc.tracks[cdd.toc.last].vf,-1); vorbis_info *info = ov_info(&cdd.toc.tracks[cdd.toc.last].vf,-1);
@ -1351,7 +1371,7 @@ void cdd_update(void)
{ {
#ifdef DISABLE_MANY_OGG_OPEN_FILES #ifdef DISABLE_MANY_OGG_OPEN_FILES
/* VORBIS file need to be opened first */ /* VORBIS file need to be opened first */
ov_open(cdd.toc.tracks[cdd.index].fd,&cdd.toc.tracks[cdd.index].vf,0,0); ov_open_callbacks(cdd.toc.tracks[cdd.index].fd,&cdd.toc.tracks[cdd.index].vf,0,0,fs_ov_callbacks);
#endif #endif
ov_pcm_seek(&cdd.toc.tracks[cdd.index].vf, (cdd.toc.tracks[cdd.index].start * 588) - cdd.toc.tracks[cdd.index].offset); ov_pcm_seek(&cdd.toc.tracks[cdd.index].vf, (cdd.toc.tracks[cdd.index].start * 588) - cdd.toc.tracks[cdd.index].offset);
} }
@ -1454,7 +1474,7 @@ void cdd_update(void)
if (!cdd.toc.tracks[cdd.index].vf.datasource) if (!cdd.toc.tracks[cdd.index].vf.datasource)
{ {
/* VORBIS file need to be opened first */ /* VORBIS file need to be opened first */
ov_open(cdd.toc.tracks[cdd.index].fd,&cdd.toc.tracks[cdd.index].vf,0,0); ov_open_callbacks(cdd.toc.tracks[cdd.index].fd,&cdd.toc.tracks[cdd.index].vf,0,0,fs_ov_callbacks);
} }
#endif #endif
/* VORBIS AUDIO track */ /* VORBIS AUDIO track */
@ -1647,7 +1667,7 @@ void cdd_process(void)
/* open current track VORBIS file */ /* open current track VORBIS file */
if (cdd.toc.tracks[index].vf.seekable) if (cdd.toc.tracks[index].vf.seekable)
{ {
ov_open(cdd.toc.tracks[index].fd,&cdd.toc.tracks[index].vf,0,0); ov_open_callbacks(cdd.toc.tracks[index].fd,&cdd.toc.tracks[index].vf,0,0,fs_ov_callbacks);
} }
} }
#endif #endif
@ -1745,7 +1765,7 @@ void cdd_process(void)
/* open current track VORBIS file */ /* open current track VORBIS file */
if (cdd.toc.tracks[index].vf.seekable) if (cdd.toc.tracks[index].vf.seekable)
{ {
ov_open(cdd.toc.tracks[index].fd,&cdd.toc.tracks[index].vf,0,0); ov_open_callbacks(cdd.toc.tracks[index].fd,&cdd.toc.tracks[index].vf,0,0,fs_ov_callbacks);
} }
} }
#endif #endif