Fixes a failure to keep the aspect ratio of the video when switching to full screen. Attempts to remedy a multi-video display when switching between camera and desktop streaming. Tries to fix a crash in the QTKit video capture on Mac OS X. Works on addressing a unnecessary remaining of the camera on Mac OS X open.

32 files changed, 88 insertions, 1708 deletions

diff --git a/lib/installer-exclude/fmj.jar b/lib/installer-exclude/fmj.jar
index 03d23a9..2c9c699 100644
--- a/lib/installer-exclude/fmj.jar
+++ b/lib/installer-exclude/fmj.jar
diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index d8fb21c..6f81cb2 100644
--- a/lib/installer-exclude/libjitsi.jar
+++ b/lib/installer-exclude/libjitsi.jar
diff --git a/lib/native/mac/libjnquicktime.jnilib b/lib/native/mac/libjnquicktime.jnilib
index 72f4d69..6ad0945 100755
--- a/lib/native/mac/libjnquicktime.jnilib
+++ b/lib/native/mac/libjnquicktime.jnilib
diff --git a/src/native/macosx/quicktime/common.h b/src/native/macosx/quicktime/common.h
deleted file mode 100644
index a8cecb3..0000000
--- a/src/native/macosx/quicktime/common.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#ifndef _IMPL_NEOMEDIA_QUICKTIME_COMMON_H_
-#define _IMPL_NEOMEDIA_QUICKTIME_COMMON_H_
-
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
-
-id NSObject_performSelector(id obj, NSString *selectorName);
-
-#endif /* _IMPL_NEOMEDIA_QUICKTIME_COMMON_H_ */
diff --git a/src/native/macosx/quicktime/common.m b/src/native/macosx/quicktime/common.m
deleted file mode 100644
index 134f597..0000000
--- a/src/native/macosx/quicktime/common.m
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "common.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSObject.h> /* NSSelectorFromString */
-#import <Foundation/NSString.h>
-
-id NSObject_performSelector(id obj, NSString *selectorName)
-{
-    NSAutoreleasePool *autoreleasePool;
-    SEL selector;
-    id ret;
-
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    selector = NSSelectorFromString(selectorName);
-    ret = [obj performSelector:selector];
-
-    [autoreleasePool release];
-    return ret;
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.h
deleted file mode 100644
index 3bef340..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
- * Method:    getByteCount
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getByteCount
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
- * Method:    getBytes
- * Signature: (J)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getBytes__J
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
- * Method:    getBytes
- * Signature: (JJI)I
- */
-JNIEXPORT jint JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getBytes__JJI
-  (JNIEnv *, jclass, jlong, jlong, jint);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
- * Method:    getHeight
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getHeight
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
- * Method:    getWidth
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getWidth
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer
- * Method:    memcpy
- * Signature: ([BIIJ)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_memcpy
-  (JNIEnv *, jclass, jbyteArray, jint, jint, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m
deleted file mode 100644
index 8a9ed94..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.h"
-
-#import <CoreVideo/CVPixelBuffer.h>
-#include <string.h>
-
-static size_t
-CVPixelBuffer_getByteCount(CVPixelBufferRef pixelBuffer, size_t planeCount)
-{
-    size_t byteCount;
-
-    if (planeCount)
-    {
-        size_t planeIndex;
-
-        byteCount = 0;
-        for (planeIndex = 0; planeIndex < planeCount; planeIndex++)
-        {
-            byteCount
-                += CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, planeIndex)
-                    * CVPixelBufferGetHeightOfPlane(pixelBuffer, planeIndex);
-        }
-    }
-    else
-    {
-        byteCount
-            = CVPixelBufferGetBytesPerRow(pixelBuffer)
-                * CVPixelBufferGetHeight(pixelBuffer);
-    }
-    return byteCount;
-}
-
-JNIEXPORT jint JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getByteCount
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    CVPixelBufferRef pixelBuffer;
-    size_t planeCount;
-
-    pixelBuffer = (CVPixelBufferRef) ptr;
-
-    planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
-    return (jint) CVPixelBuffer_getByteCount(pixelBuffer, planeCount);
-}
-
-JNIEXPORT jbyteArray JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getBytes__J
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    CVPixelBufferRef pixelBuffer;
-    size_t planeCount;
-    size_t byteCount;
-    jbyteArray bytes;
-
-    pixelBuffer = (CVPixelBufferRef) ptr;
-
-    planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
-    byteCount = CVPixelBuffer_getByteCount(pixelBuffer, planeCount);
-    bytes = (*jniEnv)->NewByteArray(jniEnv, byteCount);
-    if (!bytes)
-        return NULL;
-
-    if (kCVReturnSuccess == CVPixelBufferLockBaseAddress(pixelBuffer, 0))
-    {
-        jbyte *cBytes;
-
-        if (planeCount)
-        {
-            size_t byteOffset;
-            size_t planeIndex;
-
-            byteOffset = 0;
-            for (planeIndex = 0; planeIndex < planeCount; planeIndex++)
-            {
-                cBytes
-                    = CVPixelBufferGetBaseAddressOfPlane(
-                        pixelBuffer,
-                        planeIndex);
-                byteCount
-                    += CVPixelBufferGetBytesPerRowOfPlane(
-                            pixelBuffer,
-                            planeIndex)
-                        * CVPixelBufferGetHeightOfPlane(
-                                pixelBuffer,
-                                planeIndex);
-                (*jniEnv)
-                    ->SetByteArrayRegion(
-                        jniEnv,
-                        bytes,
-                        byteOffset,
-                        byteCount,
-                        cBytes);
-                byteOffset += byteCount;
-            }
-        }
-        else
-        {
-            cBytes = CVPixelBufferGetBaseAddress(pixelBuffer);
-            (*jniEnv)->SetByteArrayRegion(jniEnv, bytes, 0, byteCount, cBytes);
-        }
-        CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
-    }
-    return bytes;
-}
-
-JNIEXPORT jint JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getBytes__JJI
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jlong buf, jint bufLength)
-{
-    CVPixelBufferRef pixelBuffer;
-    size_t byteCount;
-
-    pixelBuffer = (CVPixelBufferRef) ptr;
-
-    if (kCVReturnSuccess == CVPixelBufferLockBaseAddress(pixelBuffer, 0))
-    {
-        size_t planeCount;
-        jbyte *cBytes;
-
-        planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
-        byteCount = CVPixelBuffer_getByteCount(pixelBuffer, planeCount);
-
-        if (planeCount)
-        {
-            size_t byteOffset;
-            size_t planeIndex;
-
-            byteOffset = 0;
-            for (planeIndex = 0; planeIndex < planeCount; planeIndex++)
-            {
-                cBytes
-                    = CVPixelBufferGetBaseAddressOfPlane(
-                        pixelBuffer,
-                        planeIndex);
-                byteCount
-                    += CVPixelBufferGetBytesPerRowOfPlane(
-                            pixelBuffer,
-                            planeIndex)
-                        * CVPixelBufferGetHeightOfPlane(
-                                pixelBuffer,
-                                planeIndex);
-                memcpy((void *) buf, cBytes, byteCount);
-                byteOffset += byteCount;
-            }
-            byteCount = byteOffset;
-        }
-        else
-        {
-            cBytes = CVPixelBufferGetBaseAddress(pixelBuffer);
-            memcpy(buf, cBytes, byteCount);
-        }
-        CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
-    }
-    else
-        byteCount = 0;
-    return byteCount;
-}
-
-JNIEXPORT jint JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getHeight
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    return (jint) CVPixelBufferGetHeight((CVPixelBufferRef) ptr);
-}
-
-JNIEXPORT jint JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getWidth
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    return (jint) CVPixelBufferGetWidth((CVPixelBufferRef) ptr);
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_memcpy
-    (JNIEnv *jniEnv, jclass clazz,
-        jbyteArray dst, jint dstOffset, jint dstLength,
-        jlong src)
-{
-    (*jniEnv)->SetByteArrayRegion(
-            jniEnv,
-            dst, dstOffset, dstLength,
-            (jbyte *) src);
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.h
deleted file mode 100644
index f8f899e..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey
- * Method:    kCVPixelBufferHeightKey
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey_kCVPixelBufferHeightKey
-  (JNIEnv *, jclass);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey
- * Method:    kCVPixelBufferPixelFormatTypeKey
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey_kCVPixelBufferPixelFormatTypeKey
-  (JNIEnv *, jclass);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey
- * Method:    kCVPixelBufferWidthKey
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey_kCVPixelBufferWidthKey
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.m
deleted file mode 100644
index ae839d9..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.m
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey.h"
-
-#import <CoreVideo/CVPixelBuffer.h>
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey_kCVPixelBufferHeightKey
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    return (jlong) kCVPixelBufferHeightKey;
-}
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey_kCVPixelBufferPixelFormatTypeKey
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    return (jlong) kCVPixelBufferPixelFormatTypeKey;
-}
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBufferAttributeKey_kCVPixelBufferWidthKey
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    return (jlong) kCVPixelBufferWidthKey;
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.h
deleted file mode 100644
index 6579804..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary
- * Method:    intForKey
- * Signature: (JJ)I
- */
-JNIEXPORT jint JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary_intForKey
-  (JNIEnv *, jclass, jlong, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.m
deleted file mode 100644
index 935e18a..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.m
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSValue.h>
-
-JNIEXPORT jint JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_NSDictionary_intForKey
-  (JNIEnv *jniEnv, jclass clazz, jlong ptr, jlong key)
-{
-    NSDictionary *dictionary;
-    NSAutoreleasePool *autoreleasePool;
-    NSNumber *value;
-    jint jvalue;
-
-    dictionary = (NSDictionary *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    value = [dictionary objectForKey:(id)key];
-    jvalue = value ? [value intValue] : 0;
-
-    [autoreleasePool release];
-    return jvalue;
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.h
deleted file mode 100644
index c5ef611..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary
- * Method:    allocAndInit
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary_allocAndInit
-  (JNIEnv *, jclass);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary
- * Method:    setIntForKey
- * Signature: (JIJ)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary_setIntForKey
-  (JNIEnv *, jclass, jlong, jint, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.m
deleted file mode 100644
index 1df2e38..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.m
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSValue.h>
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary_allocAndInit
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    NSAutoreleasePool *autoreleasePool;
-    NSMutableDictionary *mutableDictionary;
-
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    mutableDictionary = [[NSMutableDictionary alloc] init];
-
-    [autoreleasePool release];
-    return (jlong) mutableDictionary;
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_NSMutableDictionary_setIntForKey
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jint value, jlong key)
-{
-    NSMutableDictionary *mutableDictionary;
-    NSAutoreleasePool *autoreleasePool;
-
-    mutableDictionary = (NSMutableDictionary *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    [mutableDictionary setObject:[NSNumber numberWithInt:value] forKey:(id)key];
-
-    [autoreleasePool release];
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSObject.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSObject.h
deleted file mode 100644
index b9238f4..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSObject.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_NSObject */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_NSObject
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_NSObject
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_NSObject
- * Method:    release
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_NSObject_release
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_NSObject
- * Method:    retain
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_NSObject_retain
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSObject.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSObject.m
deleted file mode 100644
index 634d33f..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_NSObject.m
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_NSObject.h"
-
-#include "common.h"
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_NSObject_release
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    NSObject_performSelector((id) ptr, @"release");
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_NSObject_retain
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    NSObject_performSelector((id) ptr, @"retain");
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h
deleted file mode 100644
index 4a14ddf..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    allocAndInit
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_allocAndInit
-  (JNIEnv *, jclass);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    minimumVideoFrameInterval
- * Signature: (J)D
- */
-JNIEXPORT jdouble JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_minimumVideoFrameInterval
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    pixelBufferAttributes
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_pixelBufferAttributes
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    setAutomaticallyDropsLateVideoFrames
- * Signature: (JZ)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setAutomaticallyDropsLateVideoFrames
-  (JNIEnv *, jclass, jlong, jboolean);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    setDelegate
- * Signature: (JLnet/java/sip/communicator/impl/neomedia/quicktime/QTCaptureDecompressedVideoOutput/Delegate;)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setDelegate
-  (JNIEnv *, jclass, jlong, jobject);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    setMinimumVideoFrameInterval
- * Signature: (JD)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setMinimumVideoFrameInterval
-  (JNIEnv *, jclass, jlong, jdouble);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
- * Method:    setPixelBufferAttributes
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setPixelBufferAttributes
-  (JNIEnv *, jclass, jlong, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m
deleted file mode 100644
index 59e8037..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h"
-
-#import <CoreVideo/CVImageBuffer.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSObject.h>
-#import <QTKit/QTCaptureDecompressedVideoOutput.h>
-#import <QTKit/QTCaptureConnection.h>
-#import <QTKit/QTCaptureOutput.h>
-#import <QTKit/QTSampleBuffer.h>
-
-@interface QTCaptureDecompressedVideoOutputDelegate : NSObject
-{
-@private
-    jobject delegate;
-    JavaVM *vm;
-}
-
-- (void)captureOutput:(QTCaptureOutput *)captureOutput
-        didOutputVideoFrame:(CVImageBufferRef *)videoFrame
-        withSampleBuffer:(QTSampleBuffer *)sampleBuffer
-        fromConnection:(QTCaptureConnection *)connection;
-- (void)dealloc;
-- (id)init;
-- (void)setDelegate:(jobject)delegate inJNIEnv:(JNIEnv *)jniEnv;
-
-@end
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_allocAndInit
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    NSAutoreleasePool *autoreleasePool;
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    captureDecompressedVideoOutput
-        = [[QTCaptureDecompressedVideoOutput alloc] init];
-
-    [autoreleasePool release];
-    return (jlong) captureDecompressedVideoOutput;
-}
-
-JNIEXPORT jdouble JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_minimumVideoFrameInterval
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-    NSAutoreleasePool *autoreleasePool;
-    NSTimeInterval minimumVideoFrameInterval;
-
-    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    minimumVideoFrameInterval
-        = [captureDecompressedVideoOutput minimumVideoFrameInterval];
-
-    [autoreleasePool release];
-    return (jdouble) minimumVideoFrameInterval;
-}
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_pixelBufferAttributes
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-    NSAutoreleasePool *autoreleasePool;
-    NSDictionary *pixelBufferAttributes;
-
-    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    pixelBufferAttributes
-        = [captureDecompressedVideoOutput pixelBufferAttributes];
-    if (pixelBufferAttributes)
-        [pixelBufferAttributes retain];
-
-    [autoreleasePool release];
-    return (jlong) pixelBufferAttributes;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setAutomaticallyDropsLateVideoFrames
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr,
-        jboolean automaticallyDropsLateVideoFrames)
-{
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-    NSAutoreleasePool *autoreleasePool;
-
-    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    if ([captureDecompressedVideoOutput
-            respondsToSelector:@selector(setAutomaticallyDropsLateVideoFrames)])
-    {
-        [captureDecompressedVideoOutput
-            setAutomaticallyDropsLateVideoFrames:
-                ((JNI_TRUE == automaticallyDropsLateVideoFrames) ? YES : NO)];
-        automaticallyDropsLateVideoFrames
-            = [captureDecompressedVideoOutput automaticallyDropsLateVideoFrames];
-    }
-    else
-        automaticallyDropsLateVideoFrames = JNI_FALSE;
-
-    [autoreleasePool release];
-    return automaticallyDropsLateVideoFrames;
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setDelegate
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jobject delegate)
-{
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-    NSAutoreleasePool *autoreleasePool;
-    QTCaptureDecompressedVideoOutputDelegate *oDelegate;
-    id oPrevDelegate;
-
-    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    if (delegate)
-    {
-        oDelegate = [[QTCaptureDecompressedVideoOutputDelegate alloc] init];
-        [oDelegate setDelegate:delegate inJNIEnv:jniEnv];
-    }
-    else
-        oDelegate = nil;
-    oPrevDelegate = [captureDecompressedVideoOutput delegate];
-    if (oDelegate != oPrevDelegate)
-    {
-        [captureDecompressedVideoOutput setDelegate:oDelegate];
-        if (oPrevDelegate)
-            [oPrevDelegate release];
-    }
-
-    [autoreleasePool release];
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setMinimumVideoFrameInterval
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jdouble minimumVideoFrameInterval)
-{
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-    NSAutoreleasePool *autoreleasePool;
-
-    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    [captureDecompressedVideoOutput
-	    setMinimumVideoFrameInterval:(NSTimeInterval)minimumVideoFrameInterval];
-
-    [autoreleasePool release];
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setPixelBufferAttributes
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jlong pixelBufferAttributesPtr)
-{
-    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
-    NSDictionary *pixelBufferAttributes;
-    NSAutoreleasePool *autoreleasePool;
-
-    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
-    pixelBufferAttributes = (NSDictionary *) pixelBufferAttributesPtr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    [captureDecompressedVideoOutput
-        setPixelBufferAttributes:pixelBufferAttributes];
-
-    [autoreleasePool release];
-}
-
-@implementation QTCaptureDecompressedVideoOutputDelegate
-
-- (void)captureOutput:(QTCaptureOutput *)captureOutput
-        didOutputVideoFrame:(CVImageBufferRef *)videoFrame
-        withSampleBuffer:(QTSampleBuffer *)sampleBuffer
-        fromConnection:(QTCaptureConnection *)connection
-{
-    jobject delegate;
-    JavaVM *vm;
-    JNIEnv *jniEnv;
-    jclass delegateClass;
-
-    delegate = self->delegate;
-    if (!delegate)
-        return;
-
-    vm = self->vm;
-    if (0 != (*vm)->AttachCurrentThreadAsDaemon(vm, &jniEnv, NULL))
-        return;
-
-    delegateClass = (*jniEnv)->GetObjectClass(jniEnv, delegate);
-    if (delegateClass)
-    {
-        jmethodID didOutputVideoFrameWithSampleBufferMethodID;
-
-        didOutputVideoFrameWithSampleBufferMethodID
-            = (*jniEnv)
-                ->GetMethodID(
-                    jniEnv,
-                    delegateClass,
-                    "outputVideoFrameWithSampleBuffer",
-                    "(JJ)V");
-        if (didOutputVideoFrameWithSampleBufferMethodID)
-            (*jniEnv)
-                ->CallVoidMethod(
-                    jniEnv,
-                    delegate,
-                    didOutputVideoFrameWithSampleBufferMethodID,
-                    (jlong) videoFrame,
-                    (jlong) sampleBuffer);
-    }
-    (*jniEnv)->ExceptionClear(jniEnv);
-}
-
-- (void)dealloc
-{
-    [self setDelegate:NULL inJNIEnv:NULL];
-    [super dealloc];
-}
-
-- (id)init
-{
-    if ((self = [super init]))
-    {
-        self->delegate = NULL;
-        self->vm = NULL;
-    }
-    return self;
-}
-
-- (void)setDelegate:(jobject) delegate inJNIEnv:(JNIEnv *)jniEnv
-{
-    if (self->delegate)
-    {
-        if (!jniEnv)
-            (*(self->vm))->AttachCurrentThread(self->vm, &jniEnv, NULL);
-        (*jniEnv)->DeleteGlobalRef(jniEnv, self->delegate);
-        self->delegate = NULL;
-        self->vm = NULL;
-    }
-    if (delegate)
-    {
-        delegate = (*jniEnv)->NewGlobalRef(jniEnv, delegate);
-        if (delegate)
-        {
-            (*jniEnv)->GetJavaVM(jniEnv, &(self->vm));
-            self->delegate = delegate;
-        }
-    }
-}
-
-@end
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.h
deleted file mode 100644
index 60651b1..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    close
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_close
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    formatDescriptions
- * Signature: (J)[J
- */
-JNIEXPORT jlongArray JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_formatDescriptions
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    inputDevicesWithMediaType
- * Signature: (Ljava/lang/String;)[J
- */
-JNIEXPORT jlongArray JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_inputDevicesWithMediaType
-  (JNIEnv *, jclass, jstring);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    isConnected
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_isConnected
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    localizedDisplayName
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_localizedDisplayName
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    open
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_open
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice
- * Method:    uniqueID
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_uniqueID
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.m
deleted file mode 100644
index 373ef39..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.m
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice.h"
-
-#include "common.h"
-
-#include <string.h>
-
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSObject.h> /* NSSelectorFromString */
-#import <Foundation/NSString.h>
-#import <QTKit/QTCaptureDevice.h>
-#import <QTKit/QTFormatDescription.h>
-#import <QTKit/QTMedia.h>
-
-jstring QTCaptureDevice_getString(JNIEnv *, jlong, NSString *);
-NSString * QTCaptureDevice_jstringToMediaType(JNIEnv *, jobject);
-jlongArray QTCaptureDevice_nsArrayToJlongArray(JNIEnv *, NSArray *);
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_close
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    NSObject_performSelector((id) ptr, @"close");
-}
-
-JNIEXPORT jlongArray JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_formatDescriptions
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    QTCaptureDevice *captureDevice;
-    NSAutoreleasePool *autoreleasePool;
-    NSArray *formatDescriptions;
-    jlongArray formatDescriptionPtrs;
-
-    captureDevice = (QTCaptureDevice *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    formatDescriptions = [captureDevice formatDescriptions];
-    formatDescriptionPtrs
-        = QTCaptureDevice_nsArrayToJlongArray(jniEnv, formatDescriptions);
-
-    [autoreleasePool release];
-    return formatDescriptionPtrs;
-}
-
-JNIEXPORT jlongArray JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_inputDevicesWithMediaType
-    (JNIEnv *jniEnv, jclass clazz, jstring mediaType)
-{
-    NSAutoreleasePool *autoreleasePool;
-    NSArray *inputDevices;
-    jlongArray inputDevicePtrs;
-
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    inputDevices
-        = [QTCaptureDevice
-            inputDevicesWithMediaType:
-                QTCaptureDevice_jstringToMediaType(jniEnv, mediaType)];
-    inputDevicePtrs = QTCaptureDevice_nsArrayToJlongArray(jniEnv, inputDevices);
-
-    [autoreleasePool release];
-    return inputDevicePtrs;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_isConnected
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    return
-        (YES == (BOOL) NSObject_performSelector((id) ptr, @"isConnected"))
-            ? JNI_TRUE
-            : JNI_FALSE;
-}
-
-JNIEXPORT jstring JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_localizedDisplayName
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    return QTCaptureDevice_getString (jniEnv, ptr, @"localizedDisplayName");
-}
-
-JNIEXPORT jboolean JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_open
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    QTCaptureDevice *captureDevice;
-    NSAutoreleasePool *autoreleasePool;
-    BOOL ret;
-    NSError *error;
-
-    captureDevice = (QTCaptureDevice *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    ret = [captureDevice open:&error];
-
-    [autoreleasePool release];
-    return (YES == ret) ? JNI_TRUE : JNI_FALSE;
-}
-
-JNIEXPORT jstring JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDevice_uniqueID
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    return QTCaptureDevice_getString (jniEnv, ptr, @"uniqueID");
-}
-
-jstring
-QTCaptureDevice_getString(JNIEnv *jniEnv, jlong ptr, NSString *selectorName)
-{
-    id obj;
-    NSAutoreleasePool *autoreleasePool;
-    SEL selector;
-    NSString *str;
-    jstring jstr;
-
-    obj = (id) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    selector = NSSelectorFromString(selectorName);
-    if (selector)
-    {
-        str = [obj performSelector:selector];
-        jstr = str ? (*jniEnv)->NewStringUTF(jniEnv, [str UTF8String]) : NULL;
-    }
-    else
-        jstr = NULL;
-
-    [autoreleasePool release];
-    return jstr;
-}
-
-NSString *
-QTCaptureDevice_jstringToMediaType(JNIEnv *jniEnv, jstring str)
-{
-    const char *cstr;
-    NSString *mediaType;
-
-    cstr = (const char *) (*jniEnv)->GetStringUTFChars (jniEnv, str, NULL);
-    if (cstr)
-    {
-        if (0 == strcmp ("Muxed", cstr))
-            mediaType = QTMediaTypeMuxed;
-        else if (0 == strcmp ("Sound", cstr))
-            mediaType = QTMediaTypeSound;
-        else if (0 == strcmp ("Video", cstr))
-            mediaType = QTMediaTypeVideo;
-        else
-            mediaType = nil;
-        (*jniEnv)->ReleaseStringUTFChars (jniEnv, str, cstr);
-    }
-    else
-        mediaType = nil;
-    return mediaType;
-}
-
-jlongArray
-QTCaptureDevice_nsArrayToJlongArray(JNIEnv *jniEnv, NSArray *oArray)
-{
-    jlongArray jArray;
-
-    if (oArray)
-    {
-        NSUInteger count;
-
-        count = [oArray count];
-        jArray = (*jniEnv)->NewLongArray(jniEnv, count);
-        if (jArray)
-        {
-            NSUInteger i;
-
-            for (i = 0; i < count; i++)
-            {
-                id obj;
-                jlong ptr;
-
-                obj = [oArray objectAtIndex:i];
-                ptr = (jlong) obj;
-                (*jniEnv)->SetLongArrayRegion(jniEnv, jArray, i, 1, &ptr);
-                [obj retain];
-                if ((*jniEnv)->ExceptionCheck(jniEnv))
-                {
-                    NSUInteger j;
-
-                    for (j = 0; j < i; j++)
-                        [[oArray objectAtIndex:j] release];
-                    break;
-                }
-            }
-        }
-    }
-    else
-        jArray = NULL;
-    return jArray;
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.h
deleted file mode 100644
index 99a6bbf..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput
- * Method:    deviceInputWithDevice
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput_deviceInputWithDevice
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.m
deleted file mode 100644
index 28e0e1b..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.m
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput.h"
-
-#import <Foundation/NSException.h>
-#import <QTKit/QTCaptureDevice.h>
-#import <QTKit/QTCaptureDeviceInput.h>
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDeviceInput_deviceInputWithDevice
-    (JNIEnv *jniEnv, jclass clazz, jlong devicePtr)
-{
-    QTCaptureDevice *device;
-    NSAutoreleasePool *autoreleasePool;
-    id deviceInput;
-
-    device = (QTCaptureDevice *) devicePtr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    @try
-    {
-        deviceInput = [QTCaptureDeviceInput deviceInputWithDevice:device];
-    }
-    @catch (NSException *ex)
-    {
-        deviceInput = nil;
-    }
-    if (deviceInput)
-        [deviceInput retain];
-
-    [autoreleasePool release];
-    return (jlong) deviceInput;
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.h
deleted file mode 100644
index 49e2cfd..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
- * Method:    addInput
- * Signature: (JJ)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_addInput
-  (JNIEnv *, jclass, jlong, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
- * Method:    addOutput
- * Signature: (JJ)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_addOutput
-  (JNIEnv *, jclass, jlong, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
- * Method:    allocAndInit
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_allocAndInit
-  (JNIEnv *, jclass);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
- * Method:    startRunning
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_startRunning
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession
- * Method:    stopRunning
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_stopRunning
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.m
deleted file mode 100644
index 25a2acc..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.m
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession.h"
-
-#include "common.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSError.h>
-#import <QTKit/QTCaptureInput.h>
-#import <QTKit/QTCaptureOutput.h>
-#import <QTKit/QTCaptureSession.h>
-
-JNIEXPORT jboolean JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_addInput
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jlong inputPtr)
-{
-    QTCaptureSession *captureSession;
-    QTCaptureInput *input;
-    NSAutoreleasePool *autoreleasePool;
-    BOOL ret;
-    NSError *error;
-
-    captureSession = (QTCaptureSession *) ptr;
-    input = (QTCaptureInput *) inputPtr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    ret = [captureSession addInput:input error:&error];
-
-    [autoreleasePool release];
-    return (YES == ret) ? JNI_TRUE : JNI_FALSE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_addOutput
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jlong outputPtr)
-{
-    QTCaptureSession *captureSession;
-    QTCaptureOutput *output;
-    NSAutoreleasePool *autoreleasePool;
-    BOOL ret;
-    NSError *error;
-
-    captureSession = (QTCaptureSession *) ptr;
-    output = (QTCaptureOutput *) outputPtr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    ret = [captureSession addOutput:output error:&error];
-
-    [autoreleasePool release];
-    return (YES == ret) ? JNI_TRUE : JNI_FALSE;
-}
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_allocAndInit
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    NSAutoreleasePool *autoreleasePool;
-    QTCaptureSession *captureSession;
-
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    captureSession = [[QTCaptureSession alloc] init];
-
-    [autoreleasePool release];
-    return (jlong) captureSession;
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_startRunning
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    NSObject_performSelector((id) ptr, @"startRunning");
-}
-
-JNIEXPORT void JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureSession_stopRunning
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    NSObject_performSelector((id) ptr, @"stopRunning");
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.h
deleted file mode 100644
index 5a4f596..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription
- * Method:    sizeForKey
- * Signature: (JLjava/lang/String;)Ljava/awt/Dimension;
- */
-JNIEXPORT jobject JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription_sizeForKey
-  (JNIEnv *, jclass, jlong, jstring);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription
- * Method:    VideoEncodedPixelsSizeAttribute
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription_VideoEncodedPixelsSizeAttribute
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m
deleted file mode 100644
index d6cd791..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSGeometry.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
-#import <QTKit/QTFormatDescription.h>
-
-JNIEXPORT jobject JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription_sizeForKey
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jstring key)
-{
-    const char *cKey;
-    jobject size = NULL;
-
-    cKey = (const char *) (*jniEnv)->GetStringUTFChars(jniEnv, key, NULL);
-    if (cKey)
-    {
-        QTFormatDescription *formatDescription;
-        NSAutoreleasePool *autoreleasePool;
-        NSString *oKey;
-        NSValue *attribute;
-
-        formatDescription = (QTFormatDescription *) ptr;
-        autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-        oKey = [NSString stringWithUTF8String:cKey];
-        (*jniEnv)->ReleaseStringUTFChars(jniEnv, key, cKey);
-
-        attribute = [formatDescription attributeForKey:oKey];
-        if (attribute)
-        {
-            NSSize oSize;
-            jclass dimensionClass;
-
-            oSize = [attribute sizeValue];
-
-            dimensionClass = (*jniEnv)->FindClass(jniEnv, "java/awt/Dimension");
-            if (dimensionClass)
-            {
-                jmethodID dimensionCtorMethodID;
-
-                dimensionCtorMethodID
-                    = (*jniEnv)
-                        ->GetMethodID(
-                            jniEnv,
-                            dimensionClass,
-                            "<init>",
-                            "(II)V");
-                if (dimensionCtorMethodID)
-                    size
-                        = (*jniEnv)
-                            ->NewObject(
-                                jniEnv,
-                                dimensionClass,
-                                dimensionCtorMethodID,
-                                (jint) oSize.width,
-                                (jint) oSize.height);
-            }
-        }
-
-        [autoreleasePool release];
-    }
-    return size;
-}
-
-JNIEXPORT jstring JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription_VideoEncodedPixelsSizeAttribute
-    (JNIEnv *jniEnv, jclass clazz)
-{
-    NSAutoreleasePool *autoreleasePool;
-    jstring jstr;
-
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    jstr
-        = (*jniEnv)
-            ->NewStringUTF(
-                jniEnv,
-                [QTFormatDescriptionVideoEncodedPixelsSizeAttribute
-                    UTF8String]);
-
-    [autoreleasePool release];
-    return jstr;
-}
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.h
deleted file mode 100644
index bcdf2ed..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer */
-
-#ifndef _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer
-#define _Included_net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer
- * Method:    bytesForAllSamples
- * Signature: (J)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer_bytesForAllSamples
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer
- * Method:    formatDescription
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer_formatDescription
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.m
deleted file mode 100644
index 7afa45c..0000000
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.m
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <QTKit/QTFormatDescription.h>
-#import <QTKit/QTSampleBuffer.h>
-
-JNIEXPORT jbyteArray JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer_bytesForAllSamples
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    QTSampleBuffer *sampleBuffer;
-    NSAutoreleasePool *autoreleasePool;
-    NSUInteger lengthForAllSamples;
-    jbyteArray jBytesForAllSamples;
-
-    sampleBuffer = (QTSampleBuffer *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    lengthForAllSamples = [sampleBuffer lengthForAllSamples];
-    if (lengthForAllSamples)
-    {
-        jBytesForAllSamples
-            = (*jniEnv)->NewByteArray(jniEnv, lengthForAllSamples);
-        if (jBytesForAllSamples)
-        {
-            jbyte *bytesForAllSamples = [sampleBuffer bytesForAllSamples];
-
-            (*jniEnv)
-                ->SetByteArrayRegion(
-                    jniEnv,
-                    jBytesForAllSamples,
-                    0,
-                    lengthForAllSamples,
-                    bytesForAllSamples);
-        }
-    }
-    else
-        jBytesForAllSamples = NULL;
-
-    [autoreleasePool release];
-    return jBytesForAllSamples;
-}
-
-JNIEXPORT jlong JNICALL
-Java_net_java_sip_communicator_impl_neomedia_quicktime_QTSampleBuffer_formatDescription
-    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
-{
-    QTSampleBuffer *sampleBuffer;
-    NSAutoreleasePool *autoreleasePool;
-    QTFormatDescription *formatDescription;
-
-    sampleBuffer = (QTSampleBuffer *) ptr;
-    autoreleasePool = [[NSAutoreleasePool alloc] init];
-
-    formatDescription = [sampleBuffer formatDescription];
-    if (formatDescription)
-        [formatDescription retain];
-
-    [autoreleasePool release];
-    return (jlong) formatDescription;
-}
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/FullScreenLayout.java b/src/net/java/sip/communicator/impl/gui/main/call/FullScreenLayout.java
index d66fd23..34032b3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/FullScreenLayout.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/FullScreenLayout.java
@@ -7,11 +7,17 @@
 package net.java.sip.communicator.impl.gui.main.call;

 

 import java.awt.*;

+import java.util.*;

+import java.util.List;

 

 /**

- * @author Lubomir Marinov

+ * Implements a <tt>LayoutManager</tt> for the full-screen <tt>Call</tt>

+ * display.

+ *

+ * @author Lyubomir Marinov

  */

-public class FullScreenLayout implements LayoutManager

+public class FullScreenLayout

+    implements LayoutManager

 {

     public static final String CENTER = "CENTER";

 

@@ -19,10 +25,21 @@ public class FullScreenLayout implements LayoutManager
 

     private Component center;

 

+    /**

+     * The indicator which determines whether {@link #south} is to be laid out

+     * on top of {@link #center} i.e. as an overlay.

+     */

     private final boolean overlay;

 

     private Component south;

 

+    /**

+     * Initializes a new <tt>FullScreenLayout</tt> instance.

+     *

+     * @param overlay <tt>true</tt> to lay out the <tt>Component</tt> at

+     * {@link #SOUTH} on top of the <tt>Component</tt> at {@link #CENTER} i.e as

+     * an overlay; otherwise, <tt>false</tt>

+     */

     public FullScreenLayout(boolean overlay)

     {

         this.overlay = overlay;

@@ -31,44 +48,32 @@ public class FullScreenLayout implements LayoutManager
     public void addLayoutComponent(String name, Component comp)

     {

         if (CENTER.equals(name))

-        {

             center = comp;

-        }

         else if (SOUTH.equals(name))

-        {

             south = comp;

-        }

     }

 

-    private Component[] getLayoutComponents()

+    /**

+     * Gets a <tt>List</tt> of the <tt>Component</tt>s to be laid out by this

+     * <tt>LayoutManager</tt> i.e. the non-<tt>null</tt> of {@link #center}

+     * and {@link #south}.

+     *

+     * @return a <tt>List</tt> of the <tt>Component</tt>s to be laid out by this

+     * <tt>LayoutManager</tt>

+     */

+    private List<Component> getLayoutComponents()

     {

-        if (center == null)

-        {

-            if (south == null)

-            {

-                return new Component[0];

-            }

-            else

-            {

-                return new Component[]

-                { south };

-            }

-        }

-        else if (south == null)

-        {

-            return new Component[]

-            { center };

-        }

-        else

-        {

-            return new Component[]

-            { center, south };

-        }

+        List<Component> layoutComponents = new ArrayList<Component>(2);

+

+        if (center != null)

+            layoutComponents.add(center);

+        if (south != null)

+            layoutComponents.add(south);

+        return layoutComponents;

     }

 

     public void layoutContainer(Container parent)

     {

-        Dimension parentSize = parent.getSize();

         int southWidth;

         int southHeight;

 

@@ -84,23 +89,35 @@ public class FullScreenLayout implements LayoutManager
             southHeight = southSize.height;

         }

 

+        Dimension parentSize = parent.getSize();

+

         if (center != null)

         {

+            /*

+             * If the Component at the SOUTH is not to be shown as an overlay,

+             * make room for it bellow the Component at the CENTER.

+             */

             int yOffset = overlay ? 0 : southHeight;

 

-            center.setBounds(0, yOffset, parentSize.width, parentSize.height

-                - 2 * yOffset);

+            center.setBounds(

+                    0,

+                    0,

+                    parentSize.width,

+                    parentSize.height - yOffset);

         }

         if (south != null)

         {

-            south.setBounds((parentSize.width - southWidth) / 2,

-                parentSize.height - southHeight, southWidth, southHeight);

+            south.setBounds(

+                    (parentSize.width - southWidth) / 2,

+                    parentSize.height - southHeight,

+                    southWidth,

+                    southHeight);

         }

     }

 

     public Dimension minimumLayoutSize(Container parent)

     {

-        Component[] components = getLayoutComponents();

+        List<Component> components = getLayoutComponents();

         Dimension size = new Dimension(0, 0);

 

         for (Component component : components)

@@ -113,12 +130,12 @@ public class FullScreenLayout implements LayoutManager
             else

                 size.height += componentSize.height;

         }

-        return null;

+        return size;

     }

 

     public Dimension preferredLayoutSize(Container parent)

     {

-        Component[] components = getLayoutComponents();

+        List<Component> components = getLayoutComponents();

         Dimension size = new Dimension(0, 0);

 

         for (Component component : components)

@@ -131,18 +148,14 @@ public class FullScreenLayout implements LayoutManager
             else

                 size.height += componentSize.height;

         }

-        return null;

+        return size;

     }

 

     public void removeLayoutComponent(Component comp)

     {

         if (comp.equals(center))

-        {

             center = null;

-        }

         else if (comp.equals(south))

-        {

             south = null;

-        }

     }

 }

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java
index 6248e92..f67ea50 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java
@@ -221,39 +221,33 @@ public class OneToOneCallPanel
         CallPeerRendererUtils.setBackground(center, background);
 
         class FullScreenListener
-            implements ContainerListener, KeyListener, WindowStateListener
+            implements ContainerListener,
+                       KeyListener,
+                       WindowStateListener
         {
             public void componentAdded(ContainerEvent event)
             {
-                Component child = event.getChild();
-
-                child.addKeyListener(this);
+                event.getChild().addKeyListener(this);
             }
 
             public void componentRemoved(ContainerEvent event)
             {
-                Component child = event.getChild();
-
-                child.removeKeyListener(this);
+                event.getChild().removeKeyListener(this);
             }
 
             public void keyPressed(KeyEvent event)
             {
                 if (!event.isConsumed()
-                    && (event.getKeyCode() == KeyEvent.VK_ESCAPE))
+                        && (event.getKeyCode() == KeyEvent.VK_ESCAPE))
                 {
                     event.consume();
                     exitFullScreen();
                 }
             }
 
-            public void keyReleased(KeyEvent event)
-            {
-            }
+            public void keyReleased(KeyEvent event) {}
 
-            public void keyTyped(KeyEvent event)
-            {
-            }
+            public void keyTyped(KeyEvent event) {}
 
             public void windowStateChanged(WindowEvent event)
             {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
index 86ed449..0add775 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
@@ -51,13 +51,6 @@ public class OneToOneCallPeerPanel
     private static final long serialVersionUID = 0L;
 
     /**
-     * The <tt>Logger</tt> used by the <tt>OneToOneCallPeerPanel</tt> class and
-     * its instances for logging output.
-     */
-    private static final Logger logger
-        = Logger.getLogger(OneToOneCallPeerPanel.class);
-
-    /**
      * The <tt>CallPeerAdapter</tt> that implements all common tt>CallPeer</tt>
      * related listeners.
      */
@@ -114,7 +107,7 @@ public class OneToOneCallPeerPanel
     /**
      * The panel containing security related components.
      */
-    private SecurityPanel securityPanel;
+    private SecurityPanel<?> securityPanel;
 
     /**
      * The <tt>Icon</tt> which represents the avatar of the associated call
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java
index 22e9400..6ee3105 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java
@@ -64,29 +64,34 @@ public abstract class SecurityPanel<T extends SrtpControl>
      *         controller or an {@link TransparentPanel} if the controller is

      *         unknown or does not have any controls to show.

      */

-    public static SecurityPanel create( CallPeerRenderer peerRenderer,

-                                        CallPeer callPeer,

-                                        SrtpControl srtpControl)

+    public static SecurityPanel<?> create(

+            CallPeerRenderer peerRenderer,

+            CallPeer callPeer,

+            SrtpControl srtpControl)

     {

         if(srtpControl instanceof ZrtpControl)

-            return new ZrtpSecurityPanel(   peerRenderer,

-                                            callPeer,

-                                            (ZrtpControl)srtpControl);

-

-        return new SecurityPanel<SrtpControl>(srtpControl)

         {

-            public void loadSkin()

-            {}

+            return

+                new ZrtpSecurityPanel(

+                        peerRenderer,

+                        callPeer,

+                        (ZrtpControl) srtpControl);

+        }

+        else

+        {

+            return

+                new SecurityPanel<SrtpControl>(srtpControl)

+                {

+                    public void loadSkin() {}

 

-            public void securityOn(CallPeerSecurityOnEvent evt)

-            {}

+                    public void securityOn(CallPeerSecurityOnEvent evt) {}

 

-            public void securityOff(CallPeerSecurityOffEvent evt)

-            {}

+                    public void securityOff(CallPeerSecurityOffEvent evt) {}

 

-            public void securityTimeout(CallPeerSecurityTimeoutEvent evt)

-            {}

-        };

+                    public void securityTimeout(

+                            CallPeerSecurityTimeoutEvent evt) {}

+                };

+        }

     }

 

     /**

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
index c230219..b3d9398 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
@@ -82,7 +82,7 @@ public class ConferencePeerPanel
     /**
      * The component showing the security details.
      */
-    private SecurityPanel securityPanel;
+    private SecurityPanel<?> securityPanel;
 
     /**
      * The call peer adapter.
@@ -309,7 +309,7 @@ public class ConferencePeerPanel
         {
             try
             {
-                AbstractCallPeer peer = (AbstractCallPeer)evt.getSource();
+                CallPeer peer = (CallPeer) evt.getSource();
                 OperationSetBasicTelephony<?> telephony
                     = peer.getProtocolProvider().getOperationSet(
                             OperationSetBasicTelephony.class);