iOS sound support 2

Jamulus.pro

@@ -186,12 +186,8 @@ win32 {
     OBJECTIVE_SOURCES += ios/sound.mm
     QMAKE_TARGET_BUNDLE_PREFIX = com.jamulussoftware.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

android/sound.cpp

@@ -345,3 +345,36 @@ void CSound::Stats::log() const
              << "frames_in: " << frames_in << ",frames_out: " << frames_out << ",frames_filled_out: " << frames_filled_out
              << ",in_callback_calls: " << in_callback_calls << ",out_callback_calls: " << out_callback_calls << ",ring_overrun: " << ring_overrun;
 }
+
+void CSound::SetInputDeviceId ( int deviceid ) // 0 for external device (auto to be exact)
+{
+    closeStream ( mRecordingStream );
+
+    oboe::AudioStreamBuilder inBuilder;
+
+    // Setup input stream
+    inBuilder.setDirection ( oboe::Direction::Input );
+
+    // Only set callback for the input direction
+    // the output will be handled writing directly on the stream
+    inBuilder.setCallback ( this );
+    setupCommonStreamParams ( &inBuilder );
+
+    if ( inBuilder.isAAudioSupported() )
+        inBuilder.setAudioApi ( oboe::AudioApi::AAudio );
+
+    inBuilder.setDeviceId ( deviceid );
+    oboe::Result result = inBuilder.openManagedStream ( mRecordingStream );
+    if ( result != oboe::Result::OK )
+    {
+        inBuilder.setDeviceId ( oboe::kUnspecified );
+        result = inBuilder.openManagedStream ( mRecordingStream );
+    }
+
+    mRecordingStream->setBufferSizeInFrames ( iOboeBufferSizeStereo );
+
+    warnIfNotLowLatency ( mRecordingStream, "RecordStream" );
+    printStreamDetails ( mRecordingStream );
+
+    mRecordingStream->requestStart();
+}

android/sound.h

@@ -49,6 +49,7 @@ class CSound : public CSoundBase, public oboe::AudioStreamCallback
     virtual int  Init ( const int iNewPrefMonoBufferSize );
     virtual void Start();
     virtual void Stop();
+    virtual void SetInputDeviceId ( int deviceid );
 
     // Call backs for Oboe
     virtual oboe::DataCallbackResult onAudioReady ( oboe::AudioStream* oboeStream, void* audioData, int32_t numFrames );

ios/Info.plist

@@ -6,6 +6,10 @@
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -29,19 +33,25 @@
 	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UILaunchScreen</key>
 	<dict/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
-		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

ios/sound.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  ann0see based on code from Volker Fischer
+ *  ann0see and ngocdh based on code from Volker Fischer
  *
  ******************************************************************************
  *
@@ -23,13 +23,12 @@
 \******************************************************************************/
 
 #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
@@ -44,64 +43,20 @@ class CSound : public CSoundBase
     virtual int  Init ( const int iNewPrefMonoBufferSize );
     virtual void Start();
     virtual void Stop();
+    virtual void processBufferList ( AudioBufferList*, CSound* );
+    virtual void SetInputDeviceId ( int deviceid );
 
-    // 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 );
-
-    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];
-
     QMutex Mutex;
 };