Added a couple of more useful error messages

[vlc] / modules / access / qtcapture.m

diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index bd8c6275ec684637319f3a346ad942bde574b452..ab56a299204f0968d6fb66ac412b4a828a2333f7 100644 (file)
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -35,6 +35,7 @@
 #include <vlc_input.h>
 #include <vlc_vout.h>
 #include <vlc_demux.h>
+#include <vlc_interface.h>
 
 #import <QTKit/QTKit.h>
 
@@ -86,7 +87,8 @@ vlc_module_end();
 }
 - (void)dealloc
 {
-    @synchronized (self) {
+    @synchronized (self)
+    {
         CVBufferRelease(currentImageBuffer);
         currentImageBuffer = nil;
     }
@@ -101,7 +103,8 @@ vlc_module_end();
 
     CVBufferRetain(videoFrame);
 
-    @synchronized (self) {
+    @synchronized (self)
+    {
         imageBufferToRelease = currentImageBuffer;
         currentImageBuffer = videoFrame;
         currentPts = [sampleBuffer presentationTime].timeValue;
@@ -113,16 +116,19 @@ vlc_module_end();
 {
     CVImageBufferRef imageBuffer;
     mtime_t pts;
-    @synchronized (self) {
-        if(!currentImageBuffer) return 0;
+
+    if(!currentImageBuffer)
+        return 0;
+
+    @synchronized (self)
+    {
         imageBuffer = CVBufferRetain(currentImageBuffer);
         pts = currentPts;
-    
 
-    CVPixelBufferLockBaseAddress(imageBuffer, 0);
-    void * pixels = CVPixelBufferGetBaseAddress(imageBuffer);
-    memcpy( buffer, pixels, CVPixelBufferGetBytesPerRow(imageBuffer) * CVPixelBufferGetHeight(imageBuffer) );
-    CVPixelBufferUnlockBaseAddress(imageBuffer, 0);
+        CVPixelBufferLockBaseAddress(imageBuffer, 0);
+        void * pixels = CVPixelBufferGetBaseAddress(imageBuffer);
+        memcpy( buffer, pixels, CVPixelBufferGetBytesPerRow(imageBuffer) * CVPixelBufferGetHeight(imageBuffer) );
+        CVPixelBufferUnlockBaseAddress(imageBuffer, 0);
     }
 
     CVBufferRelease(imageBuffer);
@@ -205,24 +211,35 @@ static int Open( vlc_object_t *p_this )
     msg_Dbg( p_demux, "QTCapture Probed" );
 
     QTCaptureDeviceInput * input = nil;
+    NSError *o_returnedError;
 
     p_sys->device = [QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeVideo];
     if( !p_sys->device )
     {
+        intf_UserFatal( p_demux, true, _("No Input device found"),
+                        _("Your Mac does not seem to be equipped with a suitable input device. "
+                          "Please check your connectors and drivers.") );
         msg_Err( p_demux, "Can't find any Video device" );
+        
+        goto error;
+    }
+
+    if( ![p_sys->device open: &o_returnedError] )
+    {
+        msg_Err( p_demux, "Unable to open the capture device (%i)", [o_returnedError code] );
         goto error;
     }
 
-    if( ![p_sys->device open: nil  /* FIXME */] )
+    if( [p_sys->device isInUseByAnotherApplication] == YES )
     {
-        msg_Err( p_demux, "Can't open any Video device" );
+        msg_Err( p_demux, "default capture device is exclusively in use by another application" );
         goto error;
     }
 
     input = [[QTCaptureDeviceInput alloc] initWithDevice: p_sys->device];
-    if( !p_sys->device )
+    if( !input )
     {
-        msg_Err( p_demux, "Can't create a capture session" );
+        msg_Err( p_demux, "can't create a valid capture input facility" );
         goto error;
     }
 
@@ -235,17 +252,17 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->session = [[QTCaptureSession alloc] init];
 
-    bool ret = [p_sys->session addInput:input error:nil  /* FIXME */];
+    bool ret = [p_sys->session addInput:input error: &o_returnedError];
     if( !ret )
     {
-        msg_Err( p_demux, "Can't add the video device as input" );
+        msg_Err( p_demux, "default video capture device could not be added to capture session (%i)", [o_returnedError code] );
         goto error;
     }
 
-    ret = [p_sys->session addOutput:p_sys->output error:nil  /* FIXME */];
+    ret = [p_sys->session addOutput:p_sys->output error: &o_returnedError];
     if( !ret )
     {
-        msg_Err( p_demux, "Can't get any output output" );
+        msg_Err( p_demux, "output could not be added to capture session (%i)", [o_returnedError code] );
         goto error;
     }
 
@@ -281,9 +298,6 @@ static int Open( vlc_object_t *p_this )
     return VLC_SUCCESS;
 error:
     [input release];
-    [p_sys->device release];
-    [p_sys->output release];
-    [p_sys->session release];
     [pool release];
 
     free( p_sys );
@@ -329,7 +343,8 @@ static int Demux( demux_t *p_demux )
 
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 
-    @synchronized (p_sys->output) {
+    @synchronized (p_sys->output)
+    {
     p_block->i_pts = [p_sys->output copyCurrentFrameToBuffer: p_block->p_buffer];
     }