Merge branch 'master' into dev. Build for Mac OS.

.gitignore

@@ -10,3 +10,4 @@ sdrangelove.supp
 .settings/
 *.cs
 *.pro.user
+.idea/*

CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.1.0)
 cmake_policy(SET CMP0043 OLD)
 
+# QT Framework
+set(CMAKE_PREFIX_PATH "/Applications/Qt/5.7/clang_64/lib/cmake")
+
 # use, i.e. don't skip the full RPATH for the build tree
 set(CMAKE_SKIP_BUILD_RPATH  FALSE)
 
@@ -56,6 +59,10 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|x86")
  SET(USE_SIMD "SSE2" CACHE STRING "Use SIMD instructions")
 ENDIF()
 
+# MacOS Compatibility
+if(APPLE)
+        find_package(ICONV)
+endif(APPLE)
 ##############################################################################
 
 #include(${QT_USE_FILE})

apple_compat.c

@@ -0,0 +1,77 @@
+/*
+ * APPLE Compatibility
+ */
+
+#ifdef __APPLE__
+
+#include <pthread.h>
+#include <errno.h>
+
+#include "apple_compat.h"
+
+int pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count)
+{
+    if(count == 0)
+    {
+        errno = EINVAL;
+        return -1;
+    }
+    if(pthread_mutex_init(&barrier->mutex, 0) < 0)
+    {
+        return -1;
+    }
+    if(pthread_cond_init(&barrier->cond, 0) < 0)
+    {
+        pthread_mutex_destroy(&barrier->mutex);
+        return -1;
+    }
+    barrier->tripCount = count;
+    barrier->count = 0;
+
+    return 0;
+}
+
+int pthread_barrier_destroy(pthread_barrier_t *barrier)
+{
+    pthread_cond_destroy(&barrier->cond);
+    pthread_mutex_destroy(&barrier->mutex);
+    return 0;
+}
+
+int pthread_barrier_wait(pthread_barrier_t *barrier)
+{
+    pthread_mutex_lock(&barrier->mutex);
+    ++(barrier->count);
+    if(barrier->count >= barrier->tripCount)
+    {
+        barrier->count = 0;
+        pthread_cond_broadcast(&barrier->cond);
+        pthread_mutex_unlock(&barrier->mutex);
+        return 1;
+    }
+    else
+    {
+        pthread_cond_wait(&barrier->cond, &(barrier->mutex));
+        pthread_mutex_unlock(&barrier->mutex);
+        return 0;
+    }
+}
+
+/**
+ * Missing POSIX RealTime/Monotonic Clock
+ */
+#include <mach/mach_time.h>
+
+int clock_gettime(int clk_id, struct timespec *t) {
+    mach_timebase_info_data_t timebase;
+    mach_timebase_info(&timebase);
+    uint64_t time;
+    time = mach_absolute_time();
+    double nseconds = ((double)time * (double)timebase.numer)/((double)timebase.denom);
+    double seconds = ((double)time * (double)timebase.numer)/((double)timebase.denom * 1e9);
+    t->tv_sec = seconds;
+    t->tv_nsec = nseconds;
+    return 0;
+}
+
+#endif // APPLE Compatibility

apple_compat.h

@@ -0,0 +1,45 @@
+/*
+ * APPLE Compatibility
+ */
+
+#ifdef __APPLE__
+
+/**
+ *  Missing POSIX Thread Barriers implementation
+ */
+#ifndef PTHREAD_BARRIER_H_
+#define PTHREAD_BARRIER_H_
+
+#include <pthread.h>
+#include <errno.h>
+
+typedef int pthread_barrierattr_t;
+typedef struct
+{
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+    int count;
+    int tripCount;
+} pthread_barrier_t;
+
+
+int pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *attr, unsigned int count);
+
+int pthread_barrier_destroy(pthread_barrier_t *barrier);
+
+int pthread_barrier_wait(pthread_barrier_t *barrier);
+
+#endif // PTHREAD_BARRIER_H_
+
+// <time.h>
+#ifndef CLOCK_REALTIME
+#  define CLOCK_REALTIME 0
+#endif
+
+#ifndef CLOCK_MONOTONIC
+#  define CLOCK_MONOTONIC 0
+#endif
+
+int clock_gettime(int clk_id, struct timespec *t);
+
+#endif // APPLE Compatibility

