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

Remove portaudio.h and portmixer.h from AudioIOBase.h

Browse Source
This commit is contained in:
Paul Licameli 2020-06-12 11:39:18 -04:00
parent 4ac96376bb
commit c84a2d295d
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AudioIO.cpp
View File

@ -436,6 +436,8 @@ time warp info and AudioIOListener and whether the playback is looped.
#include <alloca.h>
#endif
#include "portaudio.h"
#if USE_PORTMIXER
#include "portmixer.h"
#endif
@ -4459,7 +4461,7 @@ int AudioIoCallback::AudioCallback(const void *inputBuffer, void *outputBuffer,
return mCallbackReturn;
}
PaStreamCallbackResult AudioIoCallback::CallbackDoSeek()
int AudioIoCallback::CallbackDoSeek()
{
const int token = mStreamToken;
wxMutexLocker locker(mSuspendAudioThread);

6
src/AudioIO.h
View File

@ -60,6 +60,10 @@ class WaveTrack;
using WaveTrackArray = std::vector < std::shared_ptr < WaveTrack > >;
using WaveTrackConstArray = std::vector < std::shared_ptr < const WaveTrack > >;
struct PaStreamCallbackTimeInfo;
typedef unsigned long PaStreamCallbackFlags;
typedef int PaError;
bool ValidateDeviceNames();
#define MAX_MIDI_BUFFER_SIZE 5000
@ -248,7 +252,7 @@ public:
void SetListener( const std::shared_ptr< AudioIOListener > &listener);
// Part of the callback
PaStreamCallbackResult CallbackDoSeek();
int CallbackDoSeek();
// Part of the callback
void CallbackCheckCompletion(

6
src/AudioIOBase.h
View File

@ -21,10 +21,12 @@ Paul Licameli split from AudioIO.h
#include <vector>
#include <wx/string.h>
#include <wx/weakref.h> // member variable
#include "portaudio.h"
struct PaDeviceInfo;
typedef void PaStream;
#if USE_PORTMIXER
#include "../lib-src/portmixer/include/portmixer.h"
typedef void PxMixer;
#endif
class AudioIOBase;