[vlc-commits] macosx: remove references to VLCIntf from the EyeTV class to work-around libvlc crashes

Felix Paul Kühne git at videolan.org
Sun May 22 21:00:57 CEST 2011


vlc/vlc-1.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun May 22 21:00:50 2011 +0200| [e97f5fe6a026e2dbf05f24ab01218be0c5426166] | committer: Felix Paul Kühne

macosx: remove references to VLCIntf from the EyeTV class to work-around libvlc crashes

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=e97f5fe6a026e2dbf05f24ab01218be0c5426166
---

 modules/gui/macosx/eyetv.m |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/gui/macosx/eyetv.m b/modules/gui/macosx/eyetv.m
index 57de6e2..690ff16 100644
--- a/modules/gui/macosx/eyetv.m
+++ b/modules/gui/macosx/eyetv.m
@@ -1,11 +1,11 @@
 /*****************************************************************************
 * eyetv.m: small class to control the notification parts of the EyeTV plugin
 *****************************************************************************
-* Copyright (C) 2006-2007 the VideoLAN team
+* Copyright (C) 2006-2011 the VideoLAN team
 * $Id$
 *
 * Authors: Felix Kühne <fkuehne at videolan dot org>
-*                Damien Fouilleul <damienf at videolan dot org>
+*          Damien Fouilleul <damienf at videolan dot org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -89,7 +89,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     if( nil == descriptor ) 
     {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        msg_Err( VLCIntf, "opening EyeTV failed with error status '%s'", [errorString UTF8String] );
+        NSLog( @"opening EyeTV failed with error status '%@'", errorString );
     }
     [script release];
 }
@@ -104,7 +104,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     if( nil == descriptor ) 
     {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        msg_Err( VLCIntf, "EyeTV channel inventory failed with error status '%s'", [errorString UTF8String] );
+        NSLog( @"EyeTV channel inventory failed with error status '%@'", errorString );
     }
     else
     {
@@ -128,7 +128,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
                        "channel_up\n"
                        "get current channel\n"
                      "end tell"];
-        msg_Dbg( VLCIntf, "telling eyetv to switch 1 channel up" );
+        NSLog( @"telling eyetv to switch 1 channel up" );
     }
     else
     {
@@ -137,14 +137,14 @@ static VLCEyeTVController *_o_sharedInstance = nil;
                        "channel_down\n"
                        "get current channel\n"
                      "end tell"];
-        msg_Dbg( VLCIntf, "telling eyetv to switch 1 channel down" );
+        NSLog( @"telling eyetv to switch 1 channel down" );
     }
     
     descriptor = [script executeAndReturnError:&errorDict];
     if( nil == descriptor ) 
     {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        msg_Err( VLCIntf, "EyeTV channel change failed with error status '%s'", [errorString UTF8String] );
+        NSLog( @"EyeTV channel change failed with error status '%@'", errorString );
     }
     else
     {
@@ -197,7 +197,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     if( nil == descriptor ) 
     {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        msg_Err( VLCIntf, "EyeTV source change failed with error status '%s'", [errorString UTF8String] );
+        NSLog( @"EyeTV source change failed with error status '%@'", errorString );
     }
     [script release];
 }
@@ -212,7 +212,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     if( nil == descriptor ) 
     {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        msg_Err( VLCIntf, "EyeTV channel inventory failed with error status '%s'", [errorString UTF8String] );
+        NSLog( @"EyeTV channel inventory failed with error status '%@'", errorString );
     }
     else
     {



More information about the vlc-commits mailing list