VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapt to Qt Android #1

This commit is contained in:
f4exb 2016-02-28 10:53:37 +01:00
parent 5ecf7ea00c
commit f1371026ba
6 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dsp/ctcssdetector.h
View File

@ -25,7 +25,7 @@ public:
// setup the basic parameters and coefficients
void setCoefficients(
int N, // the algorithm "block" size
int zN, // the algorithm "block" size
int SampleRate); // input signal sample rate
// set the detection threshold

33
include/util/gleshelp.h Normal file
View File

@ -0,0 +1,33 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2015 Edouard Griffiths, F4EXB. //
// //
// This is a header file to help migrate to GL ES 2.0 //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_UTIL_GLESHELP_H_
#define INCLUDE_UTIL_GLESHELP_H_
#define GLdouble GLfloat
#define GL_CLAMP GL_CLAMP_TO_EDGE
#define glClearDepth glClearDepthf
#define glOrtho glOrthof
#define glFrustum glFrustumf
#define glColor4fv(a) glColor4f(a[0], a[1], a[2], a[3])
#define glColor3fv(a) glColor4f(a[0], a[1], a[2], 1.0f)
#define glColor3f(a,b,c) glColor4f(a, b, c, 1.0f
#endif /* INCLUDE_UTIL_GLESHELP_H_ */

4
sdrbase/dsp/afsquelch.cpp
View File

@ -82,9 +82,9 @@ AFSquelch::~AFSquelch()
}
void AFSquelch::setCoefficients(int _N, unsigned int nbAvg, int _samplerate, int _samplesAttack, int _samplesDecay )
void AFSquelch::setCoefficients(int N, unsigned int nbAvg, int _samplerate, int _samplesAttack, int _samplesDecay )
{
m_N = _N; // save the basic parameters for use during analysis
m_N = N; // save the basic parameters for use during analysis
m_nbAvg = nbAvg;
m_sampleRate = _samplerate;
m_samplesAttack = _samplesAttack;

4
sdrbase/dsp/ctcssdetector.cpp
View File

@ -92,9 +92,9 @@ CTCSSDetector::~CTCSSDetector()
}
void CTCSSDetector::setCoefficients(int _N, int _samplerate )
void CTCSSDetector::setCoefficients(int zN, int _samplerate )
{
N = _N; // save the basic parameters for use during analysis
N = zN; // save the basic parameters for use during analysis
sampleRate = _samplerate;
// for each of the frequencies (tones) of interest calculate

1
sdrbase/gui/glscope.cpp
View File

@ -1,3 +1,4 @@
#include "util/gleshelp.h"
#include <QPainter>
#include <QMouseEvent>
#include "gui/glscope.h"

2
sdrbase/gui/glspectrum.cpp
View File

@ -18,6 +18,8 @@
#ifdef USE_SIMD
#include <immintrin.h>
#endif
#include "util/gleshelp.h"
#include <QMouseEvent>
#include "gui/glspectrum.h"