Now working on gcc4.8, x86-64 on windows

Had to make my own portaudio and rtl-sdr binaries. The available
packages weren't compatible somehow.  Also wxWidgets wxPack doesn't
include OpenGL support but it's easy enough to compile.
This commit is contained in:
Charles J. Cliffe
2014-11-21 00:49:41 -05:00
parent f6f4c3c057
commit 99aa87df63
45 changed files with 1710 additions and 3201 deletions
+2 -2
View File
@@ -94,7 +94,7 @@ wxThread::ExitCode AudioThread::Entry() {
}
int preferred_device = -1;
/*
#ifdef WIN32
wchar_t dev_str[255];
memset(dev_str, 0, sizeof(wchar_t) * 255);
@@ -118,7 +118,7 @@ wxThread::ExitCode AudioThread::Entry() {
}
}
#endif
*/
outputParameters.device = (preferred_device != -1) ? preferred_device : Pa_GetDefaultOutputDevice();
if (outputParameters.device == paNoDevice) {
std::cout << "Error: No default output device.\n";
+1 -4
View File
@@ -12,10 +12,7 @@
#include "AudioThreadQueue.h"
#include "portaudio.h"
#ifdef WIN32
#include "pa_stream.h"
#include "pa_debugprint.h"
#endif
static int audioCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo,
PaStreamCallbackFlags statusFlags, void *userData);
+5 -5
View File
@@ -76,10 +76,10 @@ void ScopeCanvas::OnKeyDown(wxKeyEvent& event) {
}
void ScopeCanvas::OnIdle(wxIdleEvent &event) {
timer.update();
frameTimer += timer.lastUpdateSeconds();
if (frameTimer > 1.0/30.0) {
// timer.update();
// frameTimer += timer.lastUpdateSeconds();
// if (frameTimer > 1.0/30.0) {
Refresh(false);
frameTimer = 0;
}
// frameTimer = 0;
// }
}
+5 -5
View File
@@ -153,10 +153,10 @@ void SpectrumCanvas::setData(std::vector<signed char> *data) {
}
void SpectrumCanvas::OnIdle(wxIdleEvent &event) {
timer.update();
frameTimer += timer.lastUpdateSeconds();
if (frameTimer > 1.0/30.0) {
// timer.update();
// frameTimer += timer.lastUpdateSeconds();
// if (frameTimer > 1.0/30.0) {
Refresh(false);
frameTimer = 0;
}
// frameTimer = 0;
// }
}
+5 -5
View File
@@ -151,10 +151,10 @@ void WaterfallCanvas::setData(std::vector<signed char> *data) {
}
void WaterfallCanvas::OnIdle(wxIdleEvent &event) {
timer.update();
frameTimer += timer.lastUpdateSeconds();
if (frameTimer > 1.0/30.0) {
// timer.update();
// frameTimer += timer.lastUpdateSeconds();
// if (frameTimer > 1.0/30.0) {
Refresh(false);
frameTimer = 0;
}
// frameTimer = 0;
// }
}