Ah, that's a good point..Also people wont have to replace every file if they only want to change 'confirm' for example.
sfxData->buffer = NULLsfx->buffer = NULLfor (i = 0; i < NUM_SFX_FILES; i++)
sfx_files[i].buffer = NULL#include "include/sound.h"
extern unsigned char scrollV_adp[];
extern unsigned int size_scrollV_adp;
extern unsigned char scrollH_adp[];
extern unsigned int size_scrollH_adp;
extern unsigned char page_adp[];
extern unsigned int size_page_adp;
extern unsigned char cancel_adp[];
extern unsigned int size_cancel_adp;
extern unsigned char transition_adp[];
extern unsigned int size_transition_adp;
extern unsigned char alert_adp[];
extern unsigned int size_alert_adp;
extern unsigned char confirm_adp[];
extern unsigned int size_confirm_adp;
struct sfxEffect {
const char *name;
void *buffer;
int size;
};
static struct sfxEffect sfx_files[NUM_SFX_FILES] = {
{"scrollV.adp"}, //0 done
{"scrollH.adp"}, //1 done
{"page.adp"}, //2 half done L1 R1 (still plays sound if no movement)
{"cancel.adp"}, //3
{"transition.adp"}, //4
{"alert.adp"}, //5 done
{"confirm.adp"}, //6 done
};
struct audsrv_adpcm_t sfx[NUM_SFX_FILES]; //changed from static so i can declare in other source files for audsrv_adpcm_play()..could possibly achieve same thing with a sfxPlay function..will look into this later.
//Returns 0 if the specified file was read. The sfxEffect structure will not be updated unless the file is successfully read.
static int sfxRead(const char *snd_path, struct sfxEffect *sfx)
{
FILE* adpcm;
void *buffer;
int ret, size;
adpcm = fopen(snd_path, "rb");
if (adpcm == NULL)
{
printf("failed to open adpcm file %s\n", snd_path);
return -ENOENT;
}
fseek(adpcm, 0, SEEK_END);
size = ftell(adpcm);
rewind(adpcm);
buffer = memalign(64, size);
if (buffer == NULL)
{
printf("Failed to allocate memory for SFX\n");
fclose(adpcm);
return -ENOMEM;
}
ret = fread(buffer, 1, size, adpcm);
fclose(adpcm);
if(ret != size)
{
printf("Failed to read SFX: %d (expected %d)\n", ret, size);
free(buffer);
return -EIO;
}
sfx->buffer = buffer;
sfx->size = size;
return 0;
}
static void sfxInitDefaults(void)
{
sfx_files[0].buffer = scrollV_adp;
sfx_files[0].size = size_scrollV_adp;
sfx_files[1].buffer = scrollH_adp;
sfx_files[1].size = size_scrollH_adp;
sfx_files[2].buffer = page_adp;
sfx_files[2].size = size_page_adp;
sfx_files[3].buffer = cancel_adp;
sfx_files[3].size = size_cancel_adp;
sfx_files[4].buffer = transition_adp;
sfx_files[4].size = size_transition_adp;
sfx_files[5].buffer = alert_adp;
sfx_files[5].size = size_alert_adp;
sfx_files[6].buffer = confirm_adp;
sfx_files[6].size = size_confirm_adp;
}
//Returns 0 (AUDSRV_ERR_NOERROR) if the sound was loaded successfully.
static int sfxLoad(const struct sfxEffect *sfxData, audsrv_adpcm_t *sfx)
{
int ret;
ret = audsrv_load_adpcm(sfx, sfxData->buffer, sfxData->size);
free(sfxData->buffer);
sfxData->buffer = NULL; //Mark the buffer as freed. warning: assignment of read-only member `buffer'
return ret;
}
static void getAudioDevice(char *device_path)
{
if ((gAudioPath == 1))
sprintf(device_path, "mc0:Sound/");
if ((gAudioPath == 2))
sprintf(device_path, "mc1:Sound/");
if ((gAudioPath == 3))
sprintf(device_path, "pfs0:Sound/");
if ((gAudioPath == 4))
sprintf(device_path, "mass0:Sound/");
}
//Returns number of audio files successfully loaded, < 0 if an unrecoverable error occurred.
int sfxInit(void)
{
char path[256];
char *snd_path = path;
char device_path[128];
int ret, i, loaded;
ret = audsrv_init();
if (ret != 0)
{
printf("sfx: failed to initialize audsrv\n");
printf("audsrv returned error string: %s\n", audsrv_get_error_string());
return -1;
}
audsrv_adpcm_init();
audsrv_set_volume(MAX_VOLUME);
sfxInitDefaults();
getAudioDevice(device_path);
loaded = 0;
for (i = 0; i < NUM_SFX_FILES; i++)
{
if ((gAudioPath > 0))
{
sprintf(snd_path, "%s/%s", device_path, sfx_files[i].name);
}
else
{
snd_path = (char *)sfx_files[i].buffer;
}
ret = sfxRead(snd_path, &sfx_files[i]);
if (ret != 0)
{
printf("sfx: %s could not be loaded. Using default sound %d.\n", snd_path, ret);
}
ret = sfxLoad(&sfx_files[i], &sfx[i]);
if (ret == 0)
{
loaded++;
}
else
{
printf("sfx: failed to load %s, error %d\n", snd_path, ret);
}
}
return loaded;
}
//Returns 0 (AUDSRV_ERR_NOERROR) if the sound was loaded successfully.
static int sfxLoad(struct sfxEffect *sfxData, audsrv_adpcm_t *sfx)It's not about confirming that the buffer was freed, but to mark that the buffer was freed. So if you ever get a NULL-pointer exception, you can tell that the code was reusing a buffer that was already freed. Rather than letting the code use a pointer that is no longer valid for its purpose (which is a dangling pointer).
http://www.flashkit.com/soundfx/Interfaces/Clicks/Click_16-Partners-44/index.php //scrollH
http://www.flashkit.com/soundfx/Interfaces/Switches/Switch19-intermed-5228/index.php //cancel
http://www.flashkit.com/soundfx/Interfaces/Switches/Switch19-intermed-5235/index.php //confirm
http://www.flashkit.com/soundfx/Interfaces/Zips/idg-zip2-intermed-2884/index.php //page
http://www.flashkit.com/soundfx/Interfaces/Zips/idg-zip3-intermed-2896/index.php //transition
http://www.flashkit.com/soundfx/Electronic/Alarms/alarma-DESIGNSQ-7820/index.php //alert
http://www.flashkit.com/soundfx/Interfaces/Clicks/ambient_-agent_vi-8701/index.php //scrollVmc0:SND
mc1:SND
pfs0:+OPL/SND
mass0:SNDThat's fine IMO, as long as they are 'free'.
It's from the open/Homebrew-PS2SDK, right (Edit: I mean the encoder.)?
It should be possible, to make it instantly use the new sounds (i.e. via a config-reinit or a similar approach like the VMode-change, etc.), even tho' it is not a problem if OPL needs a restart.
Lol! I wanted to suggest you the very same thing (SND or SFX), for the very same reason... and it used upper- and lower-case-characters before...
I would be interested, if we can use 24 or 48 voice-channels without issues.
Indeed!
Hmmm... Quotations work well for me via Chrome on Android.
Alright!
Alright! Partial success!
Yes, it seems to work as Intended! Keyboard-Sounds ('change letter' and 'enter letter') seem to work.
In regards to the 'missing sounds' if you let me know which ones are missing sounds like you did with the keyboard it'll make it easier for me to try find the existing code in OPL where the sound call(s) should go.
I still dont have access to a ps2 which is a bit frustrating to test things quickly, if you dont get a chance to test its totally fine
Gah, yea the problem is calling audsrv_adpcm_init() or any other (audsrv) rpc functions after the inital boot up...perhaps i need to call SifInitRpc() again before the rpc func call.
Thanks, I think? diaExecuteDialog() handles these sub menus..I'll test some calls in there.
Thanks a lot for testing that for me
int sfxPrep(void)
{
char path[256];
char *snd_path = path;
char device_path[128];
int ret, i, loaded;
audsrv_adpcm_init();
audsrv_set_volume(MAX_VOLUME);
sfxInitDefaults();
setAudioDevice(device_path);
loaded = 0;
for (i = 0; i < NUM_SFX_FILES; i++)
{
if ((gAudioPath > 0)) //still not sure these few lines are the best way to handle this, it does appear to work though
{
sprintf(snd_path, "%s/%s", device_path, sfx_files[i].name);
}
else
{
snd_path = (char *)sfx_files[i].buffer;
}
ret = sfxRead(snd_path, &sfx_files[i]);
if (ret != 0)
{
printf("sfx: %s could not be loaded. Using default sound %d.\n", snd_path, ret);
}
ret = sfxLoad(&sfx_files[i], &sfx[i]);
if (ret == 0)
{
loaded++;
}
else
{
printf("sfx: failed to load %s, error %d\n", snd_path, ret);
}
}
return loaded;
}
int sfxInit(void)
{
int ret;
ret = audsrv_init();
if (ret != 0)
{
printf("sfx: failed to initialize audsrv\n");
printf("audsrv returned error string: %s\n", audsrv_get_error_string());
return -1;
}
sfxPrep();
return ret;
}void guiShowAudioConfig(void)
{
const char *AudioPaths[] = {"<not set>", "MC 1", "MC 2", "HDD", "USB", NULL};
diaSetEnum(diaAudioConfig, CFG_AUDIOPATH, AudioPaths);
diaSetInt(diaAudioConfig, CFG_SFX, gEnableSFX);
diaSetInt(diaAudioConfig, CFG_AUDIOPATH, gAudioPath);
int ret = diaExecuteDialog(diaAudioConfig, -1, 1, &guiUpdater);
if (ret) {
diaGetInt(diaAudioConfig, CFG_SFX, &gEnableSFX);
diaGetInt(diaAudioConfig, CFG_AUDIOPATH, &gAudioPath);
applyConfig(-1, -1);
sfxPrep();
}
}if (gAudioPath > 0)
{
sprintf(snd_path, "%s/%s", device_path, sfx_files[i].name);
ret = sfxRead(snd_path, &sfx_files[i]);
if (ret != 0)
{
printf("sfx: %s could not be loaded. Using default sound %d.\n", snd_path, ret);
}
}Ah that makes sense and i was even doing this previously back on page 1 when I was only using compiled in sounds, for some reason when the code got more complex I couldn't see the answer.. Intimidated I guess heh. Thank you.
It just seems that way due to previous tests, I can change the call in audio settings to just be audsrv_adpcm_init() to try narrow it down further to that function alone but unfortunately I don't have a TOOL and my previous attempts to use ps2link with a debug enabled version of OPL just resulted in black screens.
