Skip to content

Commit 6c09d35

Browse files
authored
Merge pull request #330 from sotpapathe/feature/pspaudiolib-getters
Add getters in pspaudiolib
2 parents d46b2b2 + 0e7752f commit 6c09d35

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/audio/pspaudiolib.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ void pspAudioSetVolume(int channel, int left, int right)
3030
AudioStatus[channel].volumeleft = left;
3131
}
3232

33+
void pspAudioGetVolume(int channel, int *left, int *right)
34+
{
35+
*right = AudioStatus[channel].volumeright;
36+
*left = AudioStatus[channel].volumeleft;
37+
}
38+
3339
void pspAudioSetChannelCallback(int channel, pspAudioCallback_t callback, void *pdata)
3440
{
3541
volatile psp_audio_channelinfo *pci = &AudioStatus[channel];
@@ -38,6 +44,13 @@ void pspAudioSetChannelCallback(int channel, pspAudioCallback_t callback, void *
3844
pci->callback=callback;
3945
}
4046

47+
void pspAudioGetChannelCallback(int channel, pspAudioCallback_t *callback, void **pdata)
48+
{
49+
volatile psp_audio_channelinfo *pci = &AudioStatus[channel];
50+
*pdata = pci->pdata;
51+
*callback = pci->callback;
52+
}
53+
4154
int pspAudioOutBlocking(unsigned int channel, unsigned int vol1, unsigned int vol2, void *buf)
4255
{
4356
if (!audio_ready) return -1;

src/audio/pspaudiolib.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ void pspAudioEndPre();
4141
void pspAudioEnd();
4242

4343
void pspAudioSetVolume(int channel, int left, int right);
44+
void pspAudioGetVolume(int channel, int *left, int *right);
4445
void pspAudioSetChannelCallback(int channel, pspAudioCallback_t callback, void *pdata);
46+
void pspAudioGetChannelCallback(int channel, pspAudioCallback_t *callback, void **pdata);
4547
int pspAudioOutBlocking(unsigned int channel, unsigned int vol1, unsigned int vol2, void *buf);
4648

4749
#ifdef __cplusplus

0 commit comments

Comments
 (0)