node-mac-recorder 2.15.2 → 2.15.3

package/.claude/settings.local.json

@@ -33,7 +33,8 @@
       "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Testing with proper permissions and Electron env'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function test() {\n  try {\n    const outputPath = ''./test-output/proper-test.mov'';\n    console.log(''📹 Starting recording...'');\n    const success = await recorder.startRecording(outputPath, {\n      captureCursor: true,\n      includeMicrophone: false,\n      includeSystemAudio: false\n    });\n    \n    if (success) {\n      console.log(''✅ Recording started - waiting 2 seconds'');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      console.log(''🛑 Stopping recording...'');\n      await recorder.stopRecording();\n      console.log(''✅ Test completed'');\n    } else {\n      console.log(''❌ Recording start failed'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error.message);\n  }\n}\n\ntest();\n\")",
       "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''''🔍 Debugging frame writing...'''');\nconst MacRecorder = require(''''./index'''');\nconst recorder = new MacRecorder();\n\nasync function debugFrameWriting() {\n  try {\n    const outputPath = ''''./test-output/frame-debug.mov'''';\n    console.log(''''📹 Starting debug test...'''');\n    \n    const success = await recorder.startRecording(outputPath);\n    \n    if (success) {\n      console.log(''''⏱️ Recording for 2 seconds...'''');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''''🛑 Stopping...'''');\n      await recorder.stopRecording();\n      \n      // Wait for finalization\n      await new Promise(resolve => setTimeout(resolve, 1000));\n      \n    } else {\n      console.log(''''❌ Failed to start'''');\n    }\n  } catch (error) {\n    console.log(''''❌ Error:'''', error);\n  }\n}\n\ndebugFrameWriting();\n\")",
       "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Testing with proper permissions and Electron env'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function test() {\n  try {\n    const outputPath = ''./test-output/crash-test.mov'';\n    console.log(''📹 Starting recording...'');\n    const success = await recorder.startRecording(outputPath, {\n      captureCursor: true,\n      includeMicrophone: false,\n      includeSystemAudio: false\n    });\n    \n    if (success) {\n      console.log(''✅ Recording started - waiting 3 seconds'');\n      await new Promise(resolve => setTimeout(resolve, 3000));\n      console.log(''🛑 Stopping recording...'');\n      await recorder.stopRecording();\n      console.log(''✅ Test completed without crash'');\n    } else {\n      console.log(''❌ Recording start failed'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error.message);\n    console.log(''Stack:'', error.stack);\n  }\n}\n\ntest();\n\")",
-      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Debugging frame writing...'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function debugFrameWriting() {\n  try {\n    const outputPath = ''./test-output/frame-debug.mov'';\n    console.log(''📹 Starting debug test...'');\n    \n    const success = await recorder.startRecording(outputPath);\n    \n    if (success) {\n      console.log(''⏱️ Recording for 2 seconds...'');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''🛑 Stopping...'');\n      await recorder.stopRecording();\n      \n      // Wait for finalization\n      await new Promise(resolve => setTimeout(resolve, 1000));\n      \n    } else {\n      console.log(''❌ Failed to start'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error);\n  }\n}\n\ndebugFrameWriting();\n\")"
+      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🔍 Debugging frame writing...'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function debugFrameWriting() {\n  try {\n    const outputPath = ''./test-output/frame-debug.mov'';\n    console.log(''📹 Starting debug test...'');\n    \n    const success = await recorder.startRecording(outputPath);\n    \n    if (success) {\n      console.log(''⏱️ Recording for 2 seconds...'');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''🛑 Stopping...'');\n      await recorder.stopRecording();\n      \n      // Wait for finalization\n      await new Promise(resolve => setTimeout(resolve, 1000));\n      \n    } else {\n      console.log(''❌ Failed to start'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error);\n  }\n}\n\ndebugFrameWriting();\n\")",
+      "Bash(ELECTRON_RUN_AS_NODE=1 node -e \"\nconsole.log(''🧪 Testing without AVFoundation - Pure ScreenCaptureKit'');\nconst MacRecorder = require(''./index'');\nconst recorder = new MacRecorder();\n\nasync function testPureScreenCaptureKit() {\n  try {\n    const outputPath = ''./test-output/pure-sck.mov'';\n    console.log(''📹 Starting pure ScreenCaptureKit test...'');\n    \n    const success = await recorder.startRecording(outputPath, {\n      captureCursor: true,\n      includeMicrophone: false,\n      includeSystemAudio: false\n    });\n    \n    if (success) {\n      console.log(''✅ Recording started - waiting 2 seconds'');\n      await new Promise(resolve => setTimeout(resolve, 2000));\n      \n      console.log(''🛑 Stopping recording...'');\n      await recorder.stopRecording();\n      console.log(''✅ Pure ScreenCaptureKit test completed successfully!'');\n    } else {\n      console.log(''❌ Recording failed to start'');\n    }\n  } catch (error) {\n    console.log(''❌ Error:'', error.message);\n    console.log(''Stack:'', error.stack);\n  }\n}\n\ntestPureScreenCaptureKit();\n\")"
     ],
     "deny": []
   }

