Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-22 15:20:15 +02:00
Code Issues Releases Wiki Activity

Detect whether ALSA is the portaudio host (possible only on Linux)

Browse Source
This commit is contained in:
Paul Licameli 2017-09-23 21:23:34 -04:00
parent 428f543677
commit a971dd5bb4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AudioIO.cpp
View File

@ -1678,6 +1678,12 @@ int AudioIO::StartStream(const ConstWaveTrackArray &playbackTracks,
wxMilliSleep( 50 ); wxMilliSleep( 50 );
} }
#ifdef __WXGTK__
// Detect whether ALSA is the chosen host, and do the various involved MIDI
// timing compensations only then.
mUsingAlsa = (gPrefs->Read(wxT("/AudioIO/Host"), wxT("")) == "ALSA");
#endif
gPrefs->Read(wxT("/AudioIO/SWPlaythrough"), &mSoftwarePlaythrough, false); gPrefs->Read(wxT("/AudioIO/SWPlaythrough"), &mSoftwarePlaythrough, false);
gPrefs->Read(wxT("/AudioIO/SoundActivatedRecord"), &mPauseRec, false); gPrefs->Read(wxT("/AudioIO/SoundActivatedRecord"), &mPauseRec, false);
int silenceLevelDB; int silenceLevelDB;
@ -2033,8 +2039,7 @@ int AudioIO::StartStream(const ConstWaveTrackArray &playbackTracks,
// (Which we should be able to determine from fields of // (Which we should be able to determine from fields of
// PaStreamCallbackTimeInfo, but that seems not to work as documented with // PaStreamCallbackTimeInfo, but that seems not to work as documented with
// ALSA.) // ALSA.)
wxString hostName = gPrefs->Read(wxT("/AudioIO/Host"), wxT("")); if (mUsingAlsa)
if (hostName == "ALSA")
// Perhaps we should do this only if also playing MIDI ? // Perhaps we should do this only if also playing MIDI ?
PaAlsa_EnableRealtimeScheduling( mPortStreamV19, 1 ); PaAlsa_EnableRealtimeScheduling( mPortStreamV19, 1 );
#endif #endif

2
src/AudioIO.h
View File

@ -727,6 +727,8 @@ private:
const TimeTrack *mTimeTrack; const TimeTrack *mTimeTrack;
bool mUsingAlsa { false };
// For cacheing supported sample rates // For cacheing supported sample rates
static int mCachedPlaybackIndex; static int mCachedPlaybackIndex;
static wxArrayLong mCachedPlaybackRates; static wxArrayLong mCachedPlaybackRates;