Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 15:23:48 +01:00
Code Issues Releases Wiki Activity

Applying patch from bug #766

Browse Source 
This patch fixes the corrupted device names as 
documented by the bug report.
This commit is contained in:
lllucius@gmail.com
2014-12-06 05:05:21 +00:00
parent 71d8b0d8ec
commit 9317bbb3f7
6 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/prefs/MidiIOPrefs.cpp
View File

@@ -100,7 +100,7 @@ void MidiIOPrefs::GetNamesAndLabels() {
for (int i = 0; i < nDevices; i++) {
const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
if (info->output || info->input) { //should always happen
wxString name(info->interf, wxConvLocal);
wxString name = wxSafeConvertMB2WX(info->interf);
if (mHostNames.Index(name) == wxNOT_FOUND) {
mHostNames.Add(name);
mHostLabels.Add(name);
@@ -195,9 +195,9 @@ void MidiIOPrefs::OnHost(wxCommandEvent & e)
for (int i = 0; i < nDevices; i++) {
const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
wxString interf(info->interf, wxConvLocal);
wxString interf = wxSafeConvertMB2WX(info->interf);
if (itemAtIndex.IsSameAs(interf)) {
wxString name(info->name, wxConvLocal);
wxString name = wxSafeConvertMB2WX(info->name);
wxString device = wxString::Format(wxT("%s: %s"),
interf.c_str(),
name.c_str());
@@ -259,16 +259,16 @@ bool MidiIOPrefs::Apply()
if (info) {
gPrefs->Write(wxT("/MidiIO/PlaybackDevice"),
wxString::Format(wxT("%s: %s"),
wxString(info->interf, wxConvLocal).c_str(),
wxString(info->name, wxConvLocal).c_str()));
wxString(wxSafeConvertMB2WX(info->interf)).c_str(),
wxString(wxSafeConvertMB2WX(info->name)).c_str()));
}
#ifdef EXPERIMENTAL_MIDI_IN
info = (const PmDeviceInfo *) mRecord->GetClientData(mRecord->GetSelection());
if (info) {
gPrefs->Write(wxT("/MidiIO/RecordingDevice"),
wxString::Format(wxT("%s: %s"),
wxString(info->interf, wxConvLocal).c_str(),
wxString(info->name, wxConvLocal).c_str()));
wxString(wxSafeConvertMB2WX(info->interf)).c_str(),
wxString(wxSafeConvertMB2WX(info->name)).c_str()));
}
#endif
return gPrefs->Flush();