package/binding.gyp

@@ -4,7 +4,6 @@
       "target_name": "mac_recorder",
       "sources": [
         "src/mac_recorder.mm",
-        "src/screen_capture.mm",
         "src/screen_capture_kit.mm",
         "src/audio_capture.mm",
         "src/cursor_tracker.mm",
@@ -28,15 +27,13 @@
       },
       "link_settings": {
         "libraries": [
-          "-framework AVFoundation",
-          "-framework CoreMedia",
-          "-framework CoreVideo",
           "-framework Foundation",
           "-framework AppKit",
           "-framework ScreenCaptureKit",
           "-framework ApplicationServices",
           "-framework Carbon",
-          "-framework Accessibility"
+          "-framework Accessibility",
+          "-framework CoreAudio"
         ]
       },
       "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.15.2",
+	"version": "2.15.3",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/audio_capture.mm

@@ -1,5 +1,4 @@
-#import <AVFoundation/AVFoundation.h>
-#import <CoreAudio/CoreAudio.h>
+#import <Foundation/Foundation.h>
 
 @interface AudioCapture : NSObject
 
@@ -14,103 +13,29 @@
 + (NSArray *)getAudioDevices {
     NSMutableArray *devices = [NSMutableArray array];
     
-    // Get all audio devices
-    NSArray *audioDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
-    
-    for (AVCaptureDevice *device in audioDevices) {
-        NSDictionary *deviceInfo = @{
-            @"id": device.uniqueID,
-            @"name": device.localizedName,
-            @"manufacturer": device.manufacturer ?: @"Unknown",
-            @"isDefault": @([device isEqual:[AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio]])
-        };
-        
-        [devices addObject:deviceInfo];
-    }
-    
-    // Also get system audio devices using Core Audio
-    AudioObjectPropertyAddress propertyAddress = {
-        kAudioHardwarePropertyDevices,
-        kAudioObjectPropertyScopeGlobal,
-        kAudioObjectPropertyElementMaster
+    // ScreenCaptureKit handles audio internally - return default device
+    NSDictionary *deviceInfo = @{
+        @"id": @"default",
+        @"name": @"Default Audio Device", 
+        @"manufacturer": @"System",
+        @"isDefault": @YES
     };
     
-    UInt32 dataSize = 0;
-    OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
+    [devices addObject:deviceInfo];
     
-    if (status == kAudioHardwareNoError) {
-        UInt32 deviceCount = dataSize / sizeof(AudioDeviceID);
-        AudioDeviceID *audioDeviceIDs = (AudioDeviceID *)malloc(dataSize);
-        
-        status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDeviceIDs);
-        
-        if (status == kAudioHardwareNoError) {
-            for (UInt32 i = 0; i < deviceCount; i++) {
-                AudioDeviceID deviceID = audioDeviceIDs[i];
-                
-                // Get device name
-                propertyAddress.mSelector = kAudioDevicePropertyDeviceNameCFString;
-                propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-                
-                CFStringRef deviceName = NULL;
-                dataSize = sizeof(deviceName);
-                
-                status = AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, NULL, &dataSize, &deviceName);
-                
-                if (status == kAudioHardwareNoError && deviceName) {
-                    // Check if it's an input device
-                    propertyAddress.mSelector = kAudioDevicePropertyStreamConfiguration;
-                    propertyAddress.mScope = kAudioDevicePropertyScopeInput;
-                    
-                    AudioObjectGetPropertyDataSize(deviceID, &propertyAddress, 0, NULL, &dataSize);
-                    
-                    if (dataSize > 0) {
-                        AudioBufferList *bufferList = (AudioBufferList *)malloc(dataSize);
-                        AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, NULL, &dataSize, bufferList);
-                        
-                        if (bufferList->mNumberBuffers > 0) {
-                            NSDictionary *deviceInfo = @{
-                                @"id": @(deviceID),
-                                @"name": (__bridge NSString *)deviceName,
-                                @"type": @"System Audio Input",
-                                @"isSystemDevice": @YES
-                            };
-                            
-                            [devices addObject:deviceInfo];
-                        }
-                        
-                        free(bufferList);
-                    }
-                    
-                    CFRelease(deviceName);
-                }
-            }
-        }
-        
-        free(audioDeviceIDs);
-    }
-    
-    return [devices copy];
+    return devices;
 }
 
 + (BOOL)hasAudioPermission {
-    if (@available(macOS 10.14, *)) {
-        AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
-        return status == AVAuthorizationStatusAuthorized;
-    }
-    return YES; // Older versions don't require explicit permission
+    // ScreenCaptureKit handles audio permissions internally
+    return YES;
 }
 
 + (void)requestAudioPermission:(void(^)(BOOL granted))completion {
-    if (@available(macOS 10.14, *)) {
-        [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio completionHandler:^(BOOL granted) {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                completion(granted);
-            });
-        }];
-    } else {
+    // ScreenCaptureKit handles audio permissions internally
+    if (completion) {
         completion(YES);
     }
 }
 
