[Audacity-cvs] audacity-src/src AudioIO.cpp,1.213,1.214

[Leland Lucius]

Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2840

Modified Files:
        AudioIO.cpp 
Log Message:
Fix up the MIDI device names.


Index: AudioIO.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- AudioIO.cpp 25 Jun 2009 00:23:55 -0000      1.213
+++ AudioIO.cpp 25 Jun 2009 04:27:26 -0000      1.214
@@ -1011,8 +1011,14 @@
       for (i = 0; i < Pm_CountDevices(); i++) {
          const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
          if (!info) continue;
-         if (wxStrcmp(LAT1CTOWX(info->name), playbackDeviceName) == 0)
+         wxString interf(info->interf, wxConvLocal);
+         wxString name(info->name, wxConvLocal);
+         wxString device = wxString::Format(wxT("%s: %s"),
+                                            interf.c_str(),
+                                            name.c_str());
+        if (wxStrcmp(device, playbackDeviceName) == 0) {
             playbackDevice = i;
+         }
       }
    } // (else playback device has Pm_GetDefaultOuputDeviceID())
 


------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs