joel16/ElevenMPV
1
0
Fork 0
mirror of https://github.com/joel16/ElevenMPV.git synced 2024-11-23 11:39:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant defines and use proper paramaters

Browse Source
This commit is contained in:
Joel16 2019-05-22 11:45:26 -04:00
parent 924bae5044
commit af9321f784
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/audio/vitaaudiolib.h
View File

@ -9,7 +9,6 @@ extern "C" {
#define VITA_NUM_AUDIO_CHANNELS 1
#define VITA_NUM_AUDIO_SAMPLES 960
#define VITA_VOLUME_MAX 0x8000
typedef void (* vitaAudioCallback_t)(void *stream, unsigned int length, void *userdata);

2
source/audio/audio.c
View File

@ -184,7 +184,7 @@ int Audio_Init(const char *path) {
break;
}
vitaAudioInit(Audio_GetSampleRate(), Audio_GetChannels() == 2? SCE_AUDIO_OUT_PARAM_FORMAT_S16_STEREO : SCE_AUDIO_OUT_PARAM_FORMAT_S16_MONO);
vitaAudioInit(Audio_GetSampleRate(), Audio_GetChannels() == 2? SCE_AUDIO_OUT_MODE_STEREO : SCE_AUDIO_OUT_MODE_MONO);
vitaAudioSetChannelCallback(0, Audio_Decode, NULL);
return 0;
}

13
source/audio/vitaaudiolib.c
View File

@ -29,11 +29,11 @@ int vitaAudioOutBlocking(unsigned int channel, unsigned int vol1, unsigned int v
if (channel >= VITA_NUM_AUDIO_CHANNELS)
return(-1);
if (vol1 > VITA_VOLUME_MAX)
vol1 = VITA_VOLUME_MAX;
if (vol1 > SCE_AUDIO_OUT_MAX_VOL)
vol1 = SCE_AUDIO_OUT_MAX_VOL;
if (vol2 > VITA_VOLUME_MAX)
vol2 = VITA_VOLUME_MAX;
if (vol2 > SCE_AUDIO_OUT_MAX_VOL)
vol2 = SCE_AUDIO_OUT_MAX_VOL;
int vol[2] = {vol1, vol2};
sceAudioOutSetVolume(vitaAudioStatus[channel].handle, SCE_AUDIO_VOLUME_FLAG_L_CH | SCE_AUDIO_VOLUME_FLAG_R_CH, vol);
@ -78,8 +78,8 @@ int vitaAudioInit(int frequency, SceAudioOutMode mode) {
for (i = 0; i < VITA_NUM_AUDIO_CHANNELS; i++) {
vitaAudioStatus[i].handle = -1;
vitaAudioStatus[i].threadhandle = -1;
vitaAudioStatus[i].volumeright = VITA_VOLUME_MAX;
vitaAudioStatus[i].volumeleft = VITA_VOLUME_MAX;
vitaAudioStatus[i].volumeright = SCE_AUDIO_OUT_MAX_VOL;
vitaAudioStatus[i].volumeleft = SCE_AUDIO_OUT_MAX_VOL;
vitaAudioStatus[i].callback = 0;
vitaAudioStatus[i].userdata = 0;
}
@ -101,7 +101,6 @@ int vitaAudioInit(int frequency, SceAudioOutMode mode) {
}
audio_ready = 1;
strcpy(str, "audiot0");
for (i = 0; i < VITA_NUM_AUDIO_CHANNELS; i++) {