1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-27 15:26:33 -04:00

Deep redesign: move to SDRangel #1

This commit is contained in:
f4exb 2015-08-30 01:26:51 +02:00
parent 60198c2d26
commit a6e4f598e2
43 changed files with 88 additions and 89 deletions

View File

@ -21,7 +21,7 @@
#include <QStringList>
#include "util/export.h"
class SDRANGELOVE_API AudioDeviceInfo {
class SDRANGEL_API AudioDeviceInfo {
public:
struct Device {
QString name;

View File

@ -23,7 +23,7 @@
#include <QWaitCondition>
#include "util/export.h"
class SDRANGELOVE_API AudioFifo : public QObject {
class SDRANGEL_API AudioFifo : public QObject {
Q_OBJECT
public:
AudioFifo();

View File

@ -29,7 +29,7 @@ class QAudioOutput;
class AudioFifo;
class AudioOutputPipe;
class SDRANGELOVE_API AudioOutput : QIODevice {
class SDRANGEL_API AudioOutput : QIODevice {
public:
AudioOutput();
virtual ~AudioOutput();

View File

@ -9,10 +9,10 @@
class MessageQueue;
class IntHalfbandFilter;
class SDRANGELOVE_API Channelizer : public SampleSink {
class SDRANGEL_API Channelizer : public SampleSink {
Q_OBJECT
public:
class SDRANGELOVE_API MsgChannelizerNotification : public Message {
class SDRANGEL_API MsgChannelizerNotification : public Message {
MESSAGE_CLASS_DECLARATION
public:

View File

@ -28,27 +28,27 @@ class SampleSink;
class ThreadedSampleSink;
class AudioFifo;
class SDRANGELOVE_API DSPPing : public Message {
class SDRANGEL_API DSPPing : public Message {
MESSAGE_CLASS_DECLARATION
};
class SDRANGELOVE_API DSPExit : public Message {
class SDRANGEL_API DSPExit : public Message {
MESSAGE_CLASS_DECLARATION
};
class SDRANGELOVE_API DSPAcquisitionInit : public Message {
class SDRANGEL_API DSPAcquisitionInit : public Message {
MESSAGE_CLASS_DECLARATION
};
class SDRANGELOVE_API DSPAcquisitionStart : public Message {
class SDRANGEL_API DSPAcquisitionStart : public Message {
MESSAGE_CLASS_DECLARATION
};
class SDRANGELOVE_API DSPAcquisitionStop : public Message {
class SDRANGEL_API DSPAcquisitionStop : public Message {
MESSAGE_CLASS_DECLARATION
};
class SDRANGELOVE_API DSPGetSourceDeviceDescription : public Message {
class SDRANGEL_API DSPGetSourceDeviceDescription : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -59,7 +59,7 @@ private:
QString m_deviceDescription;
};
class SDRANGELOVE_API DSPGetErrorMessage : public Message {
class SDRANGEL_API DSPGetErrorMessage : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -70,7 +70,7 @@ private:
QString m_errorMessage;
};
class SDRANGELOVE_API DSPSetSource : public Message {
class SDRANGEL_API DSPSetSource : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -82,7 +82,7 @@ private:
SampleSource* m_sampleSource;
};
class SDRANGELOVE_API DSPAddSink : public Message {
class SDRANGEL_API DSPAddSink : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -94,7 +94,7 @@ private:
SampleSink* m_sampleSink;
};
class SDRANGELOVE_API DSPRemoveSink : public Message {
class SDRANGEL_API DSPRemoveSink : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -106,7 +106,7 @@ private:
SampleSink* m_sampleSink;
};
class SDRANGELOVE_API DSPAddThreadedSampleSink : public Message {
class SDRANGEL_API DSPAddThreadedSampleSink : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -118,7 +118,7 @@ private:
ThreadedSampleSink* m_threadedSampleSink;
};
class SDRANGELOVE_API DSPRemoveThreadedSampleSink : public Message {
class SDRANGEL_API DSPRemoveThreadedSampleSink : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -130,7 +130,7 @@ private:
ThreadedSampleSink* m_threadedSampleSink;
};
class SDRANGELOVE_API DSPAddAudioSink : public Message {
class SDRANGEL_API DSPAddAudioSink : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -142,7 +142,7 @@ private:
AudioFifo* m_audioFifo;
};
class SDRANGELOVE_API DSPRemoveAudioSink : public Message {
class SDRANGEL_API DSPRemoveAudioSink : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -154,7 +154,7 @@ private:
AudioFifo* m_audioFifo;
};
class SDRANGELOVE_API DSPConfigureSpectrumVis : public Message {
class SDRANGEL_API DSPConfigureSpectrumVis : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -175,7 +175,7 @@ private:
FFTWindow::Function m_window;
};
class SDRANGELOVE_API DSPConfigureCorrection : public Message {
class SDRANGEL_API DSPConfigureCorrection : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -194,7 +194,7 @@ private:
};
class SDRANGELOVE_API DSPEngineReport : public Message {
class SDRANGEL_API DSPEngineReport : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -212,7 +212,7 @@ private:
quint64 m_centerFrequency;
};
class SDRANGELOVE_API DSPConfigureScopeVis : public Message {
class SDRANGEL_API DSPConfigureScopeVis : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -233,7 +233,7 @@ private:
Real m_triggerLevelLow;
};
class SDRANGELOVE_API DSPSignalNotification : public Message {
class SDRANGEL_API DSPSignalNotification : public Message {
MESSAGE_CLASS_DECLARATION
public:
@ -251,7 +251,7 @@ private:
qint64 m_centerFrequency;
};
class SDRANGELOVE_API DSPConfigureChannelizer : public Message {
class SDRANGEL_API DSPConfigureChannelizer : public Message {
MESSAGE_CLASS_DECLARATION
public:

View File

@ -35,7 +35,7 @@ class SampleSink;
class ThreadedSampleSink;
class AudioFifo;
class SDRANGELOVE_API DSPEngine : public QThread {
class SDRANGEL_API DSPEngine : public QThread {
Q_OBJECT
public:

View File

@ -4,7 +4,7 @@
#include "dsp/dsptypes.h"
#include "util/export.h"
class SDRANGELOVE_API FFTEngine {
class SDRANGEL_API FFTEngine {
public:
virtual ~FFTEngine();

View File

@ -24,7 +24,7 @@
#include "dsp/dsptypes.h"
#include "util/export.h"
class SDRANGELOVE_API FFTWindow {
class SDRANGEL_API FFTWindow {
public:
enum Function {
Bartlett,

View File

@ -11,7 +11,7 @@
#include "util/message.h"
#include "util/messagequeue.h"
class SDRANGELOVE_API FileSink : public SampleSink {
class SDRANGEL_API FileSink : public SampleSink {
public:
struct Header

View File

@ -11,7 +11,7 @@
#include <unistd.h>
#endif
class SDRANGELOVE_API Interpolator {
class SDRANGEL_API Interpolator {
public:
Interpolator();
~Interpolator();

View File

@ -13,7 +13,7 @@
#define HB_FILTERORDER 32
#define HB_SHIFT 14
class SDRANGELOVE_API IntHalfbandFilter {
class SDRANGEL_API IntHalfbandFilter {
public:
IntHalfbandFilter();

View File

@ -21,7 +21,7 @@
#include "dsp/dsptypes.h"
#include "util/export.h"
class SDRANGELOVE_API NCO {
class SDRANGEL_API NCO {
private:
enum {
TableSize = (1 << 12),

View File

@ -6,7 +6,7 @@
class Message;
class SDRANGELOVE_API NullSink : public SampleSink {
class SDRANGEL_API NullSink : public SampleSink {
public:
NullSink();

View File

@ -9,7 +9,7 @@
class GLScope;
class MessageQueue;
class SDRANGELOVE_API ScopeVis : public SampleSink {
class SDRANGEL_API ScopeVis : public SampleSink {
public:
enum TriggerChannel {
TriggerFreeRun,

View File

@ -8,7 +8,7 @@
class Message;
class SDRANGELOVE_API SpectrumScopeComboVis : public SampleSink {
class SDRANGEL_API SpectrumScopeComboVis : public SampleSink {
public:
SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis);

View File

@ -10,10 +10,10 @@
class GLSpectrum;
class MessageQueue;
class SDRANGELOVE_API SpectrumVis : public SampleSink {
class SDRANGEL_API SpectrumVis : public SampleSink {
public:
class SDRANGELOVE_API MsgConfigureSpectrumVis : public Message {
class SDRANGEL_API MsgConfigureSpectrumVis : public Message {
MESSAGE_CLASS_DECLARATION
public:

View File

@ -12,7 +12,7 @@
#include <utility>
#include "util/export.h"
class SDRANGELOVE_API ColorMapper
class SDRANGEL_API ColorMapper
{
public:
enum Theme {

View File

@ -30,7 +30,7 @@
class DSPEngine;
class ScopeVis;
class SDRANGELOVE_API GLScope: public QGLWidget {
class SDRANGEL_API GLScope: public QGLWidget {
Q_OBJECT
public:

View File

@ -14,7 +14,7 @@ class MessageQueue;
class ScopeVis;
class GLScope;
class SDRANGELOVE_API GLScopeGUI : public QWidget {
class SDRANGEL_API GLScopeGUI : public QWidget {
Q_OBJECT
public:

View File

@ -26,7 +26,7 @@
#include "dsp/channelmarker.h"
#include "util/export.h"
class SDRANGELOVE_API GLSpectrum : public QGLWidget {
class SDRANGEL_API GLSpectrum : public QGLWidget {
Q_OBJECT
public:

View File

@ -13,7 +13,7 @@ class MessageQueue;
class SpectrumVis;
class GLSpectrum;
class SDRANGELOVE_API GLSpectrumGUI : public QWidget {
class SDRANGEL_API GLSpectrumGUI : public QWidget {
Q_OBJECT
public:

View File

@ -21,7 +21,7 @@
#include <QWidget>
#include "util/export.h"
class SDRANGELOVE_API Indicator : public QWidget {
class SDRANGEL_API Indicator : public QWidget {
private:
Q_OBJECT;

View File

@ -19,7 +19,7 @@
#include "gui/scaleengine.h"
#include "util/export.h"
class SDRANGELOVE_API Scale : public QWidget {
class SDRANGEL_API Scale : public QWidget {
Q_OBJECT
public:

View File

@ -24,7 +24,7 @@
#include "physicalunit.h"
#include "util/export.h"
class SDRANGELOVE_API ScaleEngine {
class SDRANGEL_API ScaleEngine {
public:
struct Tick {
float pos;

View File

@ -28,7 +28,7 @@ namespace Ui {
class ScopeWindow;
}
class SDRANGELOVE_API ScopeWindow : public QWidget {
class SDRANGEL_API ScopeWindow : public QWidget {
Q_OBJECT
public:

View File

@ -20,7 +20,7 @@
#include "gui/colormapper.h"
#include "util/export.h"
class SDRANGELOVE_API ValueDial : public QWidget {
class SDRANGEL_API ValueDial : public QWidget {
Q_OBJECT
public:

View File

@ -44,7 +44,7 @@ namespace Ui {
class MainWindow;
}
class SDRANGELOVE_API MainWindow : public QMainWindow {
class SDRANGEL_API MainWindow : public QMainWindow {
Q_OBJECT
public:

View File

@ -15,7 +15,7 @@ class MainWindow;
class SampleSource;
class Message;
class SDRANGELOVE_API PluginManager : public QObject {
class SDRANGEL_API PluginManager : public QObject {
Q_OBJECT
public:

View File

@ -5,7 +5,7 @@
#include <QColor>
#include "util/export.h"
class SDRANGELOVE_API ChannelMarker : public QObject {
class SDRANGEL_API ChannelMarker : public QObject {
Q_OBJECT
public:

View File

@ -24,7 +24,7 @@
#include "dsp/dsptypes.h"
#include "util/export.h"
class SDRANGELOVE_API SampleFifo : public QObject {
class SDRANGEL_API SampleFifo : public QObject {
Q_OBJECT
private:

View File

@ -8,7 +8,7 @@
class Message;
class SDRANGELOVE_API SampleSink : public QObject {
class SDRANGEL_API SampleSink : public QObject {
Q_OBJECT
public:
SampleSink();

View File

@ -24,7 +24,7 @@
#include "util/messagequeue.h"
#include "util/export.h"
class SDRANGELOVE_API SampleSource : public QObject {
class SDRANGEL_API SampleSource : public QObject {
Q_OBJECT
public:
SampleSource();

View File

@ -49,7 +49,7 @@ public slots:
/**
* This class is a wrapper for SampleSink that runs the SampleSink object in its own thread
*/
class SDRANGELOVE_API ThreadedSampleSink : public QObject {
class SDRANGEL_API ThreadedSampleSink : public QObject {
Q_OBJECT
public:

View File

@ -10,7 +10,7 @@ namespace Ui {
class ChannelMarker;
class SDRANGELOVE_API BasicChannelSettingsWidget : public QWidget {
class SDRANGEL_API BasicChannelSettingsWidget : public QWidget {
Q_OBJECT
public:

View File

@ -4,7 +4,7 @@
#include <QWidget>
#include "util/export.h"
class SDRANGELOVE_API RollupWidget : public QWidget {
class SDRANGEL_API RollupWidget : public QWidget {
Q_OBJECT
public:

View File

@ -18,7 +18,7 @@ class MainWindow;
class ChannelMarker;
class PluginGUI;
class SDRANGELOVE_API PluginAPI : public QObject {
class SDRANGEL_API PluginAPI : public QObject {
Q_OBJECT
public:

View File

@ -6,7 +6,7 @@
class Message;
class SDRANGELOVE_API PluginGUI {
class SDRANGEL_API PluginGUI {
public:
PluginGUI() { };
virtual ~PluginGUI() { };

View File

@ -1,22 +1,21 @@
/*
* Copyright (C) 2012 by Hoernchen <la@tfc-server.de>
*
* 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, either version 2 of the License, or
* (at your option) any later version.
*
* 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 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/>.
*/
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2015 Edouard Griffiths, F4EXB. //
// //
// 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 __SDRANGELOVE_EXPORT_H
#define __SDRANGELOVE_EXPORT_H
#ifndef __SDRANGEL_EXPORT_H
#define __SDRANGEL_EXPORT_H
#if defined __GNUC__
# if __GNUC__ >= 4
@ -34,13 +33,13 @@
# define __SDR_IMPORT
#endif
#ifndef sdrangelove_STATIC
# ifdef sdrangelove_EXPORTS
# define SDRANGELOVE_API __SDR_EXPORT
#ifndef sdrangel_STATIC
# ifdef sdrangel_EXPORTS
# define SDRANGEL_API __SDR_EXPORT
# else
# define SDRANGELOVE_API __SDR_IMPORT
# define SDRANGEL_API __SDR_IMPORT
# endif
#else
#define SDRANGELOVE_API
#define SDRANGEL_API
#endif
#endif /* __SDRANGELOVE_EXPORT_H */
#endif /* __SDRANGEL_EXPORT_H */

View File

@ -21,7 +21,7 @@
#include <stdlib.h>
#include "util/export.h"
class SDRANGELOVE_API Message {
class SDRANGEL_API Message {
public:
Message();
virtual ~Message();

View File

@ -25,7 +25,7 @@
class Message;
class SDRANGELOVE_API MessageQueue : public QObject {
class SDRANGEL_API MessageQueue : public QObject {
Q_OBJECT
public:

View File

@ -6,7 +6,7 @@
#include "dsp/dsptypes.h"
#include "util/export.h"
class SDRANGELOVE_API SimpleSerializer {
class SDRANGEL_API SimpleSerializer {
public:
SimpleSerializer(quint32 version);
@ -48,7 +48,7 @@ protected:
bool writeTag(Type type, quint32 id, quint32 length);
};
class SDRANGELOVE_API SimpleDeserializer {
class SDRANGEL_API SimpleDeserializer {
public:
SimpleDeserializer(const QByteArray& data);

View File

@ -29,7 +29,7 @@ class Message;
/**
* This class is responsible of managing the synchronous processing of a message across threads
*/
class SDRANGELOVE_API SyncMessenger : public QObject {
class SDRANGEL_API SyncMessenger : public QObject {
Q_OBJECT
public:

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>SDRangelove V2</string>
<string>SDRangel</string>
</property>
<property name="windowIcon">
<iconset resource="resources/res.qrc">
@ -446,7 +446,7 @@
</action>
<action name="action_About">
<property name="text">
<string>&amp;About SDRangelove...</string>
<string>&amp;About SDRangel...</string>
</property>
</action>
<action name="action_Preferences">