diff --git a/plugins/samplesource/perseus/CMakeLists.txt b/plugins/samplesource/perseus/CMakeLists.txt index 65d62d256..ffac2972f 100644 --- a/plugins/samplesource/perseus/CMakeLists.txt +++ b/plugins/samplesource/perseus/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(perseus_SOURCES perseusgui.cpp perseusinput.cpp -# perseusplugin.cpp + perseusplugin.cpp perseussettings.cpp perseusthread.cpp ) @@ -13,7 +13,7 @@ set(perseus_SOURCES set(perseus_HEADERS perseusgui.h perseusinput.h -# perseusplugin.h + perseusplugin.h perseussettings.h perseusthread.h ) @@ -63,6 +63,7 @@ target_link_libraries(inputperseus sdrbase sdrgui swagger + perseusdevice ) else (BUILD_DEBIAN) target_link_libraries(inputperseus @@ -71,6 +72,7 @@ target_link_libraries(inputperseus sdrbase sdrgui swagger + perseusdevice ) endif (BUILD_DEBIAN) diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp index 8e65d2ad0..1cfb595bb 100644 --- a/plugins/samplesource/perseus/perseusplugin.cpp +++ b/plugins/samplesource/perseus/perseusplugin.cpp @@ -21,6 +21,7 @@ #include #include "plugin/pluginapi.h" #include "util/simpleserializer.h" +#include "perseus/deviceperseus.h" #include "perseusplugin.h" #include "perseusgui.h" @@ -35,7 +36,7 @@ const PluginDescriptor PerseusPlugin::m_pluginDescriptor = { const QString PerseusPlugin::m_hardwareID = "Perseus"; const QString PerseusPlugin::m_deviceTypeID = PERSEUS_DEVICE_TYPE_ID; -const int AirspyHFPlugin::m_maxDevices = 32; +const int PerseusPlugin::m_maxDevices = 32; PerseusPlugin::PerseusPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/perseus/perseusthread.cpp b/plugins/samplesource/perseus/perseusthread.cpp index 5dee339a0..d602383a3 100644 --- a/plugins/samplesource/perseus/perseusthread.cpp +++ b/plugins/samplesource/perseus/perseusthread.cpp @@ -17,6 +17,8 @@ #include #include "perseusthread.h" +PerseusThread *PerseusThread::m_this = 0; + PerseusThread::PerseusThread(perseus_descr* dev, SampleSinkFifo* sampleFifo, QObject* parent) : QThread(parent), m_running(false), diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index a78b93bf7..f94f9b481 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -121,18 +121,18 @@ void PluginManager::loadPluginsDir(const QDir& dir) { if (fileName.endsWith(".so") || fileName.endsWith(".dll") || fileName.endsWith(".dylib")) { - qDebug() << "PluginManager::loadPlugins: fileName: " << qPrintable(fileName); + qDebug() << "PluginManager::loadPluginsDir: fileName: " << qPrintable(fileName); QPluginLoader* loader = new QPluginLoader(pluginsDir.absoluteFilePath(fileName)); PluginInterface* plugin = qobject_cast(loader->instance()); if (loader->isLoaded()) { - qInfo("PluginManager::loadPlugins: loaded plugin %s", qPrintable(fileName)); + qInfo("PluginManager::loadPluginsDir: loaded plugin %s", qPrintable(fileName)); } else { - qWarning() << "PluginManager::loadPlugins: " << qPrintable(loader->errorString()); + qWarning() << "PluginManager::loadPluginsDir: " << qPrintable(loader->errorString()); } if (plugin != 0)