You've already forked libopenshot
mirror of
https://github.com/OpenShot/libopenshot.git
synced 2026-03-02 08:53:52 -08:00
Code changes for compatibility with JUCE 6.x
- Replace all juce::CriticalSection with std::recursive_mutex - Replace all juce::AudioSampleBuffer with juce::AudioBuffer<float> - Eliminate implicit reliance on 'using namespace juce;' - Replace OpenShotAudio.h includes with targeted juce modules
This commit is contained in:
@@ -391,7 +391,7 @@ std::shared_ptr<Frame> FrameMapper::GetFrame(int64_t requested_frame)
|
||||
if (final_frame) return final_frame;
|
||||
|
||||
// Create a scoped lock, allowing only a single thread to run the following code at one time
|
||||
const GenericScopedLock<CriticalSection> lock(getFrameCriticalSection);
|
||||
const std::lock_guard<std::recursive_mutex> lock(getFrameMutex);
|
||||
|
||||
// Find parent properties (if any)
|
||||
Clip *parent = (Clip *) ParentClip();
|
||||
@@ -649,7 +649,7 @@ void FrameMapper::Close()
|
||||
if (reader)
|
||||
{
|
||||
// Create a scoped lock, allowing only a single thread to run the following code at one time
|
||||
const GenericScopedLock<CriticalSection> lock(getFrameCriticalSection);
|
||||
const std::lock_guard<std::recursive_mutex> lock(getFrameMutex);
|
||||
|
||||
ZmqLogger::Instance()->AppendDebugMethod("FrameMapper::Close");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user