cmake/Modules/FindICONV.cmake

@@ -0,0 +1,73 @@
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+include(CheckFunctionExists)
+if (ICONV_INCLUDE_DIR)
+    # Already in cache, be silent
+    set(ICONV_FIND_QUIETLY TRUE)
+endif()
+
+find_path(ICONV_INCLUDE_DIR iconv.h
+        /usr/include
+        /usr/local/include
+        /opt/local/include)
+
+set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
+
+find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
+        PATHS /usr/lib /usr/local/lib /opt/local/lib)
+
+if(WIN32)
+    set(ICONV_DLL_NAMES iconv.dll  libiconv.dll libiconv2.dll)
+    find_file(ICONV_DLL
+            NAMES ${ICONV_DLL_NAMES}
+            PATHS ENV PATH
+            NO_DEFAULT_PATH)
+    find_file(ICONV_DLL_HELP
+            NAMES ${ICONV_DLL_NAMES}
+            PATHS ENV PATH
+            ${ICONV_INCLUDE_DIR}/../bin)
+    if(ICONV_FIND_REQUIRED)
+        if(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
+            message(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable")
+        endif()
+        if(NOT ICONV_DLL AND ICONV_DLL_HELP)
+            get_filename_component(ICONV_DLL_HELP ${ICONV_DLL_HELP} PATH)
+            message(STATUS)
+            message(STATUS "Could not find iconv.dll in standard search path, please add ")
+            message(STATUS "${ICONV_DLL_HELP}")
+            message(STATUS "to your PATH environment variable.")
+            message(STATUS)
+            message(FATAL_ERROR "exit cmake")
+        endif()
+    endif()
+    if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
+        set(ICONV_FOUND TRUE)
+    endif()
+else()
+    check_function_exists(iconv HAVE_ICONV_IN_LIBC)
+    if(ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
+        set(ICONV_FOUND TRUE)
+        set(ICONV_LIBRARY  CACHE TYPE STRING FORCE)
+    endif()
+    if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
+        set(ICONV_FOUND TRUE)
+    endif()
+endif()
+
+
+
+if(ICONV_FOUND)
+    if(NOT ICONV_FIND_QUIETLY)
+        message(STATUS "Found iconv library: ${ICONV_LIBRARY}")
+        #message(STATUS "Found iconv   dll  : ${ICONV_DLL}")
+    endif()
+else()
+    if(ICONV_FIND_REQUIRED)
+        message(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.")
+        message(STATUS "Found no acceptable iconv library. This is fatal.")
+        message(STATUS "iconv header: ${ICONV_INCLUDE_DIR}")
+        message(STATUS "iconv lib   : ${ICONV_LIBRARY}")
+        message(FATAL_ERROR "Could NOT find iconv library")
+    endif()
+endif()
+
+mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)

fcdhid/CMakeLists.txt

@@ -1,11 +1,13 @@
 project(fcdhid)
 
 set(fcdhid_SOURCES
+    ../apple_compat.c
 	hid-libusb.c
 	fcdhid.c
 )
 
 set(fcdhid_HEADERS
+    ../apple_compat.h
 	fcdhid.h
 	hid-libusb.h
 	hidapi.h
@@ -25,6 +27,7 @@ add_library(fcdhid SHARED
 
 target_link_libraries(fcdhid
 	${LIBUSB_LIBRARIES}
+    ${ICONV_LIBRARY}
 )
 
-install(TARGETS fcdhid DESTINATION lib)
+install(TARGETS fcdhid DESTINATION lib)

fcdhid/hid-libusb.c

@@ -65,6 +65,15 @@ extern "C" {
 #define DETACH_KERNEL_DRIVER
 #endif
 
+/**
+ * MacOS does not implement POSIX Thread Barriers
+ */
+#ifdef __APPLE__
+
+#include "../apple_compat.h"
+
+#endif
+
 /* Uncomment to enable the retrieval of Usage and Usage Page in
 hid_enumerate(). Warning, on platforms different from FreeBSD
 this is very invasive as it requires the detach

plugins/channel/demodbfm/CMakeLists.txt

@@ -49,4 +49,4 @@ target_link_libraries(demodbfm
 
 qt5_use_modules(demodbfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodbfm DESTINATION lib/plugins/channel)
+install(TARGETS demodbfm DESTINATION lib/plugins/channel)

plugins/channel/demodbfm/rdsparser.cpp

@@ -526,15 +526,21 @@ void RDSParser::decode_type0(unsigned int *group, bool B)
 
 		if (af_1)
 		{
-			std::pair<std::_Rb_tree_const_iterator<double>, bool> res = m_g0_alt_freq.insert(af_1/1e3);
-			m_g0_af_updated = m_g0_af_updated || res.second;
+            // @TODO: Find proper header or STL on OSX
+#ifndef __APPLE__
+            std::pair<std::_Rb_tree_const_iterator<double>, bool> res = m_g0_alt_freq.insert(af_1/1e3);
+            m_g0_af_updated = m_g0_af_updated || res.second;
+#endif
 			no_af += 1;
 		}
 
 		if (af_2)
 		{
-			std::pair<std::_Rb_tree_const_iterator<double>, bool> res = m_g0_alt_freq.insert(af_2/1e3);
-			m_g0_af_updated = m_g0_af_updated || res.second;
+            // @TODO: Find proper header or STL on OSX
+#ifndef __APPLE__
+            std::pair<std::_Rb_tree_const_iterator<double>, bool> res = m_g0_alt_freq.insert(af_2/1e3);
+            m_g0_af_updated = m_g0_af_updated || res.second;
+#endif
 			no_af += 2;
 		}
 

plugins/samplesource/hackrf/CMakeLists.txt

@@ -21,7 +21,7 @@ set(hackrf_FORMS
 )
 
 include_directories(
-	.
+        .
 	${CMAKE_CURRENT_BINARY_DIR}
 	${LIBHACKRF_INCLUDE_DIR}
 )

sdrangel.macos.pro

@@ -0,0 +1,30 @@
+#--------------------------------------------------------
+#
+# Pro file for MacOS builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = subdirs
+SUBDIRS = sdrbase
+SUBDIRS += lz4
+SUBDIRS += librtlsdr
+SUBDIRS += libhackrf
+SUBDIRS += libairspy
+SUBDIRS += plugins/samplesource/filesource
+SUBDIRS += plugins/samplesource/sdrdaemon
+SUBDIRS += plugins/samplesource/rtlsdr
+SUBDIRS += plugins/samplesource/hackrf
+SUBDIRS += plugins/samplesource/airspy
+SUBDIRS += plugins/channel/chanalyzer
+SUBDIRS += plugins/channel/demodam
+SUBDIRS += plugins/channel/demodbfm
+SUBDIRS += plugins/channel/demodlora
+SUBDIRS += plugins/channel/demodnfm
+SUBDIRS += plugins/channel/demodssb
+SUBDIRS += plugins/channel/demodwfm
+SUBDIRS += plugins/channel/tcpsrc
+SUBDIRS += plugins/channel/udpsrc
+
+# Main app must be last
+CONFIG += ordered
+SUBDIRS += app

sdrbase/audio/audiooutput.cpp

@@ -150,8 +150,12 @@ bool AudioOutput::open(OpenMode mode)
 
 qint64 AudioOutput::readData(char* data, qint64 maxLen)
 {
-	//qDebug("AudioOutput::readData: %lld", maxLen);
-	QMutexLocker mutexLocker(&m_mutex);
+    //qDebug("AudioOutput::readData: %lld", maxLen);
+
+    // @TODO: Study this mutex on OSX, for now deadlocks possible
+#ifndef __APPLE__
+    QMutexLocker mutexLocker(&m_mutex);
+#endif
 
 	unsigned int framesPerBuffer = maxLen / 4;
 
@@ -183,7 +187,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen)
 
 		if (samples != framesPerBuffer)
 		{
-			//qDebug("AudioOutput::readData: read %d samples vs %d requested", samples, framesPerBuffer);
+            qDebug("AudioOutput::readData: read %d samples vs %d requested", samples, framesPerBuffer);
 		}
 
 		for (uint i = 0; i < samples; i++)
@@ -195,8 +199,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen)
 			++src;
 			++dst;
 		}
-	}
-
+    }
 	// convert to int16
 
 	//std::vector<qint32>::const_iterator src = m_mixBuffer.begin(); // Valgrind optim

sdrbase/dsp/phaselock.cpp

@@ -182,7 +182,7 @@ void PhaseLock::process(const std::vector<Real>& samples_in, std::vector<Real>&
 
         // Convert I/Q ratio to estimate of phase error.
         Real phase_err;
-        if (phasor_i > abs(phasor_q)) {
+        if (phasor_i > std::abs(phasor_q)) {
             // We are within +/- 45 degrees from lock.
             // Use simple linear approximation of arctan.
             phase_err = phasor_q / phasor_i;
@@ -278,7 +278,7 @@ void PhaseLock::process(const Real& sample_in, Real *samples_out)
 
 	// Convert I/Q ratio to estimate of phase error.
 	Real phase_err;
-	if (phasor_i > abs(phasor_q)) {
+    if (phasor_i > std::abs(phasor_q)) {
 		// We are within +/- 45 degrees from lock.
 		// Use simple linear approximation of arctan.
 		phase_err = phasor_q / phasor_i;

sdrbase/gui/aboutdialog.ui

@@ -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 2.0.0 - Copyright (C) 2015-2016 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; This is a complete redesign from RTL-SDRangelove at &lt;a href=&quot;https://github.com/hexameron/rtl-sdrangelove&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/hexameron/rtl-sdrangelove&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 RTL-SDRangelove&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 2.0.1 - Copyright (C) 2015-2016 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; This is a complete redesign from RTL-SDRangelove at &lt;a href=&quot;https://github.com/hexameron/rtl-sdrangelove&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/hexameron/rtl-sdrangelove&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 RTL-SDRangelove&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>

sdrbase/mainwindow.cpp

@@ -333,7 +333,7 @@ void MainWindow::savePresetSettings(Preset* preset, int tabIndex)
 void MainWindow::createStatusBar()
 {
     QString qtVersionStr = QString("Qt %1 ").arg(QT_VERSION_STR);
-    m_showSystemWidget = new QLabel("SDRangel v2.0.0 " + qtVersionStr + QSysInfo::prettyProductName(), this);
+    m_showSystemWidget = new QLabel("SDRangel v2.0.1 " + qtVersionStr + QSysInfo::prettyProductName(), this);
     statusBar()->addPermanentWidget(m_showSystemWidget);
 
 	m_dateTimeWidget = new QLabel(tr("Date"), this);

sdrbase/plugin/pluginmanager.cpp

@@ -382,7 +382,7 @@ void PluginManager::loadPlugins(const QDir& dir)
 
 	foreach (QString fileName, pluginsDir.entryList(QDir::Files))
 	{
-		if (fileName.endsWith(".so") || fileName.endsWith(".dll"))
+        if (fileName.endsWith(".so") || fileName.endsWith(".dll") || fileName.endsWith(".dylib"))
 		{
 			qDebug() << "PluginManager::loadPlugins: fileName: " << qPrintable(fileName);