Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-24 06:10:09 +01:00
Code Issues Releases Wiki Activity

Fixes 2 VST issues, an RTP issue, and relaxes an AU restriction

Browse Source 
1)  Shell VSTs were completely unrecognized...that is no longer the case
2)  All VSTs will now ALWAYS be initialized and cleaned up from the main
    GUI thread.  I found that some Waves VSTs would freeze Audacity when
    initialized in the audio thread and closed in the GUI thread.
3)  While realtime previewing, it was possible that the wrong slave 
    could be used to process new blocks of audio.
4)  I found that the Waves AUs don't crash on a real Mac (instead of a
    virtual machine), so I removed the "black list" I'd put in just for
    them.  (Something to do with needing full 3D support I think.)

Anyway, #2 and #3 were quite intrusive, so as much RTP testing as possible
would be a good thing.
This commit is contained in:
lllucius@gmail.com
2015-01-02 05:24:43 +00:00
parent bec5866653
commit aa49817563
13 changed files with 700 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/AudioIO.cpp
View File

@@ -1386,7 +1386,26 @@ int AudioIO::StartStream(WaveTrackArray playbackTracks,
#if defined(EXPERIMENTAL_REALTIME_EFFECTS)
if (mNumPlaybackChannels > 0)
{
EffectManager::Get().RealtimeInitialize();
EffectManager & em = EffectManager::Get();
em.RealtimeInitialize();
// The following adds a new effect processor for each logical track and the
// group determination should mimic what is done in audacityAudioCallback()
// when calling RealtimeProcess().
int group = 0;
for (size_t i = 0, cnt = mPlaybackTracks.GetCount(); i < cnt; i++)
{
WaveTrack *vt = gAudioIO->mPlaybackTracks[i];
int chanCnt = 1;
if (vt->GetLinked())
{
i++;
chanCnt++;
}
em.RealtimeAddProcessor(group++, chanCnt, vt->GetRate());
}
}
#endif
@@ -1482,7 +1501,10 @@ int AudioIO::StartStream(WaveTrackArray playbackTracks,
void AudioIO::StartStreamCleanup(bool bOnlyBuffers)
{
#if defined(EXPERIMENTAL_REALTIME_EFFECTS)
EffectManager::Get().RealtimeFinalize();
if (mNumPlaybackChannels > 0)
{
EffectManager::Get().RealtimeFinalize();
}
#endif
if(mPlaybackBuffers)
@@ -1689,7 +1711,10 @@ void AudioIO::StopStream()
#if defined(EXPERIMENTAL_REALTIME_EFFECTS)
// No longer need effects processing
EffectManager::Get().RealtimeFinalize();
if (mNumPlaybackChannels > 0)
{
EffectManager::Get().RealtimeFinalize();
}
#endif
//
@@ -3607,6 +3632,11 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
tempBufs[c] = (float *) alloca(framesPerBuffer * sizeof(float));
}
#if defined(EXPERIMENTAL_REALTIME_EFFECTS)
EffectManager & em = EffectManager::Get();
em.RealtimeProcessStart();
#endif
bool selected = false;
int group = 0;
int chanCnt = 0;
@@ -3690,7 +3720,10 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
#if defined(EXPERIMENTAL_REALTIME_EFFECTS)
if( !cut && selected )
len = EffectManager::Get().RealtimeProcess(group++, chanCnt, rate, tempBufs, len);
{
len = em.RealtimeProcess(group, chanCnt, tempBufs, len);
}
group++;
#endif
// If our buffer is empty and the time indicator is past
// the end, then we've actually finished playing the entire
@@ -3750,6 +3783,10 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
chanCnt = 0;
}
#if defined(EXPERIMENTAL_REALTIME_EFFECTS)
em.RealtimeProcessEnd();
#endif
gAudioIO->mLastPlaybackTimeMillis = ::wxGetLocalTimeMillis();
//