Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 15:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Move init and exit in right place

Browse Source
This commit is contained in:
Ansa89 2014-07-22 12:30:35 +02:00
parent 1e0e93e5c6
commit 196af10d01
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/notify.c
View File

@ -191,6 +191,7 @@ int play_source(uint32_t source, uint32_t buffer, _Bool looping)
int init_notify(int login_cooldown) int init_notify(int login_cooldown)
{ {
#ifdef _SOUND_NOTIFY #ifdef _SOUND_NOTIFY
alutInitWithoutContext(NULL, NULL);
if (open_primary_device(output, &Control.device_idx, 48000, 20) != de_None) if (open_primary_device(output, &Control.device_idx, 48000, 20) != de_None)
return -1; return -1;
@ -226,6 +227,7 @@ void terminate_notify()
graceful_clear(); graceful_clear();
close_device(output, Control.device_idx); close_device(output, Control.device_idx);
alutExit();
#endif /* _SOUND_NOTIFY */ #endif /* _SOUND_NOTIFY */
} }
@ -241,22 +243,11 @@ void set_sound(Notification sound, const char* value)
int play_sound_internal(Notification what, _Bool loop) int play_sound_internal(Notification what, _Bool loop)
{ {
/*char* data;
int format;
int clockrate;
int buffer_size;
char loop_;*/
uint32_t source; uint32_t source;
uint32_t buffer; uint32_t buffer;
//alutLoadWAVFile((signed char*)Control.sounds[what], &format, (void**)&data, &buffer_size, &clockrate, &loop_);
alGenSources(1, &source); alGenSources(1, &source);
alGenBuffers(1, &buffer); alGenBuffers(1, &buffer);
/*alBufferData(buffer, format, data, buffer_size, clockrate);
alSourcei(source, AL_BUFFER, buffer);
alSourcei(source, AL_LOOPING, loop);
alutUnloadWAV(format, data, buffer_size, clockrate);*/
alutInitWithoutContext(NULL, NULL);
buffer = alutCreateBufferFromFile((const char*)Control.sounds[what]); buffer = alutCreateBufferFromFile((const char*)Control.sounds[what]);
alSourcei(source, AL_BUFFER, buffer); alSourcei(source, AL_BUFFER, buffer);
alSourcei(source, AL_LOOPING, loop); alSourcei(source, AL_LOOPING, loop);
@ -266,7 +257,6 @@ int play_sound_internal(Notification what, _Bool loop)
alSourceStop(source); alSourceStop(source);
alDeleteSources(1, &source); alDeleteSources(1, &source);
alDeleteBuffers(1,&buffer); alDeleteBuffers(1,&buffer);
alutExit();
return -1; return -1;
} }