remove g++ errors and warnings
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1381 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
7ba4e45164
commit
4b80c655db
8
rdpsnd.c
8
rdpsnd.c
@ -64,7 +64,7 @@ unsigned int queue_hi, queue_lo, queue_pending;
|
||||
struct audio_packet packet_queue[MAX_QUEUE];
|
||||
|
||||
static char record_buffer[8192];
|
||||
static int record_buffer_size;
|
||||
static uint32 record_buffer_size;
|
||||
|
||||
static uint8 packet_opcode;
|
||||
static struct stream packet;
|
||||
@ -153,7 +153,7 @@ rdpsnd_flush_record(void)
|
||||
void
|
||||
rdpsnd_record(const void *data, unsigned int size)
|
||||
{
|
||||
int remain;
|
||||
uint32 remain;
|
||||
|
||||
assert(rec_device_open);
|
||||
|
||||
@ -610,7 +610,7 @@ rdpsnddbg_process(STREAM s)
|
||||
|
||||
pkglen = s->end - s->p;
|
||||
/* str_handle_lines requires null terminated strings */
|
||||
buf = xmalloc(pkglen + 1);
|
||||
buf = (char *) xmalloc(pkglen + 1);
|
||||
STRNCPY(buf, (char *) s->p, pkglen + 1);
|
||||
|
||||
str_handle_lines(buf, &rest, rdpsnddbg_line_handler, NULL);
|
||||
@ -662,7 +662,7 @@ rdpsnd_init(char *optarg)
|
||||
|
||||
drivers = NULL;
|
||||
|
||||
packet.data = xmalloc(65536);
|
||||
packet.data = (uint8 *) xmalloc(65536);
|
||||
packet.p = packet.end = packet.data;
|
||||
packet.size = 0;
|
||||
|
||||
|
@ -56,7 +56,7 @@ static RD_BOOL dsp_in;
|
||||
|
||||
static int stereo;
|
||||
static int format;
|
||||
static int snd_rate;
|
||||
static uint32 snd_rate;
|
||||
static short samplewidth;
|
||||
static char *dsp_dev;
|
||||
static RD_BOOL in_esddsp;
|
||||
@ -293,8 +293,8 @@ oss_set_format(RD_WAVEFORMATEX * pwfx)
|
||||
snd_rate = pwfx->nSamplesPerSec;
|
||||
if (ioctl(dsp_fd, SNDCTL_DSP_SPEED, &snd_rate) == -1)
|
||||
{
|
||||
int rates[] = { 44100, 48000, 0 };
|
||||
int *prates = rates;
|
||||
uint32 rates[] = { 44100, 48000, 0 };
|
||||
uint32 *prates = rates;
|
||||
|
||||
while (*prates != 0)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user