PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatiing changes

This commit is contained in:
Andrew 2017-01-17 14:21:23 -08:00
parent 7685502c9b
commit c58720a89f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio.c
View File

@ -692,7 +692,6 @@ static int set_oss_params (int a, int fd, struct audio_s *pa)
char message[100]; char message[100];
int ossbuf_size_in_bytes; int ossbuf_size_in_bytes;
err = ioctl (fd, SNDCTL_DSP_CHANNELS, &(pa->adev[a].num_channels)); err = ioctl (fd, SNDCTL_DSP_CHANNELS, &(pa->adev[a].num_channels));
if (err == -1) { if (err == -1) {
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
@ -1249,6 +1248,7 @@ int audio_flush (int a)
} }
if (k < len) { if (k < len) {
/* presumably full but didn't block. */ /* presumably full but didn't block. */
dw_printf("problem\n");
usleep (10000); usleep (10000);
} }
ptr += k; ptr += k;

16
audio_ptt_win.c
View File

@ -93,7 +93,7 @@ unsigned __stdcall ptt_thread (void *arg)
* Soundcard is only possibility at this time. * Soundcard is only possibility at this time.
*/ */
err = waveOutOpen ( &hWaveOut, atoi( save_audio_config_p->adev[a].adevice_out ), &wf, (DWORD_PTR)NULL, 0, CALLBACK_NULL ); err = waveOutOpen (&hWaveOut, atoi( save_audio_config_p->adev[a].adevice_out ), &wf, (DWORD_PTR)NULL, 0, CALLBACK_NULL);
if (err == MMSYSERR_NOERROR) { if (err == MMSYSERR_NOERROR) {
WAVEHDR waveHeader; WAVEHDR waveHeader;
short* pnData; short* pnData;
@ -103,7 +103,7 @@ unsigned __stdcall ptt_thread (void *arg)
int j; int j;
waveHeader.dwBufferLength = save_audio_config_p->adev[a].num_channels * nSamples * sizeof( short ); waveHeader.dwBufferLength = save_audio_config_p->adev[a].num_channels * nSamples * sizeof( short );
waveHeader.lpData = malloc( waveHeader.dwBufferLength ); waveHeader.lpData = malloc (waveHeader.dwBufferLength);
waveHeader.dwUser = 0; waveHeader.dwUser = 0;
waveHeader.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; waveHeader.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP;
waveHeader.dwLoops = 0xFFFF; waveHeader.dwLoops = 0xFFFF;
@ -140,31 +140,31 @@ unsigned __stdcall ptt_thread (void *arg)
// ptt_set on // ptt_set on
// //
waveOutWrite ( hWaveOut, &waveHeader, sizeof( WAVEHDR ) ); waveOutWrite (hWaveOut, &waveHeader, sizeof( WAVEHDR ));
} }
else if (dwWait == WAIT_OBJECT_0 + 1) { else if (dwWait == WAIT_OBJECT_0 + 1) {
// //
// ptt_set off // ptt_set off
// //
waveOutReset ( hWaveOut ); waveOutReset (hWaveOut);
} }
else if (dwWait == WAIT_OBJECT_0 + 2) { else if( dwWait == WAIT_OBJECT_0 + 2 ) {
// //
// close // close
// //
waveOutReset (hWaveOut); waveOutReset (hWaveOut);
waveOutUnprepareHeader (hWaveOut, &waveHeader, sizeof(WAVEHDR)); waveOutUnprepareHeader (hWaveOut, &waveHeader, sizeof( WAVEHDR ));
break; break;
} }
} }
} }
waveOutClose ( hWaveOut ); waveOutClose (hWaveOut);
free( waveHeader.lpData ); free (waveHeader.lpData);
} }
} }