Skip to content

V
vlc-1.1
Commit e97f5fe6 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

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

parent 68bca364
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
modules/gui/macosx/eyetv.m
View file @ e97f5fe6
/*****************************************************************************
* 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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment