Indent fixes.

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@745 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2004-08-09 13:03:32 +00:00
parent c4a834b9c6
commit 4acb0f3f31

View File

@ -62,7 +62,7 @@ wave_out_open(void)
fprintf(stderr, "wave_out_open: begin\n");
#endif
if ( alGetParamInfo(AL_DEFAULT_OUTPUT, AL_GAIN, &pinfo) < 0 )
if (alGetParamInfo(AL_DEFAULT_OUTPUT, AL_GAIN, &pinfo) < 0)
{
fprintf(stderr, "wave_out_open: alGetParamInfo failed: %s\n",
alGetErrorString(oserror()));
@ -78,14 +78,16 @@ wave_out_open(void)
queue_lo = queue_hi = 0;
audioconfig = alNewConfig();
if (audioconfig < 0) {
if (audioconfig < 0)
{
fprintf(stderr, "wave_out_open: alNewConfig failed: %s\n",
alGetErrorString(oserror()));
return False;
}
output_port = alOpenPort("rdpsnd", "w", 0);
if (output_port == (ALport) 0) {
if (output_port == (ALport) 0)
{
fprintf(stderr, "wave_out_open: alOpenPort failed: %s\n",
alGetErrorString(oserror()));
return False;
@ -151,7 +153,8 @@ wave_out_set_format(WAVEFORMATEX * pwfx)
if (pwfx->wBitsPerSample == 8)
width = AL_SAMPLE_8;
else if (pwfx->wBitsPerSample == 16) {
else if (pwfx->wBitsPerSample == 16)
{
width = AL_SAMPLE_16;
/* Do we need to swap the 16bit values? (Are we BigEndian) */
#if (defined(IRIX_DEBUG))
@ -171,7 +174,8 @@ wave_out_set_format(WAVEFORMATEX * pwfx)
output_port = alOpenPort("rdpsnd", "w", audioconfig);
if (output_port == (ALport) 0) {
if (output_port == (ALport) 0)
{
fprintf(stderr, "wave_out_set_format: alOpenPort failed: %s\n",
alGetErrorString(oserror()));
return False;
@ -198,7 +202,7 @@ wave_out_set_format(WAVEFORMATEX * pwfx)
alGetErrorString(oserror()));
return False;
}
if( params.sizeOut < 0 )
if (params.sizeOut < 0)
{
fprintf(stderr, "wave_set_format: invalid rate %d\n", g_snd_rate);
return False;
@ -231,9 +235,10 @@ wave_out_volume(uint16 left, uint16 right)
pv[0].param = AL_GAIN;
pv[0].value.ptr = gain;
pv[0].sizeIn = 8;
if( alSetParams(AL_DEFAULT_OUTPUT, pv, 1) < 0)
if (alSetParams(AL_DEFAULT_OUTPUT, pv, 1) < 0)
{
fprintf(stderr, "wave_out_volume: alSetParams failed: %s\n", alGetErrorString(oserror()));
fprintf(stderr, "wave_out_volume: alSetParams failed: %s\n",
alGetErrorString(oserror()));
return;
}
@ -317,14 +322,15 @@ wave_out_play(void)
len = out->end - out->p;
gf = alGetFillable(output_port);
if (len > gf) {
if (len > gf)
{
//len = gf * combinedFrameSize;
#if (defined(IRIX_DEBUG))
//fprintf(stderr,"Fillable...\n");
#endif
}
alWriteFrames(output_port, out->p, len/combinedFrameSize);
alWriteFrames(output_port, out->p, len / combinedFrameSize);
out->p += len;
if (out->p == out->end)
@ -334,8 +340,7 @@ wave_out_play(void)
gettimeofday(&tv, NULL);
duration = (out->size * (1000000 / (g_samplewidth * g_snd_rate)));
elapsed = (tv.tv_sec - startedat_s) * 1000000
+ (tv.tv_usec - startedat_us);
elapsed = (tv.tv_sec - startedat_s) * 1000000 + (tv.tv_usec - startedat_us);
/* 7/10 is not good for IRIX audio port, 4x/100 is suitable */
if (elapsed >= (duration * 485) / 1000)
{