diff --git a/debian/changelog b/debian/changelog index 8e437437a..e44a38ac0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sdrangel (3.4.0-1) unstable; urgency=medium + + * LimeSDR support with redesign of source and sink management + + -- Edouard Griffiths, F4EXB 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 diff --git a/fcdlib/fcdtraits.cpp b/fcdlib/fcdtraits.cpp index 274d90b8c..ccb9321ff 100644 --- a/fcdlib/fcdtraits.cpp +++ b/fcdlib/fcdtraits.cpp @@ -22,5 +22,5 @@ const char *fcd_traits::displayedName = "FunCube Dongle Pro+"; const char *fcd_traits::pluginDisplayedName = "FunCube Pro Input"; const char *fcd_traits::pluginDisplayedName = "FunCube Pro+ Input"; -const char *fcd_traits::pluginVersion = "3.0.0"; -const char *fcd_traits::pluginVersion = "3.0.0"; +const char *fcd_traits::pluginVersion = "3.4.0"; +const char *fcd_traits::pluginVersion = "3.4.0"; diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index a9d91944a..5df535ff3 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -46,11 +46,6 @@ AirspyInput::~AirspyInput() stop(); } -bool AirspyInput::init(const Message& cmd) -{ - return false; -} - bool AirspyInput::start(int device) { QMutexLocker mutexLocker(&m_mutex); diff --git a/plugins/samplesource/airspy/airspyinput.h b/plugins/samplesource/airspy/airspyinput.h index dd438bfd9..8bc97b030 100644 --- a/plugins/samplesource/airspy/airspyinput.h +++ b/plugins/samplesource/airspy/airspyinput.h @@ -71,7 +71,6 @@ public: AirspyInput(DeviceSourceAPI *deviceAPI); virtual ~AirspyInput(); - virtual bool init(const Message& message); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index ab3e0afa7..d28c1bd95 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -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, diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp index 30ea89027..06c800deb 100644 --- a/plugins/samplesource/bladerfinput/bladerfinput.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp @@ -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); diff --git a/plugins/samplesource/bladerfinput/bladerfinput.h b/plugins/samplesource/bladerfinput/bladerfinput.h index 446977c36..6a89ba116 100644 --- a/plugins/samplesource/bladerfinput/bladerfinput.h +++ b/plugins/samplesource/bladerfinput/bladerfinput.h @@ -71,7 +71,6 @@ public: BladerfInput(DeviceSourceAPI *deviceAPI); virtual ~BladerfInput(); - virtual bool init(const Message& message); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp index 4a30cf393..339a9d295 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp @@ -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, diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index a344cc64b..78eb1032b 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -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; diff --git a/plugins/samplesource/fcdpro/fcdproinput.h b/plugins/samplesource/fcdpro/fcdproinput.h index 0936698e3..435003638 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.h +++ b/plugins/samplesource/fcdpro/fcdproinput.h @@ -58,7 +58,6 @@ public: FCDProInput(DeviceSourceAPI *deviceAPI); virtual ~FCDProInput(); - virtual bool init(const Message& cmd); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index c6fba6dd3..6769d542d 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -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; diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.h b/plugins/samplesource/fcdproplus/fcdproplusinput.h index 0a5544c38..9e1971a81 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.h +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.h @@ -57,7 +57,6 @@ public: FCDProPlusInput(DeviceSourceAPI *deviceAPI); virtual ~FCDProPlusInput(); - virtual bool init(const Message& cmd); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index fad441efc..31e780119 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -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); diff --git a/plugins/samplesource/filesource/filesourceinput.h b/plugins/samplesource/filesource/filesourceinput.h index e9a60a026..b9a2ddf05 100644 --- a/plugins/samplesource/filesource/filesourceinput.h +++ b/plugins/samplesource/filesource/filesourceinput.h @@ -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(); diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index ef0cce861..7432cd6bf 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -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, diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index ff725da22..fa9e10d30 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -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); diff --git a/plugins/samplesource/hackrfinput/hackrfinput.h b/plugins/samplesource/hackrfinput/hackrfinput.h index 3a12333f8..236850417 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.h +++ b/plugins/samplesource/hackrfinput/hackrfinput.h @@ -71,7 +71,6 @@ public: HackRFInput(DeviceSourceAPI *deviceAPI); virtual ~HackRFInput(); - virtual bool init(const Message& message); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index 574caed45..ea870860c 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -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, diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index f4d35c217..bc34a0243 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -44,11 +44,6 @@ RTLSDRInput::~RTLSDRInput() stop(); } -bool RTLSDRInput::init(const Message& message) -{ - return false; -} - bool RTLSDRInput::start(int device) { QMutexLocker mutexLocker(&m_mutex); diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.h b/plugins/samplesource/rtlsdr/rtlsdrinput.h index 6d6b131d0..b7b9d9204 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.h +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.h @@ -72,7 +72,6 @@ public: RTLSDRInput(DeviceSourceAPI *deviceAPI); virtual ~RTLSDRInput(); - virtual bool init(const Message& message); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 917bbdd95..2c80001e9 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -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, diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp b/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp index 420184801..cecada936 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp @@ -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"; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h index 319396f90..f736ba330 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h @@ -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(); diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp index 629111b26..fda4ac34f 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp @@ -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, diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp index 288c0b6f6..b459530fe 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp @@ -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"; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h index e8be0e066..cc4999f0c 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h @@ -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(); diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp index 0f1776f91..a5771b28a 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp @@ -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, diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index cea40c4cd..76d94d445 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -46,11 +46,6 @@ SDRPlayInput::~SDRPlayInput() stop(); } -bool SDRPlayInput::init(const Message& cmd) -{ - return false; -} - bool SDRPlayInput::start(int device) { QMutexLocker mutexLocker(&m_mutex); diff --git a/plugins/samplesource/sdrplay/sdrplayinput.h b/plugins/samplesource/sdrplay/sdrplayinput.h index f2e87bda6..434146c76 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.h +++ b/plugins/samplesource/sdrplay/sdrplayinput.h @@ -81,7 +81,6 @@ public: SDRPlayInput(DeviceSourceAPI *deviceAPI); virtual ~SDRPlayInput(); - virtual bool init(const Message& message); virtual bool start(int device); virtual void stop(); diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index bb8ab2589..6d39266a6 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -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, diff --git a/sdrbase/dsp/devicesamplesource.h b/sdrbase/dsp/devicesamplesource.h index 3c269429d..f87d5173c 100644 --- a/sdrbase/dsp/devicesamplesource.h +++ b/sdrbase/dsp/devicesamplesource.h @@ -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; } diff --git a/sdrbase/gui/aboutdialog.ui b/sdrbase/gui/aboutdialog.ui index 1ac598d12..6111a8a35 100644 --- a/sdrbase/gui/aboutdialog.ui +++ b/sdrbase/gui/aboutdialog.ui @@ -84,7 +84,7 @@ - <html><head/><body><p>Version 3.3.4 - Copyright (C) 2015-2017 Edouard Griffiths, F4EXB. </p><p>Code at <a href="https://github.com/f4exb/sdrangel"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/f4exb/sdrangel</span></a></p><p>Many thanks to the original developers:</p><p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p><p>Christian Daniel from maintech GmbH.</p><p>John Greb (hexameron) for the contributions in <a href="https://github.com/hexameron/rtl-sdrangelove"><span style=" text-decoration: underline; color:#0000ff;">RTL-SDRangelove</span></a></p><p>The following rules apply to the SDRangel main application and libsdrbase:<br/>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 <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/</span></a>.</p><p>For the license of installed plugins, look into the plugin list.</p></body></html> + <html><head/><body><p>Version 3.4.0 - Copyright (C) 2015-2017 Edouard Griffiths, F4EXB. </p><p>Code at <a href="https://github.com/f4exb/sdrangel"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/f4exb/sdrangel</span></a></p><p>Many thanks to the original developers:</p><p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p><p>Christian Daniel from maintech GmbH.</p><p>John Greb (hexameron) for the contributions in <a href="https://github.com/hexameron/rtl-sdrangelove"><span style=" text-decoration: underline; color:#0000ff;">RTL-SDRangelove</span></a></p><p>The following rules apply to the SDRangel main application and libsdrbase:<br/>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 <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/</span></a>.</p><p>For the license of installed plugins, look into the plugin list.</p></body></html> true diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 829ad3e24..1c3e7ab04 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -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);