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

Merge branch 'master' into Sequence

Browse Source
This commit is contained in:
Paul Licameli 2016-02-11 12:35:52 -05:00
commit 9ebaf1b94d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AudioIO.cpp
View File

@ -1107,8 +1107,13 @@ void AudioIO::HandleDeviceChange()
return; return;
// get the selected record and playback devices // get the selected record and playback devices
int playDeviceNum = getPlayDevIndex(); const int playDeviceNum = getPlayDevIndex();
int recDeviceNum = getRecordDevIndex(); const int recDeviceNum = getRecordDevIndex();
// If no change needed, return
if (mCachedPlaybackIndex == playDeviceNum &&
mCachedCaptureIndex == recDeviceNum)
return;
// cache playback/capture rates // cache playback/capture rates
mCachedPlaybackRates = GetSupportedPlaybackRates(playDeviceNum); mCachedPlaybackRates = GetSupportedPlaybackRates(playDeviceNum);

2
src/Theme.cpp
View File

@ -383,7 +383,7 @@ void ThemeBase::RegisterImage( int &iIndex, const wxImage &Image, const wxString
wxASSERT( iIndex == -1 ); // Don't initialise same bitmap twice! wxASSERT( iIndex == -1 ); // Don't initialise same bitmap twice!
mImages.Add( Image ); mImages.Add( Image );
#ifdef __WXMAC__ #ifdef __APPLE__
// On Mac, bitmaps with alpha don't work. // On Mac, bitmaps with alpha don't work.
// So we convert to a mask and use that. // So we convert to a mask and use that.
// It isn't quite as good, as alpha gives smoother edges. // It isn't quite as good, as alpha gives smoother edges.