comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-23 12:18:37 -05:00
Code Issues Projects Releases Wiki Activity

Linux re-tweak

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-08-13 20:39:31 -04:00
parent b1f20de0e9
commit e04b12662f
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/AppFrame.cpp
View File

@ -118,6 +118,7 @@ AppFrame::AppFrame() :
wxGetApp().getSpectrumProcesor()->attachOutput(spectrumCanvas->getVisualDataQueue()); wxGetApp().getSpectrumProcesor()->attachOutput(spectrumCanvas->getVisualDataQueue());
spectrumAvgMeter = new MeterCanvas(this, attribList); spectrumAvgMeter = new MeterCanvas(this, attribList);
spectrumAvgMeter->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
spectrumAvgMeter->setMax(1.0); spectrumAvgMeter->setMax(1.0);
spectrumAvgMeter->setLevel(0.65); spectrumAvgMeter->setLevel(0.65);
spectrumAvgMeter->setShowUserInput(false); spectrumAvgMeter->setShowUserInput(false);
@ -143,6 +144,7 @@ AppFrame::AppFrame() :
wxGetApp().getWaterfallProcesor()->attachOutput(waterfallCanvas->getVisualDataQueue()); wxGetApp().getWaterfallProcesor()->attachOutput(waterfallCanvas->getVisualDataQueue());
waterfallSpeedMeter = new MeterCanvas(this, attribList); waterfallSpeedMeter = new MeterCanvas(this, attribList);
waterfallSpeedMeter->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
waterfallSpeedMeter->setMax(sqrt(1024)); waterfallSpeedMeter->setMax(sqrt(1024));
waterfallSpeedMeter->setLevel(sqrt(DEFAULT_WATERFALL_LPS)); waterfallSpeedMeter->setLevel(sqrt(DEFAULT_WATERFALL_LPS));
waterfallSpeedMeter->setShowUserInput(false); waterfallSpeedMeter->setShowUserInput(false);
@ -263,7 +265,7 @@ AppFrame::AppFrame() :
// sampleRateMenuItems[wxID_BANDWIDTH_3000M] = menu->AppendRadioItem(wxID_BANDWIDTH_3000M, "3.0M"); // sampleRateMenuItems[wxID_BANDWIDTH_3000M] = menu->AppendRadioItem(wxID_BANDWIDTH_3000M, "3.0M");
sampleRateMenuItems[wxID_BANDWIDTH_3200M] = menu->AppendRadioItem(wxID_BANDWIDTH_3200M, "3.2M"); sampleRateMenuItems[wxID_BANDWIDTH_3200M] = menu->AppendRadioItem(wxID_BANDWIDTH_3200M, "3.2M");
sampleRateMenuItems[wxID_BANDWIDTH_2048M]->Check(true); sampleRateMenuItems[wxID_BANDWIDTH_2400M]->Check(true);
menuBar->Append(menu, wxT("&Input Bandwidth")); menuBar->Append(menu, wxT("&Input Bandwidth"));
@ -719,6 +721,8 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
float val = spectrumAvgMeter->getInputValue(); float val = spectrumAvgMeter->getInputValue();
spectrumAvgMeter->setLevel(val); spectrumAvgMeter->setLevel(val);
proc->setFFTAverageRate(val); proc->setFFTAverageRate(val);
GetStatusBar()->SetStatusText(wxString::Format(wxT("Spectrum averaging speed changed to %0.2f%%."),val*100.0));
} }
proc->setView(spectrumCanvas->getViewState()); proc->setView(spectrumCanvas->getViewState());
@ -750,6 +754,8 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
waterfallSpeedMeter->setLevel(val); waterfallSpeedMeter->setLevel(val);
fftDistrib.setLinesPerSecond((int)ceil(val*val)); fftDistrib.setLinesPerSecond((int)ceil(val*val));
wxGetApp().getWaterfallVisualQueue()->set_max_num_items((int)ceil(val*val)); wxGetApp().getWaterfallVisualQueue()->set_max_num_items((int)ceil(val*val));
GetStatusBar()->SetStatusText(wxString::Format(wxT("Waterfall max speed changed to %d lines per second."),(int)ceil(val*val)));
} }
fftDistrib.run(); fftDistrib.run();
@ -769,12 +775,13 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
if (this->IsVisible()) { if (this->IsVisible()) {
waterfallCanvas->DoPaint(); waterfallCanvas->DoPaint();
demodWaterfallCanvas->DoPaint(); demodWaterfallCanvas->DoPaint();
} } else {
#ifndef _WIN32 #ifndef _WIN32
else {
usleep(15000); usleep(15000);
} #else
Sleep(15);
#endif #endif
}
event.RequestMore(); event.RequestMore();
} }

4
src/CubicSDRDefs.h
View File

@ -27,10 +27,10 @@ const char filePathSeparator =
#define BUF_SIZE (16384*6) #define BUF_SIZE (16384*6)
#define DEFAULT_SAMPLE_RATE 2048000 #define DEFAULT_SAMPLE_RATE 2400000
#define DEFAULT_FFT_SIZE 2048 #define DEFAULT_FFT_SIZE 2048
#define DEFAULT_DEMOD_TYPE 1 #define DEFAULT_DEMOD_TYPE 1
#define DEFAULT_DEMOD_BW 200000 #define DEFAULT_DEMOD_BW 200000
#define DEFAULT_WATERFALL_LPS 30 #define DEFAULT_WATERFALL_LPS 30

3
src/process/ScopeVisualProcessor.cpp
View File

@ -17,6 +17,7 @@ void ScopeVisualProcessor::process() {
return; return;
} }
audioInputData->busy_update.lock();
ScopeRenderData *renderData = outputBuffers.getBuffer(); ScopeRenderData *renderData = outputBuffers.getBuffer();
renderData->channels = audioInputData->channels; renderData->channels = audioInputData->channels;
@ -44,6 +45,8 @@ void ScopeVisualProcessor::process() {
renderData->waveform_points[i * 2 + 1] = audioInputData->data[i] / peak; renderData->waveform_points[i * 2 + 1] = audioInputData->data[i] / peak;
} }
} }
distribute(renderData); distribute(renderData);
audioInputData->busy_update.unlock();
} }
} }

4
src/util/GLExt.cpp
View File

@ -36,7 +36,11 @@ void initGLExtensions() {
std::cout << std::endl << "Supported GL Extensions: " << std::endl << extensions << std::endl << std::endl; std::cout << std::endl << "Supported GL Extensions: " << std::endl << extensions << std::endl << std::endl;
#ifdef __linux__
const GLint interval = 2;
#else
const GLint interval = 1; const GLint interval = 1;
#endif
#ifdef _WIN32 #ifdef _WIN32
if (GLExtSupported("WGL_EXT_swap_control")) { if (GLExtSupported("WGL_EXT_swap_control")) {