Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-15 20:56:42 +02:00
Code Issues Projects Releases Wiki Activity

Began conversion of audio code to new ToxAV API

Browse Source
This commit is contained in:
cnhenry
2015-06-12 10:50:26 -05:00
parent 6e90072fb8
commit 3241551cfb
17 changed files with 3805 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio_device.c
View File

@@ -57,7 +57,7 @@ typedef struct Device {
ALCcontext *ctx; /* Device context */
DataHandleCallback cb; /* Use this to handle data from input device usually */
void* cb_data; /* Data to be passed to callback */
int32_t call_idx; /* ToxAv call index */
int32_t friend_number; /* ToxAV friend number */
uint32_t source, buffers[OPENAL_BUFS]; /* Playback source/buffers */
uint32_t ref_count;
@@ -80,7 +80,7 @@ Device *running[2][MAX_DEVICES] = {{NULL}}; /* Running devices */
uint32_t primary_device[2]; /* Primary device */
#ifdef AUDIO
static ToxAv* av = NULL;
static ToxAV* av = NULL;
#endif /* AUDIO */
/* q_mutex */
@@ -95,7 +95,7 @@ bool thread_running = true,
void* thread_poll(void*);
/* Meet devices */
#ifdef AUDIO
DeviceError init_devices(ToxAv* av_)
DeviceError init_devices(ToxAV* av_)
#else
DeviceError init_devices()
#endif /* AUDIO */
@@ -339,7 +339,7 @@ DeviceError close_device(DeviceType type, uint32_t device_idx)
return rc;
}
DeviceError register_device_callback( int32_t call_idx, uint32_t device_idx, DataHandleCallback callback, void* data, bool enable_VAD)
DeviceError register_device_callback( int32_t friend_number, uint32_t device_idx, DataHandleCallback callback, void* data, bool enable_VAD)
{
if (size[input] <= device_idx || !running[input][device_idx] || running[input][device_idx]->dhndl == NULL)
return de_InvalidSelection;
@@ -348,7 +348,7 @@ DeviceError register_device_callback( int32_t call_idx, uint32_t device_idx, Dat
running[input][device_idx]->cb = callback;
running[input][device_idx]->cb_data = data;
running[input][device_idx]->enable_VAD = enable_VAD;
running[input][device_idx]->call_idx = call_idx;
running[input][device_idx]->friend_number = friend_number;
unlock;
return de_None;