Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-30 15:39:27 +02:00
Code Issues Releases Wiki Activity

Adrian Wadey's changes to get MIDI_OUT to compile again.

Browse Source
This commit is contained in:
james.k.crook@gmail.com 2014-10-14 12:09:58 +00:00
parent c68351706b
commit 166a17506d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AudioIO.cpp
View File

@ -312,7 +312,7 @@ writing audio.
#define ROUND(x) (int) ((x)+0.5) #define ROUND(x) (int) ((x)+0.5)
//#include <string.h> //#include <string.h>
#include "portmidi.h" #include "portmidi.h"
#include "common/pa_util.h" #include "../lib-src/portaudio-v19/src/common/pa_util.h"
#include "NoteTrack.h" #include "NoteTrack.h"
#endif #endif
@ -3282,7 +3282,14 @@ static void DoSoftwarePlaythrough(const void *inputBuffer,
int audacityAudioCallback(const void *inputBuffer, void *outputBuffer, int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
unsigned long framesPerBuffer, unsigned long framesPerBuffer,
// If there were more of these conditionally used arguments, it
// could make sense to make a new macro that looks like this:
// USEDIF( EXPERIMENTAL_MIDI_OUT, timeInfo )
#ifdef EXPERIMENTAL_MIDI_OUT
const PaStreamCallbackTimeInfo *timeInfo,
#else
const PaStreamCallbackTimeInfo * WXUNUSED(timeInfo), const PaStreamCallbackTimeInfo * WXUNUSED(timeInfo),
#endif
const PaStreamCallbackFlags WXUNUSED(statusFlags), void * WXUNUSED(userData) ) const PaStreamCallbackFlags WXUNUSED(statusFlags), void * WXUNUSED(userData) )
{ {
int numPlaybackChannels = gAudioIO->mNumPlaybackChannels; int numPlaybackChannels = gAudioIO->mNumPlaybackChannels;