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

Sample source plugins: removed useless init pure virtual method

This commit is contained in:
f4exb 2017-04-12 23:10:22 +02:00
parent 729ba1b1f9
commit 2136dc7672
33 changed files with 20 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
sdrangel (3.4.0-1) unstable; urgency=medium
* LimeSDR support with redesign of source and sink management
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Mon, 17 Apr 2017 23:14:18 +0100
sdrangel (3.3.4-1) unstable; urgency=medium
* ATV Demod: fixed issue #22. Segfault when starting the plugin while the

4
fcdlib/fcdtraits.cpp
View File

@ -22,5 +22,5 @@ const char *fcd_traits<ProPlus>::displayedName = "FunCube Dongle Pro+";
const char *fcd_traits<Pro>::pluginDisplayedName = "FunCube Pro Input";
const char *fcd_traits<ProPlus>::pluginDisplayedName = "FunCube Pro+ Input";
const char *fcd_traits<Pro>::pluginVersion = "3.0.0";
const char *fcd_traits<ProPlus>::pluginVersion = "3.0.0";
const char *fcd_traits<Pro>::pluginVersion = "3.4.0";
const char *fcd_traits<ProPlus>::pluginVersion = "3.4.0";

5
plugins/samplesource/airspy/airspyinput.cpp
View File

