Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-03 17:39:25 +02:00
Code Issues Releases Wiki Activity

Make EXPERIMENTAL_MIDI_IN compilable

Browse Source
This commit is contained in:
Paul Licameli 2019-04-03 16:30:41 -04:00
parent be737fd2c0
commit a768ff177e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Experimental.h
View File

@ -143,6 +143,8 @@
// Paul Licameli (PRL) 29 Nov 2014 // Paul Licameli (PRL) 29 Nov 2014
// #define EXPERIMENTAL_IMPROVED_SEEKING // #define EXPERIMENTAL_IMPROVED_SEEKING
//#define EXPERIMENTAL_MIDI_IN
// RBD, 1 Sep 2008 // RBD, 1 Sep 2008
// Enables MIDI Output of NoteTrack (MIDI) data during playback // Enables MIDI Output of NoteTrack (MIDI) data during playback
// USE_MIDI must be defined in order for EXPERIMENTAL_MIDI_OUT to work // USE_MIDI must be defined in order for EXPERIMENTAL_MIDI_OUT to work

8
src/prefs/MidiIOPrefs.cpp
View File

@ -189,11 +189,11 @@ void MidiIOPrefs::OnHost(wxCommandEvent & WXUNUSED(e))
mPlay->Clear(); mPlay->Clear();
#ifdef EXPERIMENTAL_MIDI_IN #ifdef EXPERIMENTAL_MIDI_IN
mRecord->clear(); mRecord->Clear();
#endif #endif
wxArrayStringEx playnames; wxArrayStringEx playnames;
wxArrayString recordnames; wxArrayStringEx recordnames;
for (int i = 0; i < nDevices; i++) { for (int i = 0; i < nDevices; i++) {
const PmDeviceInfo *info = Pm_GetDeviceInfo(i); const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
@ -227,7 +227,7 @@ void MidiIOPrefs::OnHost(wxCommandEvent & WXUNUSED(e))
mPlay->Append(playnames[0], (void *) NULL); mPlay->Append(playnames[0], (void *) NULL);
} }
#ifdef EXPERIMENTAL_MIDI_IN #ifdef EXPERIMENTAL_MIDI_IN
if (mRecord->size() == 0) { if (mRecord->GetCount() == 0) {
recordnames.push_back(_("No devices found")); recordnames.push_back(_("No devices found"));
mRecord->Append(recordnames[0], (void *) NULL); mRecord->Append(recordnames[0], (void *) NULL);
} }
@ -236,7 +236,7 @@ void MidiIOPrefs::OnHost(wxCommandEvent & WXUNUSED(e))
mPlay->SetSelection(0); mPlay->SetSelection(0);
} }
#ifdef EXPERIMENTAL_MIDI_IN #ifdef EXPERIMENTAL_MIDI_IN
if (mRecord->size() && mRecord->GetSelection() == wxNOT_FOUND) { if (mRecord->GetCount() && mRecord->GetSelection() == wxNOT_FOUND) {
mRecord->SetSelection(0); mRecord->SetSelection(0);
} }
#endif #endif