comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 13:48:38 -05:00
Code Issues Projects Releases Wiki Activity

PortAudio adjustments for OSX

Browse Source 
Seems to be some sort of audio init race condition, intermittent crash
on startup
This commit is contained in:
Charles J. Cliffe 2014-11-09 05:18:33 -05:00
parent b70b659a5f
commit 14d7e431bd
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -77,8 +77,7 @@ else (DEFINED WIN32)
set(FFTW_LIB fftw3) set(FFTW_LIB fftw3)
find_package (OpenAL) SET (PORTAUDIO_LIBRARY portaudio)
include_directories ( ${OPENAL_INCLUDE_DIR} )
endif (DEFINED WIN32) endif (DEFINED WIN32)

10
src/PrimaryGLContext.cpp
View File

@ -15,7 +15,9 @@
#include "AppFrame.h" #include "AppFrame.h"
#include <algorithm> #include <algorithm>
#ifdef WIN32
#include "pa_debugprint.h" #include "pa_debugprint.h"
#endif
wxString glGetwxString(GLenum name) { wxString glGetwxString(GLenum name) {
const GLubyte *v = glGetString(name); const GLubyte *v = glGetString(name);
@ -109,10 +111,14 @@ static int patestCallback(const void *inputBuffer, void *outputBuffer, unsigned
TestGLCanvas *src = (TestGLCanvas *) userData; TestGLCanvas *src = (TestGLCanvas *) userData;
float *out = (float*) outputBuffer;
if (!src->audio_queue.size()) { if (!src->audio_queue.size()) {
for (int i = 0; i < framesPerBuffer * 2; i++) {
out[i] = 0;
}
return paContinue; return paContinue;
} }
float *out = (float*) outputBuffer;
std::vector<float> *nextBuffer = src->audio_queue.front(); std::vector<float> *nextBuffer = src->audio_queue.front();
@ -161,7 +167,7 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent, int *attribList) :
std::cout << "Error starting :(\n"; std::cout << "Error starting :(\n";
} }
outputParameters.device = 5; /* default output device */ outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
if (outputParameters.device == paNoDevice) { if (outputParameters.device == paNoDevice) {
std::cout << "Error: No default output device.\n"; std::cout << "Error: No default output device.\n";
} }

2
src/PrimaryGLContext.h
View File

@ -12,7 +12,9 @@
#include "liquid/liquid.h" #include "liquid/liquid.h"
#include "portaudio.h" #include "portaudio.h"
#ifdef WIN32
#include "pa_stream.h" #include "pa_stream.h"
#endif
class PrimaryGLContext: public wxGLContext { class PrimaryGLContext: public wxGLContext {
public: public: