jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chansrv: sound_send_wave_data changes

Browse Source
This commit is contained in:
Jay Sorg 2014-08-06 12:10:27 -07:00
parent 46c4a1fe4e
commit 2e17b70fcd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sesman/chansrv/sound.c
View File

@ -382,7 +382,7 @@ sound_send_wave_data_chunk(char *data, int data_bytes)
if (g_sent_flag[(g_cBlockNo + 1) & 0xff] & 1) if (g_sent_flag[(g_cBlockNo + 1) & 0xff] & 1)
{ {
LOG(10, ("sound_send_wave_data_chunk: no room")); LOG(10, ("sound_send_wave_data_chunk: no room"));
return 1; return 2;
} }
else else
{ {
@ -442,6 +442,7 @@ sound_send_wave_data(char *data, int data_bytes)
int chunk_bytes; int chunk_bytes;
int data_index; int data_index;
int error; int error;
int res;
LOG(10, ("sound_send_wave_data: sending %d bytes", data_bytes)); LOG(10, ("sound_send_wave_data: sending %d bytes", data_bytes));
data_index = 0; data_index = 0;
@ -460,13 +461,20 @@ sound_send_wave_data(char *data, int data_bytes)
g_buf_index += chunk_bytes; g_buf_index += chunk_bytes;
if (g_buf_index >= BBUF_SIZE) if (g_buf_index >= BBUF_SIZE)
{ {
if (sound_send_wave_data_chunk(g_buffer, BBUF_SIZE) != 0) g_buf_index = 0;
res = sound_send_wave_data_chunk(g_buffer, BBUF_SIZE);
if (res == 2)
{
/* don't need to error on this */
LOG(0, ("sound_send_wave_data: dropped, no room"));
break;
}
else if (res != 0)
{ {
LOG(10, ("sound_send_wave_data: error")); LOG(10, ("sound_send_wave_data: error"));
error = 1; error = 1;
break; break;
} }
g_buf_index = 0;
} }
data_bytes -= chunk_bytes; data_bytes -= chunk_bytes;
data_index += chunk_bytes; data_index += chunk_bytes;