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

disable group audio callback until it works properly

Browse Source
This commit is contained in:
Jfreegman 2014-11-26 17:39:02 -05:00
parent 09bbec79cf
commit 78587ad20b
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/device.c
View File

@ -215,7 +215,7 @@ DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx
const uint32_t frame_size = (sample_rate * frame_duration / 1000); const uint32_t frame_size = (sample_rate * frame_duration / 1000);
uint32_t i; uint32_t i;
for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; i ++); for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; ++i);
if (i == MAX_DEVICES) { unlock; return de_AllDevicesBusy; } if (i == MAX_DEVICES) { unlock; return de_AllDevicesBusy; }
else *device_idx = i; else *device_idx = i;
@ -384,10 +384,10 @@ inline__ DeviceError write_out(uint32_t device_idx, const int16_t* data, uint32_
alBufferData(bufid, device->sound_mode, data, length * 2 * channels, device->sample_rate); alBufferData(bufid, device->sound_mode, data, length * 2 * channels, device->sample_rate);
alSourceQueueBuffers(device->source, 1, &bufid); alSourceQueueBuffers(device->source, 1, &bufid);
ALint state; ALint state;
alGetSourcei(device->source, AL_SOURCE_STATE, &state); alGetSourcei(device->source, AL_SOURCE_STATE, &state);
if(state != AL_PLAYING) alSourcePlay(device->source); if(state != AL_PLAYING) alSourcePlay(device->source);

5
src/groupchat.c
View File

@ -399,8 +399,7 @@ void *group_add_wait(void *data)
pthread_exit(NULL); pthread_exit(NULL);
} }
static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnum, int peernum, static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnum, int peernum, uint8_t change)
uint8_t change)
{ {
if (self->num != groupnum) if (self->num != groupnum)
return; return;
@ -716,6 +715,8 @@ static void groupchat_onInit(ToxWindow *self, Tox *m)
void groupchat_onWriteDevice(ToxWindow *self, Tox *m, int groupnum, int peernum, const int16_t *pcm, void groupchat_onWriteDevice(ToxWindow *self, Tox *m, int groupnum, int peernum, const int16_t *pcm,
unsigned int samples, uint8_t channels, unsigned int sample_rate) unsigned int samples, uint8_t channels, unsigned int sample_rate)
{ {
return; /* TODO: remove this */
if (groupnum != self->num) if (groupnum != self->num)
return; return;