audio redesign

.clang-format-ignore

@@ -1,3 +1,4 @@
 # exclude third party code from clang-format checks
 ./libs
 ./windows/nsProcess
+./windows/ASIOSDK2

.gitignore

@@ -5,9 +5,10 @@ Makefile
 *.pro.user*
 **.cppe
 **.he
+.vs
 .cproject
 .project
-.settings
+.settings           
 .idea
 .vscode
 .cache
@@ -42,7 +43,18 @@ distributions/fluidsynth*
 distributions/jamulus.desktop
 distributions/jamulus-server.desktop
 .xcode
+*.xcodeproj
+._*
+*.bak
+*.log
 Debug-iphoneos/
 Jamulus.xcodeproj
 jamulus_plugin_import.cpp
 autoLatestChangelog.md
+*.pro.user
+*.pro.user.*
+*.sln
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+Jamulus*.ps1

Jamulus.pro

@@ -1,4 +1,4 @@
-VERSION = 3.8.2rc1dev
+VERSION = 3.8.2dev
 
 # use target name which does not use a capital letter at the beginning
 contains(CONFIG, "noupcasename") {
@@ -66,17 +66,19 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
 DEFINES += QT_NO_DEPRECATED_WARNINGS
 
 win32 {
-    DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
+    DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)  pgScorpio: is this still valid ??? asiolist.cpp no longer exists!
     DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
-    HEADERS += windows/sound.h
-    SOURCES += windows/sound.cpp \
-        windows/ASIOSDK2/common/asio.cpp \
-        windows/ASIOSDK2/host/asiodrivers.cpp \
-        windows/ASIOSDK2/host/pc/asiolist.cpp
+    INCLUDEPATH += windows/ASIOSDK2/common
+    HEADERS += \
+        windows/ASIOSDK2/common/asio.h \
+        windows/ASIOSDK2/common/iasiodrv.h \
+        windows/asiosys.h \
+        windows/asiodriver.h \
+        windows/sound.h
+    SOURCES += \
+        windows/asiodriver.cpp \
+        windows/sound.cpp
     RC_FILE = windows/mainicon.rc
-    INCLUDEPATH += windows/ASIOSDK2/common \
-        windows/ASIOSDK2/host \
-        windows/ASIOSDK2/host/pc
     mingw* {
         LIBS += -lole32 \
             -luser32 \
@@ -114,8 +116,10 @@ win32 {
 
         HEADERS -= windows/sound.h
         SOURCES -= windows/sound.cpp
-        HEADERS += linux/sound.h
-        SOURCES += linux/sound.cpp
+        HEADERS += linux/sound.h \
+        linux/jackclient.h
+        SOURCES += linux/sound.cpp \
+        linux/jackclient.cpp
         DEFINES += WITH_JACK
         DEFINES += JACK_REPLACES_ASIO
         DEFINES += _STDINT_H # supposed to solve compilation error in systemdeps.h
@@ -137,10 +141,10 @@ win32 {
     }
 
     QT += macextras
-    HEADERS += mac/sound.h
-    SOURCES += mac/sound.cpp
-    HEADERS += mac/activity.h
-    OBJECTIVE_SOURCES += mac/activity.mm
+    HEADERS += mac/activity.h \
+        mac/sound.h
+    SOURCES +=  mac/sound.cpp
+ OBJECTIVE_SOURCES += mac/activity.mm
     CONFIG += x86
     QMAKE_TARGET_BUNDLE_PREFIX = io.jamulus
     QMAKE_APPLICATION_BUNDLE_NAME. = $$TARGET
@@ -184,8 +188,10 @@ win32 {
 
         HEADERS -= mac/sound.h
         SOURCES -= mac/sound.cpp
-        HEADERS += linux/sound.h
-        SOURCES += linux/sound.cpp
+        HEADERS += linux/sound.h \
+        linux/jackclient.h
+        SOURCES += linux/sound.cpp \
+        linux/jackclient.cpp
         DEFINES += WITH_JACK
         DEFINES += JACK_REPLACES_COREAUDIO
         INCLUDEPATH += /usr/local/include
@@ -349,8 +355,10 @@ win32 {
     # unnecessarily without this workaround (#741):
     QMAKE_LFLAGS += -Wl,--as-needed
 
-    HEADERS += linux/sound.h
-    SOURCES += linux/sound.cpp
+    HEADERS += linux/sound.h \
+    linux/jackclient.h
+    SOURCES += linux/sound.cpp \
+    linux/jackclient.cpp
 
     # we assume to have lrintf() one moderately modern linux distributions
     # would be better to have that tested, though

JamulusWin-README.md

@@ -0,0 +1,25 @@
+JamulusWin.* files for builing the windows version using visual studio 2019 (by pgScorpio)
+
+#==================================================================================================
+# WARNING: 
+#   The vcx project files in this folder are heavily modified to make them movable.
+#   DO NOT REGENERATE VCX FILES FROM Qt!
+#   When the Jamulus pro file is changed, the vcx files need (often manual) editing too!
+#
+#   In Visual Studio NEVER use ABSOLUTE PATHS but always use the appropriate variables.
+#   In Visual Studio NEVER use PERSONAL PATHS but always use appropriate environment variables. 
+#   
+#   Do NOT directly open the JamulusWin.vcxproj or JamulusWin.sln files by double-clicking !
+#   ALWAYS start Visual studio using this script from Powershell using./JamulusWin.ps1 --startvs
+#==================================================================================================
+
+
+JamulusWin.ps1 is a PowerShell script to setup the environment needed for builing with Visual Studio.
+JamulusWin.ps1 also handles all Custom Build Steps during building of the project. (Modify when needed.)
+
+Run ./JamulusWin.ps1 without parameters for command options info.
+
+You should check the variables defined in JamulusWin.ps1 to reflect your Qt installation 
+
+You can modify the 'User Defined functions' in JamulusWin.ps1 if needed.
+