Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-12 14:11:10 +02:00
Code Issues Releases Wiki Activity

MIDI_OUT on by default on windows.

Browse Source 
The idea is to get SOME use and test of MIDI_OUT even though it does not compile on Linux yet.
This commit is contained in:
James Crook 2017-04-27 09:56:53 +01:00
parent 60a53d560b
commit 7f98672e22
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AudioIO.cpp
View File

@ -315,7 +315,7 @@ writing audio.
#define MIDI_SLEEP 10 /* milliseconds */ #define MIDI_SLEEP 10 /* milliseconds */
#define ROUND(x) (int) ((x)+0.5) #define ROUND(x) (int) ((x)+0.5)
//#include <string.h> //#include <string.h>
#include "portmidi.h" #include "../lib-src/portmidi/pm_common/portmidi.h"
#include "../lib-src/portaudio-v19/src/common/pa_util.h" #include "../lib-src/portaudio-v19/src/common/pa_util.h"
#include "NoteTrack.h" #include "NoteTrack.h"
#endif #endif

10
src/AudioIO.h
View File

@ -23,10 +23,12 @@
#ifdef USE_MIDI #ifdef USE_MIDI
// TODO: Put the relative paths into automake.
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
#include "portmidi.h" #include "../lib-src/portmidi/pm_common/portmidi.h"
#include "porttime.h" #include "../lib-src/portmidi/porttime/porttime.h"
#include "allegro.h" #include "../lib-src/portsmf/allegro.h"
class NoteTrack; class NoteTrack;
using NoteTrackArray = std::vector < NoteTrack* >; using NoteTrackArray = std::vector < NoteTrack* >;
@ -36,7 +38,7 @@ using NoteTrackArray = std::vector < NoteTrack* >;
#endif // USE_MIDI #endif // USE_MIDI
#if USE_PORTMIXER #if USE_PORTMIXER
#include "portmixer.h" #include "../lib-src/portmixer/include/portmixer.h"
#endif #endif
#include <wx/event.h> #include <wx/event.h>

4
src/Experimental.h
View File

@ -114,7 +114,9 @@
// 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
#ifdef USE_MIDI #ifdef USE_MIDI
//#define EXPERIMENTAL_MIDI_OUT #ifdef __WXMSW__
#define EXPERIMENTAL_MIDI_OUT
#endif
#endif #endif
// USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work // USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work

2
src/NoteTrack.cpp
View File

@ -37,7 +37,7 @@
#include "InconsistencyException.h" #include "InconsistencyException.h"
#ifdef SONIFY #ifdef SONIFY
#include "portmidi.h" #include "../lib-src/portmidi/pm_common/portmidi.h"
#define SON_PROGRAM 0 #define SON_PROGRAM 0
#define SON_AutoSave 67 #define SON_AutoSave 67

2
src/prefs/MidiIOPrefs.cpp
View File

@ -32,7 +32,7 @@ other settings.
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/intl.h> #include <wx/intl.h>
#include "portmidi.h" #include "../../lib-src/portmidi/pm_common/portmidi.h"
#include "../AudioIO.h" #include "../AudioIO.h"
#include "../Internat.h" #include "../Internat.h"