From 02c0bcb1ac1b00a180a9cc6ff43579ae4f58cf00 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 22 Jan 2012 08:00:16 +0000
Subject: [PATCH] some fixes -> device string enumeration seems to work now

---
 mac/sound.cpp | 61 ++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/mac/sound.cpp b/mac/sound.cpp
index 8636d0b5..5116a380 100755
--- a/mac/sound.cpp
+++ b/mac/sound.cpp
@@ -113,47 +113,48 @@ CSound::CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* ar
 
     // always add system default devices for input and output as first entry
     lNumDevs = 0;
-    strDriverNames[lNumDevs] = "System Default Device";
+    strDriverNames[lNumDevs] = "System Default In/Out Devices";
     lNumDevs++;
-
 /*
     // add detected devices (also check for maximum allowed sound cards!)
+    //
+    // we add combined entries for input and output for each device so that we
+    // do not need two combo boxes in the GUI for input and output (therefore
+    // all possible combinations are required)
     for ( UInt32 i = 0; ( i < deviceCount ) && ( i < MAX_NUMBER_SOUND_CARDS - 1 ); i++ )
     {
+        for ( UInt32 j = 0; ( j < deviceCount ) && ( j < MAX_NUMBER_SOUND_CARDS - 1 ); j++ )
+        {
+            // get device infos for both current devices
+            QString strDevicName_i;
+            bool    bIsInput_i;
+            bool    bIsOutput_i;
+            QString strDevicName_j;
+            bool    bIsInput_j;
+            bool    bIsOutput_j;
 
-// TODO
-//for ( UInt32 j = 0; ( j < deviceCount ) && ( j < MAX_NUMBER_SOUND_CARDS - 1 ); j++ )
-//{
-//    if ( i != j )
-//    {
-//
-//    }
-//}
+            GetAudioDeviceInfos ( audioDevices[i],
+                                  strDevicName_i,
+                                  bIsInput_i,
+                                  bIsOutput_i );
 
+            GetAudioDeviceInfos ( audioDevices[j],
+                                  strDevicName_j,
+                                  bIsInput_j,
+                                  bIsOutput_j );
 
-        QString strDevicName;
-        bool    bIsInput;
-        bool    bIsOutput;
+            // check if i device is input and j device is output
+            if ( bIsInput_i && bIsOutput_j )
+            {
+                strDriverNames[lNumDevs] = "in: " +
+                    strDevicName_i + "/out: " +
+                    strDevicName_j;
 
-        GetAudioDeviceInfos ( audioDevices[i],
-                              strDevicName,
-                              bIsInput,
-                              bIsOutput );
-
-// TEST
-if ( bIsInput && bIsOutput )
-    strDriverNames[lNumDevs] = "in/out";
-else if ( !bIsInput && !bIsOutput )
-    strDriverNames[lNumDevs] = "";
-else if ( bIsInput )
-    strDriverNames[lNumDevs] = "in";
-else if ( bIsOutput )
-    strDriverNames[lNumDevs] = "out";
-
-        lNumDevs++;
+                lNumDevs++;
+            }
+        }
     }
 */
-
     OpenCoreAudio();
 
     // init device index as not initialized (invalid)