@ -46,11 +46,6 @@ AirspyInput::~AirspyInput()
stop();
}
bool AirspyInput::init(const Message& cmd)
{
return false;
}
bool AirspyInput::start(int device)
{
QMutexLocker mutexLocker(&m_mutex);

1
plugins/samplesource/airspy/airspyinput.h
View File

@ -71,7 +71,6 @@ public:
AirspyInput(DeviceSourceAPI *deviceAPI);
virtual ~AirspyInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/airspy/airspyplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor AirspyPlugin::m_pluginDescriptor = {
QString("Airspy Input"),
QString("3.0.0"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

5
plugins/samplesource/bladerfinput/bladerfinput.cpp
View File

@ -52,11 +52,6 @@ BladerfInput::~BladerfInput()
m_deviceAPI->setBuddySharedPtr(0);
}
bool BladerfInput::init(const Message& cmd)
{
return false;
}
bool BladerfInput::start(int device)
{
// QMutexLocker mutexLocker(&m_mutex);

1
plugins/samplesource/bladerfinput/bladerfinput.h
View File

@ -71,7 +71,6 @@ public:
BladerfInput(DeviceSourceAPI *deviceAPI);
virtual ~BladerfInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = {
QString("BladerRF Input"),
QString("3.3.3"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

5
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -48,11 +48,6 @@ FCDProInput::~FCDProInput()
stop();
}
bool FCDProInput::init(const Message& cmd)
{
return false;
}
bool FCDProInput::start(int device)
{
qDebug() << "FCDProInput::start with device #" << device;

1
plugins/samplesource/fcdpro/fcdproinput.h
View File

@ -58,7 +58,6 @@ public:
FCDProInput(DeviceSourceAPI *deviceAPI);
virtual ~FCDProInput();
virtual bool init(const Message& cmd);
virtual bool start(int device);
virtual void stop();

5
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
View File

@ -47,11 +47,6 @@ FCDProPlusInput::~FCDProPlusInput()
stop();
}
bool FCDProPlusInput::init(const Message& cmd)
{
return false;
}
bool FCDProPlusInput::start(int device)
{
qDebug() << "FCDProPlusInput::start with device #" << device;

1
plugins/samplesource/fcdproplus/fcdproplusinput.h
View File

@ -57,7 +57,6 @@ public:
FCDProPlusInput(DeviceSourceAPI *deviceAPI);
virtual ~FCDProPlusInput();
virtual bool init(const Message& cmd);
virtual bool start(int device);
virtual void stop();

5
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -140,11 +140,6 @@ void FileSourceInput::seekFileStream(int seekPercentage)
}
}
bool FileSourceInput::init(const Message& message)
{
return false;
}
bool FileSourceInput::start(int device)
{
QMutexLocker mutexLocker(&m_mutex);

1
plugins/samplesource/filesource/filesourceinput.h
View File

@ -212,7 +212,6 @@ public:
FileSourceInput(const QTimer& masterTimer);
virtual ~FileSourceInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/filesource/filesourceplugin.cpp
View File

@ -25,7 +25,7 @@
const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = {
QString("File source input"),
QString("3.0.0"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

5
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -53,11 +53,6 @@ HackRFInput::~HackRFInput()
m_deviceAPI->setBuddySharedPtr(0);
}
bool HackRFInput::init(const Message& cmd)
{
return false;
}
bool HackRFInput::start(int device)
{
// QMutexLocker mutexLocker(&m_mutex);

1
plugins/samplesource/hackrfinput/hackrfinput.h
View File

@ -71,7 +71,6 @@ public:
HackRFInput(DeviceSourceAPI *deviceAPI);
virtual ~HackRFInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
View File

@ -29,7 +29,7 @@
const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
QString("HackRF Input"),
QString("3.3.3"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

5
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -44,11 +44,6 @@ RTLSDRInput::~RTLSDRInput()
stop();
}
bool RTLSDRInput::init(const Message& message)
{
return false;
}
bool RTLSDRInput::start(int device)
{
QMutexLocker mutexLocker(&m_mutex);

1
plugins/samplesource/rtlsdr/rtlsdrinput.h
View File

@ -72,7 +72,6 @@ public:
RTLSDRInput(DeviceSourceAPI *deviceAPI);
virtual ~RTLSDRInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
View File

@ -11,7 +11,7 @@
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
QString("RTL-SDR Input"),
QString("3.3.3"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

6
plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
View File

@ -63,12 +63,6 @@ SDRdaemonInput::~SDRdaemonInput()
delete m_SDRdaemonUDPHandler;
}
bool SDRdaemonInput::init(const Message& message)
{
qDebug() << "SDRdaemonInput::init";
return false;
}
bool SDRdaemonInput::start(int device)
{
qDebug() << "SDRdaemonInput::start";

1
plugins/samplesource/sdrdaemon/sdrdaemoninput.h
View File

@ -277,7 +277,6 @@ public:
SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
View File

@ -25,7 +25,7 @@
const PluginDescriptor SDRdaemonPlugin::m_pluginDescriptor = {
QString("SDRdaemon input"),
QString("3.0.0"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

6
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
View File

@ -61,12 +61,6 @@ SDRdaemonFECInput::~SDRdaemonFECInput()
delete m_SDRdaemonUDPHandler;
}
bool SDRdaemonFECInput::init(const Message& message)
{
qDebug() << "SDRdaemonInput::init";
return false;
}
bool SDRdaemonFECInput::start(int device)
{
qDebug() << "SDRdaemonInput::start";

1
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
View File

@ -261,7 +261,6 @@ public:
SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonFECInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor SDRdaemonFECPlugin::m_pluginDescriptor = {
QString("SDRdaemon with FEC input"),
QString("3.2.0"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

5
plugins/samplesource/sdrplay/sdrplayinput.cpp
View File

@ -46,11 +46,6 @@ SDRPlayInput::~SDRPlayInput()
stop();
}
bool SDRPlayInput::init(const Message& cmd)
{
return false;
}
bool SDRPlayInput::start(int device)
{
QMutexLocker mutexLocker(&m_mutex);

1
plugins/samplesource/sdrplay/sdrplayinput.h
View File

@ -81,7 +81,6 @@ public:
SDRPlayInput(DeviceSourceAPI *deviceAPI);
virtual ~SDRPlayInput();
virtual bool init(const Message& message);
virtual bool start(int device);
virtual void stop();

2
plugins/samplesource/sdrplay/sdrplayplugin.cpp
View File

@ -25,7 +25,7 @@
const PluginDescriptor SDRPlayPlugin::m_pluginDescriptor = {
QString("SDRPlay RSP1 Input"),
QString("3.0.0"),
QString("3.4.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

3
sdrbase/dsp/devicesamplesource.h
View File

@ -31,7 +31,6 @@ public:
DeviceSampleSource();
virtual ~DeviceSampleSource();
virtual bool init(const Message& cmd) = 0;
virtual bool start(int device) = 0;
virtual void stop() = 0;
@ -40,7 +39,7 @@ public:
virtual quint64 getCenterFrequency() const = 0; //!< Center frequency exposed by the source
virtual bool handleMessage(const Message& message) = 0;
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
MessageQueue *getOutputMessageQueueToGUI() { return &m_outputMessageQueueToGUI; }
SampleSinkFifo* getSampleFifo() { return &m_sampleFifo; }

2
sdrbase/gui/aboutdialog.ui
View File

@ -84,7 +84,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version 3.3.4 - Copyright (C) 2015-2017 Edouard Griffiths, F4EXB. &lt;/p&gt;&lt;p&gt;Code at &lt;a href=&quot;https://github.com/f4exb/sdrangel&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/f4exb/sdrangel&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Many thanks to the original developers:&lt;/p&gt;&lt;p&gt;The osmocom developer team - especially horizon, Hoernchen &amp;amp; tnt.&lt;/p&gt;&lt;p&gt;Christian Daniel from maintech GmbH.&lt;/p&gt;&lt;p&gt;John Greb (hexameron) for the contributions in &lt;a href=&quot;https://github.com/hexameron/rtl-sdrangelove&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;RTL-SDRangelove&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The following rules apply to the SDRangel main application and libsdrbase:&lt;br/&gt;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. You should have received a copy of the GNU General Public License along with this program. If not, see &lt;a href=&quot;http://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.gnu.org/licenses/&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;For the license of installed plugins, look into the plugin list.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version 3.4.0 - Copyright (C) 2015-2017 Edouard Griffiths, F4EXB. &lt;/p&gt;&lt;p&gt;Code at &lt;a href=&quot;https://github.com/f4exb/sdrangel&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/f4exb/sdrangel&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Many thanks to the original developers:&lt;/p&gt;&lt;p&gt;The osmocom developer team - especially horizon, Hoernchen &amp;amp; tnt.&lt;/p&gt;&lt;p&gt;Christian Daniel from maintech GmbH.&lt;/p&gt;&lt;p&gt;John Greb (hexameron) for the contributions in &lt;a href=&quot;https://github.com/hexameron/rtl-sdrangelove&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;RTL-SDRangelove&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The following rules apply to the SDRangel main application and libsdrbase:&lt;br/&gt;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. You should have received a copy of the GNU General Public License along with this program. If not, see &lt;a href=&quot;http://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.gnu.org/licenses/&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;For the license of installed plugins, look into the plugin list.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>

4
sdrbase/mainwindow.cpp
View File

@ -453,9 +453,9 @@ void MainWindow::createStatusBar()
{
QString qtVersionStr = QString("Qt %1 ").arg(QT_VERSION_STR);
#if QT_VERSION >= 0x050400
m_showSystemWidget = new QLabel("SDRangel v3.3.4 " + qtVersionStr + QSysInfo::prettyProductName(), this);
m_showSystemWidget = new QLabel("SDRangel v3.4.0 " + qtVersionStr + QSysInfo::prettyProductName(), this);
#else
m_showSystemWidget = new QLabel("SDRangel v3.3.4 " + qtVersionStr, this);
m_showSystemWidget = new QLabel("SDRangel v3.4.0 " + qtVersionStr, this);
#endif
statusBar()->addPermanentWidget(m_showSystemWidget);