mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Rewrote all internal OSX obj-C classes as dynamically-created classes. A side-effect of this is that plugins will no longer suffer from obj-C name-collision problems, and the old JUCE_ObjCExtraSuffix value is no longer needed.
This commit is contained in:
jules
parent
2cf53557f6
commit
ac1d6955e7
24 changed files with 2497 additions and 2726 deletions
|
|
@ -108,7 +108,6 @@ namespace juce
|
|||
|
||||
#if JUCE_MAC || JUCE_IOS
|
||||
#include "../juce_core/native/juce_osx_ObjCHelpers.h"
|
||||
#include "../juce_core/native/juce_mac_ObjCSuffix.h"
|
||||
|
||||
#if JUCE_USE_CAMERA
|
||||
#include "native/juce_mac_CameraDevice.mm"
|
||||
|
|
|
|||
|
|
@ -27,51 +27,21 @@
|
|||
#error "On the Mac, cameras use Quicktime, so if you turn on JUCE_USE_CAMERA, you also need to enable JUCE_QUICKTIME"
|
||||
#endif
|
||||
|
||||
//==============================================================================
|
||||
#define QTCaptureCallbackDelegate MakeObjCClassName(QTCaptureCallbackDelegate)
|
||||
|
||||
class QTCameraDeviceInteral;
|
||||
|
||||
} // (juce namespace)
|
||||
|
||||
@interface QTCaptureCallbackDelegate : NSObject
|
||||
{
|
||||
@public
|
||||
CameraDevice* owner;
|
||||
QTCameraDeviceInteral* internal;
|
||||
int64 firstPresentationTime;
|
||||
int64 averageTimeOffset;
|
||||
}
|
||||
|
||||
- (QTCaptureCallbackDelegate*) initWithOwner: (CameraDevice*) owner internalDev: (QTCameraDeviceInteral*) d;
|
||||
- (void) dealloc;
|
||||
|
||||
- (void) captureOutput: (QTCaptureOutput*) captureOutput
|
||||
didOutputVideoFrame: (CVImageBufferRef) videoFrame
|
||||
withSampleBuffer: (QTSampleBuffer*) sampleBuffer
|
||||
fromConnection: (QTCaptureConnection*) connection;
|
||||
|
||||
- (void) captureOutput: (QTCaptureFileOutput*) captureOutput
|
||||
didOutputSampleBuffer: (QTSampleBuffer*) sampleBuffer
|
||||
fromConnection: (QTCaptureConnection*) connection;
|
||||
@end
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
||||
extern Image juce_createImageFromCIImage (CIImage* im, int w, int h);
|
||||
|
||||
//==============================================================================
|
||||
class QTCameraDeviceInteral
|
||||
class QTCameraDeviceInternal
|
||||
{
|
||||
public:
|
||||
QTCameraDeviceInteral (CameraDevice* owner, const int index)
|
||||
QTCameraDeviceInternal (CameraDevice* owner, const int index)
|
||||
: input (nil),
|
||||
audioDevice (nil),
|
||||
audioInput (nil),
|
||||
session (nil),
|
||||
fileOutput (nil),
|
||||
imageOutput (nil)
|
||||
imageOutput (nil),
|
||||
firstPresentationTime (0),
|
||||
averageTimeOffset (0)
|
||||
{
|
||||
JUCE_AUTORELEASEPOOL
|
||||
|
||||
|
|
@ -79,8 +49,10 @@ public:
|
|||
|
||||
NSArray* devs = [QTCaptureDevice inputDevicesWithMediaType: QTMediaTypeVideo];
|
||||
device = (QTCaptureDevice*) [devs objectAtIndex: index];
|
||||
callbackDelegate = [[QTCaptureCallbackDelegate alloc] initWithOwner: owner
|
||||
internalDev: this];
|
||||
|
||||
static DelegateClass cls;
|
||||
callbackDelegate = [cls.createInstance() init];
|
||||
DelegateClass::setOwner (callbackDelegate, this);
|
||||
|
||||
NSError* err = nil;
|
||||
[device retain];
|
||||
|
|
@ -112,7 +84,7 @@ public:
|
|||
DBG (openingError);
|
||||
}
|
||||
|
||||
~QTCameraDeviceInteral()
|
||||
~QTCameraDeviceInternal()
|
||||
{
|
||||
[session stopRunning];
|
||||
[session removeOutput: imageOutput];
|
||||
|
|
@ -194,6 +166,33 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void captureBuffer (QTSampleBuffer* sampleBuffer)
|
||||
{
|
||||
const Time now (Time::getCurrentTime());
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
NSNumber* hosttime = (NSNumber*) [sampleBuffer attributeForKey: QTSampleBufferHostTimeAttribute];
|
||||
#else
|
||||
NSNumber* hosttime = (NSNumber*) [sampleBuffer attributeForKey: nsStringLiteral ("hostTime")];
|
||||
#endif
|
||||
|
||||
int64 presentationTime = (hosttime != nil)
|
||||
? ((int64) AudioConvertHostTimeToNanos ([hosttime unsignedLongLongValue]) / 1000000 + 40)
|
||||
: (([sampleBuffer presentationTime].timeValue * 1000) / [sampleBuffer presentationTime].timeScale + 50);
|
||||
|
||||
const int64 timeDiff = now.toMilliseconds() - presentationTime;
|
||||
|
||||
if (firstPresentationTime == 0)
|
||||
{
|
||||
firstPresentationTime = presentationTime;
|
||||
averageTimeOffset = timeDiff;
|
||||
}
|
||||
else
|
||||
{
|
||||
averageTimeOffset = (averageTimeOffset * 120 + timeDiff * 8) / 128;
|
||||
}
|
||||
}
|
||||
|
||||
QTCaptureDevice* device;
|
||||
QTCaptureDeviceInput* input;
|
||||
QTCaptureDevice* audioDevice;
|
||||
|
|
@ -201,87 +200,69 @@ public:
|
|||
QTCaptureSession* session;
|
||||
QTCaptureMovieFileOutput* fileOutput;
|
||||
QTCaptureDecompressedVideoOutput* imageOutput;
|
||||
QTCaptureCallbackDelegate* callbackDelegate;
|
||||
NSObject* callbackDelegate;
|
||||
String openingError;
|
||||
int64 firstPresentationTime;
|
||||
int64 averageTimeOffset;
|
||||
|
||||
Array<CameraDevice::Listener*> listeners;
|
||||
CriticalSection listenerLock;
|
||||
|
||||
private:
|
||||
//==============================================================================
|
||||
struct DelegateClass : public ObjCClass <NSObject>
|
||||
{
|
||||
DelegateClass() : ObjCClass ("JUCEAppDelegate_")
|
||||
{
|
||||
addIvar<QTCameraDeviceInternal*> ("owner");
|
||||
|
||||
addMethod (@selector (captureOutput:didOutputVideoFrame:withSampleBuffer:fromConnection:),
|
||||
didOutputVideoFrame, "v@:@", @encode (CVImageBufferRef), "@@");
|
||||
addMethod (@selector (captureOutput:didOutputSampleBuffer:fromConnection:),
|
||||
didOutputVideoFrame, "v@:@@@");
|
||||
|
||||
registerClass();
|
||||
}
|
||||
|
||||
static void setOwner (id self, QTCameraDeviceInternal* owner)
|
||||
{
|
||||
object_setInstanceVariable (self, "owner", owner);
|
||||
}
|
||||
|
||||
private:
|
||||
static QTCameraDeviceInternal* getOwner (id self)
|
||||
{
|
||||
return getIvar<QTCameraDeviceInternal*> (self, "owner");
|
||||
}
|
||||
|
||||
static void didOutputVideoFrame (id self, SEL, QTCaptureOutput* captureOutput,
|
||||
CVImageBufferRef videoFrame, QTSampleBuffer* sampleBuffer,
|
||||
QTCaptureConnection* connection)
|
||||
{
|
||||
QTCameraDeviceInternal* const internal = getOwner (self);
|
||||
|
||||
if (internal->listeners.size() > 0)
|
||||
{
|
||||
JUCE_AUTORELEASEPOOL
|
||||
|
||||
internal->callListeners ([CIImage imageWithCVImageBuffer: videoFrame],
|
||||
CVPixelBufferGetWidth (videoFrame),
|
||||
CVPixelBufferGetHeight (videoFrame));
|
||||
}
|
||||
}
|
||||
|
||||
static void didOutputSampleBuffer (id self, SEL, QTCaptureFileOutput*, QTSampleBuffer* sampleBuffer, QTCaptureConnection*)
|
||||
{
|
||||
getOwner (self)->captureBuffer (sampleBuffer);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
} // (juce namespace)
|
||||
|
||||
@implementation QTCaptureCallbackDelegate
|
||||
|
||||
- (QTCaptureCallbackDelegate*) initWithOwner: (CameraDevice*) owner_
|
||||
internalDev: (QTCameraDeviceInteral*) d
|
||||
{
|
||||
[super init];
|
||||
owner = owner_;
|
||||
internal = d;
|
||||
firstPresentationTime = 0;
|
||||
averageTimeOffset = 0;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void) captureOutput: (QTCaptureOutput*) captureOutput
|
||||
didOutputVideoFrame: (CVImageBufferRef) videoFrame
|
||||
withSampleBuffer: (QTSampleBuffer*) sampleBuffer
|
||||
fromConnection: (QTCaptureConnection*) connection
|
||||
{
|
||||
if (internal->listeners.size() > 0)
|
||||
{
|
||||
JUCE_AUTORELEASEPOOL
|
||||
|
||||
internal->callListeners ([CIImage imageWithCVImageBuffer: videoFrame],
|
||||
CVPixelBufferGetWidth (videoFrame),
|
||||
CVPixelBufferGetHeight (videoFrame));
|
||||
}
|
||||
}
|
||||
|
||||
- (void) captureOutput: (QTCaptureFileOutput*) captureOutput
|
||||
didOutputSampleBuffer: (QTSampleBuffer*) sampleBuffer
|
||||
fromConnection: (QTCaptureConnection*) connection
|
||||
{
|
||||
const Time now (Time::getCurrentTime());
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
NSNumber* hosttime = (NSNumber*) [sampleBuffer attributeForKey: QTSampleBufferHostTimeAttribute];
|
||||
#else
|
||||
NSNumber* hosttime = (NSNumber*) [sampleBuffer attributeForKey: nsStringLiteral ("hostTime")];
|
||||
#endif
|
||||
|
||||
int64 presentationTime = (hosttime != nil)
|
||||
? ((int64) AudioConvertHostTimeToNanos ([hosttime unsignedLongLongValue]) / 1000000 + 40)
|
||||
: (([sampleBuffer presentationTime].timeValue * 1000) / [sampleBuffer presentationTime].timeScale + 50);
|
||||
|
||||
const int64 timeDiff = now.toMilliseconds() - presentationTime;
|
||||
|
||||
if (firstPresentationTime == 0)
|
||||
{
|
||||
firstPresentationTime = presentationTime;
|
||||
averageTimeOffset = timeDiff;
|
||||
}
|
||||
else
|
||||
{
|
||||
averageTimeOffset = (averageTimeOffset * 120 + timeDiff * 8) / 128;
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
||||
//==============================================================================
|
||||
class QTCaptureViewerComp : public NSViewComponent
|
||||
{
|
||||
public:
|
||||
QTCaptureViewerComp (CameraDevice* const cameraDevice, QTCameraDeviceInteral* const internal)
|
||||
QTCaptureViewerComp (CameraDevice* const cameraDevice, QTCameraDeviceInternal* const internal)
|
||||
{
|
||||
JUCE_AUTORELEASEPOOL
|
||||
captureView = [[QTCaptureView alloc] init];
|
||||
|
|
@ -306,19 +287,19 @@ CameraDevice::CameraDevice (const String& name_, int index)
|
|||
: name (name_)
|
||||
{
|
||||
isRecording = false;
|
||||
internal = new QTCameraDeviceInteral (this, index);
|
||||
internal = new QTCameraDeviceInternal (this, index);
|
||||
}
|
||||
|
||||
CameraDevice::~CameraDevice()
|
||||
{
|
||||
stopRecording();
|
||||
delete static_cast <QTCameraDeviceInteral*> (internal);
|
||||
delete static_cast <QTCameraDeviceInternal*> (internal);
|
||||
internal = nullptr;
|
||||
}
|
||||
|
||||
Component* CameraDevice::createViewerComponent()
|
||||
{
|
||||
return new QTCaptureViewerComp (this, static_cast <QTCameraDeviceInteral*> (internal));
|
||||
return new QTCaptureViewerComp (this, static_cast <QTCameraDeviceInternal*> (internal));
|
||||
}
|
||||
|
||||
String CameraDevice::getFileExtension()
|
||||
|
|
@ -330,8 +311,8 @@ void CameraDevice::startRecordingToFile (const File& file, int quality)
|
|||
{
|
||||
stopRecording();
|
||||
|
||||
QTCameraDeviceInteral* const d = static_cast <QTCameraDeviceInteral*> (internal);
|
||||
d->callbackDelegate->firstPresentationTime = 0;
|
||||
QTCameraDeviceInternal* const d = static_cast <QTCameraDeviceInternal*> (internal);
|
||||
d->firstPresentationTime = 0;
|
||||
file.deleteFile();
|
||||
|
||||
// In some versions of QT (e.g. on 10.5), if you record video without audio, the speed comes
|
||||
|
|
@ -367,9 +348,9 @@ void CameraDevice::startRecordingToFile (const File& file, int quality)
|
|||
|
||||
Time CameraDevice::getTimeOfFirstRecordedFrame() const
|
||||
{
|
||||
QTCameraDeviceInteral* const d = static_cast <QTCameraDeviceInteral*> (internal);
|
||||
if (d->callbackDelegate->firstPresentationTime != 0)
|
||||
return Time (d->callbackDelegate->firstPresentationTime + d->callbackDelegate->averageTimeOffset);
|
||||
QTCameraDeviceInternal* const d = static_cast <QTCameraDeviceInternal*> (internal);
|
||||
if (d->firstPresentationTime != 0)
|
||||
return Time (d->firstPresentationTime + d->averageTimeOffset);
|
||||
|
||||
return Time();
|
||||
}
|
||||
|
|
@ -378,7 +359,7 @@ void CameraDevice::stopRecording()
|
|||
{
|
||||
if (isRecording)
|
||||
{
|
||||
static_cast <QTCameraDeviceInteral*> (internal)->resetFile();
|
||||
static_cast <QTCameraDeviceInternal*> (internal)->resetFile();
|
||||
isRecording = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -386,13 +367,13 @@ void CameraDevice::stopRecording()
|
|||
void CameraDevice::addListener (Listener* listenerToAdd)
|
||||
{
|
||||
if (listenerToAdd != nullptr)
|
||||
static_cast <QTCameraDeviceInteral*> (internal)->addListener (listenerToAdd);
|
||||
static_cast <QTCameraDeviceInternal*> (internal)->addListener (listenerToAdd);
|
||||
}
|
||||
|
||||
void CameraDevice::removeListener (Listener* listenerToRemove)
|
||||
{
|
||||
if (listenerToRemove != nullptr)
|
||||
static_cast <QTCameraDeviceInteral*> (internal)->removeListener (listenerToRemove);
|
||||
static_cast <QTCameraDeviceInternal*> (internal)->removeListener (listenerToRemove);
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
|
|
@ -418,7 +399,7 @@ CameraDevice* CameraDevice::openDevice (int index,
|
|||
{
|
||||
ScopedPointer <CameraDevice> d (new CameraDevice (getAvailableDevices() [index], index));
|
||||
|
||||
if (static_cast <QTCameraDeviceInteral*> (d->internal)->openingError.isEmpty())
|
||||
if (static_cast <QTCameraDeviceInternal*> (d->internal)->openingError.isEmpty())
|
||||
return d.release();
|
||||
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -25,49 +25,31 @@
|
|||
|
||||
#if JUCE_QUICKTIME
|
||||
|
||||
} // (juce namespace)
|
||||
|
||||
//==============================================================================
|
||||
#define NonInterceptingQTMovieView MakeObjCClassName(NonInterceptingQTMovieView)
|
||||
|
||||
@interface NonInterceptingQTMovieView : QTMovieView
|
||||
struct NonInterceptingQTMovieViewClass : public ObjCClass <QTMovieView>
|
||||
{
|
||||
}
|
||||
NonInterceptingQTMovieViewClass() : ObjCClass ("JUCEQTMovieView_")
|
||||
{
|
||||
addMethod (@selector (hitTest:), hitTest, "@@:", @encode (NSPoint));
|
||||
addMethod (@selector (acceptsFirstMouse:), acceptsFirstMouse, "c@:@");
|
||||
|
||||
- (id) initWithFrame: (NSRect) frame;
|
||||
- (BOOL) acceptsFirstMouse: (NSEvent*) theEvent;
|
||||
- (NSView*) hitTest: (NSPoint) p;
|
||||
registerClass();
|
||||
}
|
||||
|
||||
@end
|
||||
private:
|
||||
static NSView* hitTest (id self, SEL, NSPoint point)
|
||||
{
|
||||
if (! [(QTMovieView*) self isControllerVisible])
|
||||
return nil;
|
||||
|
||||
@implementation NonInterceptingQTMovieView
|
||||
objc_super s = { self, [QTMovieView class] };
|
||||
return objc_msgSendSuper (&s, @selector (hitTest:), point);
|
||||
}
|
||||
|
||||
- (id) initWithFrame: (NSRect) frame
|
||||
{
|
||||
self = [super initWithFrame: frame];
|
||||
[self setNextResponder: [self superview]];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (NSView*) hitTest: (NSPoint) point
|
||||
{
|
||||
return [self isControllerVisible] ? [super hitTest: point] : nil;
|
||||
}
|
||||
|
||||
- (BOOL) acceptsFirstMouse: (NSEvent*) theEvent
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
namespace juce
|
||||
{
|
||||
static BOOL acceptsFirstMouse (id, SEL, NSEvent*)
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
};
|
||||
|
||||
//==============================================================================
|
||||
#define theMovie (static_cast <QTMovie*> (movie))
|
||||
|
|
@ -79,8 +61,10 @@ QuickTimeMovieComponent::QuickTimeMovieComponent()
|
|||
setOpaque (true);
|
||||
setVisible (true);
|
||||
|
||||
QTMovieView* view = [[NonInterceptingQTMovieView alloc] initWithFrame: NSMakeRect (0, 0, 100.0f, 100.0f)];
|
||||
static NonInterceptingQTMovieViewClass cls;
|
||||
QTMovieView* view = [cls.createInstance() initWithFrame: NSMakeRect (0, 0, 100.0f, 100.0f)];
|
||||
setView (view);
|
||||
[view setNextResponder: [view superview]];
|
||||
[view setWantsLayer: YES]; // prevents the view failing to redraw correctly when paused.
|
||||
[view release];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue