diff --git a/audio.c b/audio.c index 84aa854..823aaf9 100644 --- a/audio.c +++ b/audio.c @@ -692,7 +692,6 @@ static int set_oss_params (int a, int fd, struct audio_s *pa) char message[100]; int ossbuf_size_in_bytes; - err = ioctl (fd, SNDCTL_DSP_CHANNELS, &(pa->adev[a].num_channels)); if (err == -1) { text_color_set(DW_COLOR_ERROR); @@ -1249,6 +1248,7 @@ int audio_flush (int a) } if (k < len) { /* presumably full but didn't block. */ + dw_printf("problem\n"); usleep (10000); } ptr += k; diff --git a/audio_ptt_win.c b/audio_ptt_win.c index 8fcdc33..7ccdd37 100644 --- a/audio_ptt_win.c +++ b/audio_ptt_win.c @@ -93,7 +93,7 @@ unsigned __stdcall ptt_thread (void *arg) * 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) { WAVEHDR waveHeader; short* pnData; @@ -103,7 +103,7 @@ unsigned __stdcall ptt_thread (void *arg) int j; 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.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; waveHeader.dwLoops = 0xFFFF; @@ -140,31 +140,31 @@ unsigned __stdcall ptt_thread (void *arg) // ptt_set on // - waveOutWrite ( hWaveOut, &waveHeader, sizeof( WAVEHDR ) ); + waveOutWrite (hWaveOut, &waveHeader, sizeof( WAVEHDR )); } else if (dwWait == WAIT_OBJECT_0 + 1) { // // ptt_set off // - waveOutReset ( hWaveOut ); + waveOutReset (hWaveOut); } - else if (dwWait == WAIT_OBJECT_0 + 2) { + else if( dwWait == WAIT_OBJECT_0 + 2 ) { // // close // waveOutReset (hWaveOut); - waveOutUnprepareHeader (hWaveOut, &waveHeader, sizeof(WAVEHDR)); + waveOutUnprepareHeader (hWaveOut, &waveHeader, sizeof( WAVEHDR )); break; } } } - waveOutClose ( hWaveOut ); + waveOutClose (hWaveOut); - free( waveHeader.lpData ); + free (waveHeader.lpData); } }