comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-25 13:03:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122 from cjcliffe/ui_visuals_to_panels

Browse Source 
MSVC and TDMGCC fixes
This commit is contained in:
Charles J. Cliffe
2015-07-31 18:35:29 -04:00
parent 5033d6f5d8 3fbb1def49
commit b2d4cf8f9c
15 changed files with 219 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/PrimaryGLContext.cpp
+4 -4
View File
@@ -59,7 +59,7 @@ PrimaryGLContext::PrimaryGLContext(wxGLCanvas *canvas, wxGLContext *sharedContex
//#endif
}
void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGB color, long long center_freq, long long srate) {
void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGB3f color, long long center_freq, long long srate) {
if (!demod) {
return;
}
@@ -140,7 +140,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGB color, long
}
void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGB color, long long center_freq, long long srate) {
void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGB3f color, long long center_freq, long long srate) {
if (!demod) {
return;
}
@@ -290,7 +290,7 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGB color, long lon
}
void PrimaryGLContext::DrawFreqSelector(float uxPos, RGB color, float w, long long center_freq, long long srate) {
void PrimaryGLContext::DrawFreqSelector(float uxPos, RGB3f color, float w, long long center_freq, long long srate) {
DemodulatorInstance *demod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
long long bw = 0;
@@ -341,7 +341,7 @@ void PrimaryGLContext::DrawFreqSelector(float uxPos, RGB color, float w, long lo
}
void PrimaryGLContext::DrawRangeSelector(float uxPos1, float uxPos2, RGB color) {
void PrimaryGLContext::DrawRangeSelector(float uxPos1, float uxPos2, RGB3f color) {
if (uxPos2 < uxPos1) {
float temp = uxPos2;
uxPos2=uxPos1;