-@end 
+@end

package/src/mac_recorder.mm

@@ -1,14 +1,11 @@
 #import <napi.h>
-#import <AVFoundation/AVFoundation.h>
-#import <CoreMedia/CoreMedia.h>
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 #import <ImageIO/ImageIO.h>
 #import <CoreAudio/CoreAudio.h>
 
-// Import screen capture
-#import "screen_capture.h"
+// Import screen capture (ScreenCaptureKit only)
 #import "screen_capture_kit.h"
 
 // Cursor tracker function declarations
@@ -21,26 +18,13 @@ Napi::Object InitWindowSelector(Napi::Env env, Napi::Object exports);
 extern "C" void hideOverlays();
 extern "C" void showOverlays();
 
-@interface MacRecorderDelegate : NSObject <AVCaptureFileOutputRecordingDelegate>
-@property (nonatomic, copy) void (^completionHandler)(NSURL *outputURL, NSError *error);
+@interface MacRecorderDelegate : NSObject
 @end
 
 @implementation MacRecorderDelegate
-- (void)captureOutput:(AVCaptureFileOutput *)output
-didFinishRecordingToOutputFileAtURL:(NSURL *)outputFileURL
-      fromConnections:(NSArray<AVCaptureConnection *> *)connections
-                error:(NSError *)error {
-    if (self.completionHandler) {
-        self.completionHandler(outputFileURL, error);
-    }
-}
 @end
 
-// Global state for recording
-static AVCaptureSession *g_captureSession = nil;
-static AVCaptureMovieFileOutput *g_movieFileOutput = nil;
-static AVCaptureScreenInput *g_screenInput = nil;
-static AVCaptureDeviceInput *g_audioInput = nil;
+// Global state for recording (ScreenCaptureKit only)
 static MacRecorderDelegate *g_delegate = nil;
 static bool g_isRecording = false;
 
@@ -244,11 +228,11 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
                         NSLog(@"❌ Exception during ScreenCaptureKit startup: %@", sckException.reason);
                     }
                     
