iOS sound support

Jamulus.pro

@@ -196,12 +196,8 @@ win32 {
     OBJECTIVE_SOURCES += ios/sound.mm
     QMAKE_TARGET_BUNDLE_PREFIX = io.jamulus
     QMAKE_APPLICATION_BUNDLE_NAME. = $$TARGET
-    LIBS += -framework CoreFoundation \
-        -framework CoreServices \
-        -framework AVFoundation \
-        -framework CoreMIDI \
-        -framework AudioToolbox \
-        -framework Foundation
+    LIBS += -framework AVFoundation \
+        -framework AudioToolbox
 } else:android {
     # we want to compile with C++14
     CONFIG += c++14

ios/Info.plist

@@ -29,6 +29,10 @@
 	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UILaunchScreen</key>
 	<dict/>
 	<key>UILaunchStoryboardName</key>

ios/ios_app_delegate.mm

@@ -1,4 +1,3 @@
-
 #import "ios_app_delegate.h"
 
 @interface QIOSApplicationDelegate ()
@@ -7,10 +6,8 @@ @interface QIOSApplicationDelegate ()
 
 @implementation QIOSApplicationDelegate
 
-
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
+- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
+{
     return YES;
 }
 @end

ios/sound.h

@@ -1,8 +1,8 @@
 /******************************************************************************\
- * Copyright (c) 2004-2020
+ * Copyright (c) 2004-2021
  *
  * Author(s):
- *  ann0see based on code from Volker Fischer
+ *  ann0see and ngocdh based on code from Volker Fischer
  *
  ******************************************************************************
  *
@@ -23,13 +23,11 @@
 \******************************************************************************/
 
 #pragma once
-#include <CoreMIDI/CoreMIDI.h>
-#include <QMutex>
-#include <QMessageBox>
 #include "soundbase.h"
 #include "global.h"
 
-/* Classes ********************************************************************/
+#import <AudioToolbox/AudioToolbox.h>
+
 class CSound : public CSoundBase
 {
     Q_OBJECT
@@ -40,68 +38,36 @@ class CSound : public CSoundBase
              const QString& strMIDISetup,
              const bool,
              const QString& );
+    ~CSound();
 
     virtual int  Init ( const int iNewPrefMonoBufferSize );
     virtual void Start();
     virtual void Stop();
+    virtual void processBufferList ( AudioBufferList*, CSound* );
 
-    // channel selection
-    virtual int     GetNumInputChannels() { return iNumInChanPlusAddChan; }
-    virtual QString GetInputChannelName ( const int iDiD ) { return sChannelNamesInput[iDiD]; }
-    virtual void    SetLeftInputChannel ( const int iNewChan );
-    virtual void    SetRightInputChannel ( const int iNewChan );
-    virtual int     GetLeftInputChannel() { return iSelInputLeftChannel; }
-    virtual int     GetRightInputChannel() { return iSelInputRightChannel; }
-
-    virtual int     GetNumOutputChannels() { return iNumOutChan; }
-    virtual QString GetOutputChannelName ( const int iDiD ) { return sChannelNamesOutput[iDiD]; }
-    virtual void    SetLeftOutputChannel ( const int iNewChan );
-    virtual void    SetRightOutputChannel ( const int iNewChan );
-    virtual int     GetLeftOutputChannel() { return iSelOutputLeftChannel; }
-    virtual int     GetRightOutputChannel() { return iSelOutputRightChannel; }
+    AudioUnit audioUnit;
 
     // these variables/functions should be protected but cannot since we want
     // to access them from the callback function
     CVector<short> vecsTmpAudioSndCrdStereo;
     int            iCoreAudioBufferSizeMono;
     int            iCoreAudioBufferSizeStereo;
-    long           lCurDev;
-    int            iNumInChan;
-    int            iNumInChanPlusAddChan; // includes additional "added" channels
-    int            iNumOutChan;
-    int            iSelInputLeftChannel;
-    int            iSelInputRightChannel;
-    int            iSelOutputLeftChannel;
-    int            iSelOutputRightChannel;
-    int            iSelInBufferLeft;
-    int            iSelInBufferRight;
-    int            iSelInInterlChLeft;
-    int            iSelInInterlChRight;
-    int            iSelAddInBufferLeft;
-    int            iSelAddInBufferRight;
-    int            iSelAddInInterlChLeft;
-    int            iSelAddInInterlChRight;
-    int            iSelOutBufferLeft;
-    int            iSelOutBufferRight;
-    int            iSelOutInterlChLeft;
-    int            iSelOutInterlChRight;
-    CVector<int>   vecNumInBufChan;
-    CVector<int>   vecNumOutBufChan;
+    bool           isInitialized;
 
 protected:
     virtual QString LoadAndInitializeDriver ( QString strDriverName, bool );
+    void            GetAvailableInOutDevices();
+    void            SwitchDevice ( QString strDriverName );
 
-    QString CheckDeviceCapabilities ( const int iDriverIdx );
-    void    GetAvailableInOutDevices();
-
-    static void callbackMIDI ( const MIDIPacketList* pktlist, void* refCon, void* );
-
-    // AVAudioSession      audioSession;
-
-    MIDIPortRef midiInPortRef;
-
-    QString sChannelNamesInput[MAX_NUM_IN_OUT_CHANNELS];
-    QString sChannelNamesOutput[MAX_NUM_IN_OUT_CHANNELS];
+    AudioBuffer     buffer;
+    AudioBufferList bufferList;
+    void            checkStatus ( int status );
+    static OSStatus recordingCallback ( void*                       inRefCon,
+                                        AudioUnitRenderActionFlags* ioActionFlags,
+                                        const AudioTimeStamp*       inTimeStamp,
+                                        UInt32                      inBusNumber,
+                                        UInt32                      inNumberFrames,
+                                        AudioBufferList*            ioData );
 
     QMutex Mutex;
 };