Update of /cvsroot/audacity/audacity-src/src/prefs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2840/prefs
Modified Files:
MidiIOPrefs.cpp
Log Message:
Fix up the MIDI device names.
Index: MidiIOPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/MidiIOPrefs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MidiIOPrefs.cpp 25 Jun 2009 03:58:00 -0000 1.4
+++ MidiIOPrefs.cpp 25 Jun 2009 04:27:26 -0000 1.5
@@ -265,12 +265,12 @@
for (int i = 0; i < nDevices; i++) {
const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
- wxString name(info->interf, wxConvLocal);
- if (itemAtIndex.IsSameAs(name)) {
+ wxString interf(info->interf, wxConvLocal);
+ if (itemAtIndex.IsSameAs(interf)) {
wxString name(info->name, wxConvLocal);
wxString device = wxString::Format(wxT("%s: %s"),
- info->interf,
- info->name);
+ interf.c_str(),
+ name.c_str());
int index;
if (info->output) {
@@ -385,16 +385,16 @@
if (info) {
gPrefs->Write(wxT("/MidiIO/PlaybackDevice"),
wxString::Format(wxT("%s: %s"),
- info->interf,
- info->name));
+ wxString(info->interf,
wxConvLocal).c_str(),
+ wxString(info->name,
wxConvLocal).c_str()));
}
info = (const PmDeviceInfo *)
mRecord->GetClientData(mRecord->GetSelection());
if (info) {
gPrefs->Write(wxT("/MidiIO/RecordingDevice"),
wxString::Format(wxT("%s: %s"),
- info->interf,
- info->name));
+ wxString(info->interf,
wxConvLocal).c_str(),
+ wxString(info->name,
wxConvLocal).c_str()));
}
/*
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