-                    NSLog(@"⚠️ ScreenCaptureKit failed or unsafe - falling back to AVFoundation");
+                    NSLog(@"❌ ScreenCaptureKit failed or unsafe");
                     
                 } else {
                     NSLog(@"❌ ScreenCaptureKit availability check failed");
-                    NSLog(@"⚠️ Falling back to AVFoundation");
+                    NSLog(@"❌ ScreenCaptureKit not available");
                 }
             } @catch (NSException *availabilityException) {
                 NSLog(@"❌ Exception during ScreenCaptureKit availability check: %@", availabilityException.reason);
@@ -275,7 +259,7 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     
     NSLog(@"📞 StopRecording native method called");
     
-    // ScreenCaptureKit ONLY - No AVFoundation fallback
+    // ScreenCaptureKit ONLY
     if (@available(macOS 12.3, *)) {
         if ([ScreenCaptureKitRecorder isRecording]) {
             NSLog(@"🛑 Stopping ScreenCaptureKit recording");
@@ -402,16 +386,15 @@ Napi::Value GetAudioDevices(const Napi::CallbackInfo& info) {
         NSMutableArray *devices = [NSMutableArray array];
         
         // Get all audio devices
-        NSArray *audioDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
-        
-        for (AVCaptureDevice *device in audioDevices) {
-            [devices addObject:@{
-                @"id": device.uniqueID,
-                @"name": device.localizedName,
-                @"manufacturer": device.manufacturer ?: @"Unknown",
-                @"isDefault": @([device isEqual:[AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio]])
-            }];
-        }
+        // Audio device enumeration removed - ScreenCaptureKit handles audio internally
+        NSLog(@"🎵 Audio device enumeration disabled - using ScreenCaptureKit internal audio");
+        
+        // Add default system audio entry
+        [devices addObject:@{
+            @"id": @"default", 
+            @"name": @"Default Audio Device",
+            @"isDefault": @YES
+        }];
         
         // Convert to NAPI array
         Napi::Array result = Napi::Array::New(env, devices.count);
@@ -437,7 +420,20 @@ Napi::Value GetDisplays(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
     @try {
-        NSArray *displays = [ScreenCapture getAvailableDisplays];
+        // Get displays using NSScreen instead of ScreenCapture
+        NSArray *screens = [NSScreen screens];
+        NSMutableArray *displays = [NSMutableArray array];
+        
+        for (NSUInteger i = 0; i < [screens count]; i++) {
+            NSScreen *screen = [screens objectAtIndex:i];
+            NSDictionary *displayInfo = @{
+                @"id": @(i + 1),
+                @"name": [NSString stringWithFormat:@"Display %lu", (unsigned long)(i + 1)],
+                @"width": @((int)screen.frame.size.width),
+                @"height": @((int)screen.frame.size.height)
+            };
+            [displays addObject:displayInfo];
+        }
         Napi::Array result = Napi::Array::New(env, displays.count);
         
         NSLog(@"Found %lu displays", (unsigned long)displays.count);
@@ -742,8 +738,9 @@ Napi::Value CheckPermissions(const Napi::CallbackInfo& info) {
         // Check audio permission
         bool hasAudioPermission = true;
         if (@available(macOS 10.14, *)) {
-            AVAuthorizationStatus audioStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
-            hasAudioPermission = (audioStatus == AVAuthorizationStatusAuthorized);
+            // Audio permissions handled by ScreenCaptureKit internally
+            BOOL audioAuthorized = YES;  // Assume authorized since SCK handles it
+            hasAudioPermission = audioAuthorized;
         }
         
         return Napi::Boolean::New(env, hasScreenPermission && hasAudioPermission);

package/src/screen_capture.h

@@ -1,19 +0,0 @@
-#ifndef SCREEN_CAPTURE_H
-#define SCREEN_CAPTURE_H
-
-#import <Foundation/Foundation.h>
-#import <CoreGraphics/CoreGraphics.h>
-
-@interface ScreenCapture : NSObject
-
-+ (NSArray *)getAvailableDisplays;
-+ (BOOL)captureDisplay:(CGDirectDisplayID)displayID 
-                toFile:(NSString *)filePath 
-                  rect:(CGRect)rect
-           includeCursor:(BOOL)includeCursor;
-+ (CGImageRef)createScreenshotFromDisplay:(CGDirectDisplayID)displayID 
-                                     rect:(CGRect)rect;
-
-@end
-
-#endif // SCREEN_CAPTURE_H 

package/src/screen_capture.mm

@@ -1,162 +0,0 @@
-#import <AVFoundation/AVFoundation.h>
-#import <CoreGraphics/CoreGraphics.h>
-#import <AppKit/AppKit.h>
-
-@interface ScreenCapture : NSObject
-
-+ (NSArray *)getAvailableDisplays;
-+ (BOOL)captureDisplay:(CGDirectDisplayID)displayID 
-                toFile:(NSString *)filePath 
-                  rect:(CGRect)rect
-           includeCursor:(BOOL)includeCursor;
-+ (CGImageRef)createScreenshotFromDisplay:(CGDirectDisplayID)displayID 
-                                     rect:(CGRect)rect;
-
-@end
-
-@implementation ScreenCapture
-
-+ (NSArray *)getAvailableDisplays {
-    NSMutableArray *displays = [NSMutableArray array];
-    
-    uint32_t displayCount;
-    CGGetActiveDisplayList(0, NULL, &displayCount);
-    
-    CGDirectDisplayID *displayList = (CGDirectDisplayID *)malloc(displayCount * sizeof(CGDirectDisplayID));
-    CGGetActiveDisplayList(displayCount, displayList, &displayCount);
-    
-    // Get NSScreen list for consistent coordinate system
-    NSArray<NSScreen *> *screens = [NSScreen screens];
-    
-    for (uint32_t i = 0; i < displayCount; i++) {
-        CGDirectDisplayID displayID = displayList[i];
-        
-        // Find corresponding NSScreen for this display ID
-        NSScreen *matchingScreen = nil;
-        for (NSScreen *screen in screens) {
-            // Match by display ID (requires screen.deviceDescription lookup)
-            NSDictionary *deviceDescription = [screen deviceDescription];
-            NSNumber *screenDisplayID = [deviceDescription objectForKey:@"NSScreenNumber"];
-            if (screenDisplayID && [screenDisplayID unsignedIntValue] == displayID) {
-                matchingScreen = screen;
-                break;
-            }
-        }
-        
-        // Use NSScreen.frame if found, fallback to CGDisplayBounds
-        CGRect bounds;
-        if (matchingScreen) {
-            NSRect screenFrame = [matchingScreen frame];
-            bounds = CGRectMake(screenFrame.origin.x, screenFrame.origin.y, screenFrame.size.width, screenFrame.size.height);
-        } else {
-            bounds = CGDisplayBounds(displayID);
-        }
-        
-        // Create display info dictionary
-        NSDictionary *displayInfo = @{
-            @"id": @(displayID),
-            @"name": [NSString stringWithFormat:@"Display %d", i + 1],
-            @"width": @(bounds.size.width),
-            @"height": @(bounds.size.height),
-            @"x": @(bounds.origin.x),
-            @"y": @(bounds.origin.y),
-            @"isPrimary": @(CGDisplayIsMain(displayID))
-        };
-        
-        [displays addObject:displayInfo];
-    }
-    
-    free(displayList);
-    return [displays copy];
-}
-
-+ (BOOL)captureDisplay:(CGDirectDisplayID)displayID 
-                toFile:(NSString *)filePath 
-                  rect:(CGRect)rect
-           includeCursor:(BOOL)includeCursor {
-    
-    CGImageRef screenshot = [self createScreenshotFromDisplay:displayID rect:rect];
-    if (!screenshot) {
-        return NO;
-    }
-    
-    // Create image destination
-    NSURL *fileURL = [NSURL fileURLWithPath:filePath];
-    CGImageDestinationRef destination = CGImageDestinationCreateWithURL(
-        (__bridge CFURLRef)fileURL, 
-        kUTTypePNG, 
-        1, 
-        NULL
-    );
-    
-    if (!destination) {
-        CGImageRelease(screenshot);
-        return NO;
-    }
-    
-    // Add cursor if requested
-    if (includeCursor) {
-        // Get cursor position
-        CGPoint cursorPos = CGEventGetLocation(CGEventCreate(NULL));
-        
-        // Create mutable image context
-        size_t width = CGImageGetWidth(screenshot);
-        size_t height = CGImageGetHeight(screenshot);
-        
-        CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-        CGContextRef context = CGBitmapContextCreate(
-            NULL, width, height, 8, width * 4,
-            colorSpace, kCGImageAlphaPremultipliedFirst
-        );
-        
-        if (context) {
-            // Draw original screenshot
-            CGContextDrawImage(context, CGRectMake(0, 0, width, height), screenshot);
-            
-            // Draw cursor (simplified - just a small circle)
-            CGRect displayBounds = CGDisplayBounds(displayID);
-            CGFloat relativeX = cursorPos.x - displayBounds.origin.x;
-            CGFloat relativeY = height - (cursorPos.y - displayBounds.origin.y);
-            
-            if (!CGRectIsNull(rect)) {
-                relativeX -= rect.origin.x;
-                relativeY -= rect.origin.y;
-            }
-            
-            if (relativeX >= 0 && relativeX < width && relativeY >= 0 && relativeY < height) {
-                CGContextSetRGBFillColor(context, 1.0, 0.0, 0.0, 0.8); // Red cursor
-                CGContextFillEllipseInRect(context, CGRectMake(relativeX - 5, relativeY - 5, 10, 10));
-            }
-            
-            CGImageRef finalImage = CGBitmapContextCreateImage(context);
-            CGContextRelease(context);
-            CGImageRelease(screenshot);
-            screenshot = finalImage;
-        }
-        
-        CGColorSpaceRelease(colorSpace);
-    }
-    
-    // Save image
-    CGImageDestinationAddImage(destination, screenshot, NULL);
-    BOOL success = CGImageDestinationFinalize(destination);
-    
-    CFRelease(destination);
-    CGImageRelease(screenshot);
-    
-    return success;
-}
-
-+ (CGImageRef)createScreenshotFromDisplay:(CGDirectDisplayID)displayID 
-                                     rect:(CGRect)rect {
-    
-    if (CGRectIsNull(rect)) {
-        // Capture entire display
-        return CGDisplayCreateImage(displayID);
-    } else {
-        // Capture specific rect
-        return CGDisplayCreateImageForRect(displayID, rect);
-    }
-}
-
-@end