mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-10-01 01:06:35 -04:00
Adapt to Qt Android #1
This commit is contained in:
parent
5ecf7ea00c
commit
f1371026ba
@ -25,7 +25,7 @@ public:
|
|||||||
|
|
||||||
// setup the basic parameters and coefficients
|
// setup the basic parameters and coefficients
|
||||||
void setCoefficients(
|
void setCoefficients(
|
||||||
int N, // the algorithm "block" size
|
int zN, // the algorithm "block" size
|
||||||
int SampleRate); // input signal sample rate
|
int SampleRate); // input signal sample rate
|
||||||
|
|
||||||
// set the detection threshold
|
// set the detection threshold
|
||||||
|
33
include/util/gleshelp.h
Normal file
33
include/util/gleshelp.h
Normal 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_ */
|
@ -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_nbAvg = nbAvg;
|
||||||
m_sampleRate = _samplerate;
|
m_sampleRate = _samplerate;
|
||||||
m_samplesAttack = _samplesAttack;
|
m_samplesAttack = _samplesAttack;
|
||||||
|
@ -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;
|
sampleRate = _samplerate;
|
||||||
|
|
||||||
// for each of the frequencies (tones) of interest calculate
|
// for each of the frequencies (tones) of interest calculate
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#include "util/gleshelp.h"
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#include "gui/glscope.h"
|
#include "gui/glscope.h"
|
||||||
|
@ -18,6 +18,8 @@
|
|||||||
#ifdef USE_SIMD
|
#ifdef USE_SIMD
|
||||||
#include <immintrin.h>
|
#include <immintrin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "util/gleshelp.h"
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#include "gui/glspectrum.h"
|
#include "gui/glspectrum.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user