Objective C sources for only macos should only be added to build under OSX

- moved to macos build config
- made jenkinsfile build much faster.

Jenkinsfile

@@ -0,0 +1,24 @@
+pipeline {
+  agent any
+  stages {
+    stage('Clean Up') {
+      steps {
+        sh '''cd xybrid
+make clean || true
+rm Makefile || true'''
+      }
+    }
+    stage('qmake') {
+      steps {
+        sh '''cd xybrid
+qmake'''
+      }
+    }
+    stage('Make') {
+      steps {
+        sh '''cd xybrid
+make -j 17'''
+      }
+    }
+  }
+}

xybrid/nodes/instrument/thicc.cpp

@@ -101,13 +101,14 @@ namespace {
 
 #pragma GCC diagnostic pop
 
+    // for clang on freebsd (and possibly other non-apple llvm sources) it seems we need to specify more.
     // wave function list(s)
-    const constexpr std::array waveFunc = {
+    const constexpr std::array<double(*)(double,double,double),3> waveFunc = {
         &oscSaw,
         &oscSine,
         &oscPulse,
     };
-    const std::array waveName = {
+    const std::array<QString,3> waveName = {
         qs("saw"),
         qs("sine"),
         qs("pulse"),

xybrid/ui/samplelistmodel.cpp

@@ -22,9 +22,10 @@ using namespace Xybrid::Editing;
 
 #include <QMenu>
 #include <QMessageBox>
-
+#include "util/macos_urlhelper.h"
 #include "mainwindow.h"
 
+
 SampleListModel::SampleListModel(QObject* parent, MainWindow* window) : QAbstractItemModel (parent) {
     this->window = window;
     root = std::make_shared<DirectoryNode>();
@@ -223,6 +224,7 @@ bool SampleListModel::canDropMimeData(const QMimeData *data, Qt::DropAction acti
     return data->hasUrls() || data->hasFormat("xybrid-internal/x-sample-entry-move");
 }
 
+
 bool SampleListModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row [[maybe_unused]], int column [[maybe_unused]], const QModelIndex &parent [[maybe_unused]]) {
     if (data->hasUrls()) {
         if (action == Qt::IgnoreAction) return true; // can accept type
@@ -232,7 +234,16 @@ bool SampleListModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
         if (!tdn->isDirectory()) tdn = tdn->parent;
         QString p = tdn->path();
 
+
         QList<QUrl> urls = data->urls();
+#ifdef Q_OS_MAC
+        QList<QUrl> localUrls;
+        foreach (const QUrl &url, urls) {
+            QUrl localUrl = fromNSUrl(url);
+            localUrls.append(localUrl);
+            urls = localUrls;
+        }
+#endif
         bool success = false;
         for (auto u : urls) {
             if (!u.isLocalFile()) continue;

xybrid/util/macos_urlhelper.h

@@ -0,0 +1,10 @@
+#ifdef __APPLE__
+#ifndef MACOS_URLHELPER_H
+#define MACOS_URLHELPER_H
+
+#include <QUrl>
+
+QUrl fromNSUrl(const QUrl &url);
+
+#endif // MACOS_URLHELPER_H
+#endif

xybrid/util/macos_urlhelper.mm

@@ -0,0 +1,11 @@
+#ifdef __APPLE__
+#include "macos_urlhelper.h"
+#include <Foundation/Foundation.h>
+
+QUrl fromNSUrl(const QUrl &url) {
+    NSURL *nsUrl = url.toNSURL();
+    NSString *path = nsUrl.path;
+    QString qtString = QString::fromNSString(path);
+    return QUrl::fromLocalFile(qtString);
+}
+#endif

xybrid/xybrid.pro

@@ -37,17 +37,25 @@ HEADERS += $$files(*.h, true) \
 FORMS += $$files(*.ui, true)
 RESOURCES += res/resources.qrc
 
-unix:!macx {
 
+
+
+freebsd-clang {
+    DEFINES += WITH_BOOST
+    LIBS += -lboost_math_tr1
 }
 
 macx: {
     DEFINES += WITH_BOOST
     LIBS += -L/usr/local/Cellar/boost/1.70.0/lib/ -lboost_math_tr1
     LIBS    += -framework OpenGL
+    LIBS    += -framework Foundation
+    SOURCES += util/macos_urlhelper.mm
+    HEADERS += util/macos_urlhelper.h
     QMAKE_CXXFLAGS += -I/usr/local/Cellar/boost/1.70.0/include/
 }
 
+
 # TODO: make this work.
 CONFIG (boost) {
     DEFINES += WITH_BOOST