Commit f25e0c78 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* cleaning, reformatting, clarifying here and there...

parent 63d9df0e
......@@ -117,15 +117,6 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
[super dealloc];
}
/* this was added by the VideoLAN team to ensure Leopard-compatibility and is VLC-only */
#if GC_ENABLED
- (void)finalize
{
[self stopListening: self];
[super finalize];
}
#endif
- (int) remoteId {
return remoteId;
}
......
......@@ -83,11 +83,11 @@ static VLAboutBox *_o_sharedInstance = nil;
/* setup the creator / revision field */
if( VLC_Changeset() != "exported" )
[o_revision_field setStringValue: [NSString stringWithFormat: \
_NS("Compiled by %s, based on SVN revision %s"), VLC_CompileBy(), \
VLC_Changeset()]];
[o_revision_field setStringValue:
[NSString stringWithFormat: _NS("Compiled by %s, based on SVN revision %s"),
VLC_CompileBy(), VLC_Changeset()]];
else
[o_revision_field setStringValue: [NSString stringWithFormat: \
[o_revision_field setStringValue: [NSString stringWithFormat:
_NS("Compiled by %s"), VLC_CompileBy()]];
/* Setup the nameversion field */
......
/*****************************************************************************
* applescript.h: MacOS X AppleScript support
*****************************************************************************
* Copyright (C) 2002-2003 the VideoLAN team
* Copyright (C) 2002-2003, 2005, 2007 the VideoLAN team
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
......@@ -38,6 +38,6 @@
*****************************************************************************/
@interface NSApplication(ScriptSupport)
- (BOOL) scriptFullscreenMode;
- (void) setScriptFullscreenMode: (BOOL) mode;
- (BOOL)scriptFullscreenMode;
- (void)setScriptFullscreenMode: (BOOL)mode;
@end
/*****************************************************************************
* applescript.m: MacOS X AppleScript support
*****************************************************************************
* Copyright (C) 2002-2003 the VideoLAN team
* Copyright (C) 2002-2003, 2005, 2007 the VideoLAN team
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
......
/*****************************************************************************
* bookmarks.h: MacOS X Bookmarks window
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* Copyright (C) 2005, 2007 the VideoLAN team
* $Id$
*
* Authors: Felix Kühne <fkuehne@users.sf.net>
......
......@@ -82,16 +82,6 @@ static VLCBookmarks *_o_sharedInstance = nil;
[super dealloc];
}
#if GC_ENABLED
- (void)finalize
{
/* release old input even if GC is enabled on 10.5 */
if( p_old_input )
vlc_object_release( p_old_input );
[super finalize];
}
#endif
- (void)initStrings
{
/* localise the items */
......
/*****************************************************************************
* controls.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......@@ -83,17 +83,17 @@
- (BOOL) isFullscreen;
- (IBAction)windowAction:(id)sender;
- (BOOL)keyEvent:(NSEvent *)o_event;
- (void)scrollWheel:(NSEvent *)theEvent;
- (void)scrollWheel: (NSEvent *)theEvent;
- (void)setupVarMenuItem:(NSMenuItem *)o_mi
target:(vlc_object_t *)p_object
var:(const char *)psz_variable
selector:(SEL)pf_callback;
target:(vlc_object_t *)p_object
var:(const char *)psz_variable
selector:(SEL)pf_callback;
- (void)setupVarMenu:(NSMenu *)o_menu
forMenuItem: (NSMenuItem *)o_parent
target:(vlc_object_t *)p_object
var:(const char *)psz_variable
selector:(SEL)pf_callback;
forMenuItem: (NSMenuItem *)o_parent
target:(vlc_object_t *)p_object
var:(const char *)psz_variable
selector:(SEL)pf_callback;
- (IBAction)toggleVar:(id)sender;
- (int)toggleVarThread:(id)_o_data;
......@@ -116,8 +116,10 @@
int i_type;
}
- (id)initWithVar: (const char *)_psz_name Object: (int)i_id
Value: (vlc_value_t)val ofType: (int)_i_type;
- (id)initWithVar: (const char *)_psz_name
Object: (int)i_id
Value: (vlc_value_t)val
ofType: (int)_i_type;
- (char *)name;
- (int)objectID;
- (vlc_value_t)value;
......
/*****************************************************************************
* controls.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......
/*****************************************************************************
* embeddedwindow.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2005-2006 the VideoLAN team
* Copyright (C) 2005-2007 the VideoLAN team
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
......@@ -52,9 +52,9 @@
NSRecursiveLock * o_animation_lock;
}
- (void)setTime:(NSString *)o_arg_ime position:(float)f_position;
- (void)playStatusUpdated:(int)i_status;
- (void)setSeekable:(BOOL)b_seekable;
- (void)setTime: (NSString *)o_arg_ime position: (float)f_position;
- (void)playStatusUpdated: (int)i_status;
- (void)setSeekable: (BOOL)b_seekable;
- (NSView *)mainView;
......
/*****************************************************************************
* embeddedwindow.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2005-2006 the VideoLAN team
* Copyright (C) 2005-2007 the VideoLAN team
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
......
/*****************************************************************************
* equalizer.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2004-2006 the VideoLAN team
* Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Authors: Jérôme Decoodt <djc@videolan.org>
......@@ -55,9 +55,9 @@
- (void)windowWillClose:(NSNotification *)aNotification;
- (void)awakeFromNib;
- (void)setValue:(float)value forSlider:(int)index;
- (id)getSliderByIndex:(int)index;
- (void)setBandSlidersValues:(float *)values;
- (void)setValue: (float)value forSlider: (int)index;
- (id)getSliderByIndex: (int)index;
- (void)setBandSlidersValues: (float *)values;
- (void)initBandSliders;
......
......@@ -46,31 +46,31 @@
- (void)setPlay;
- (void)setPause;
- (void)setStreamTitle:(NSString *)o_title;
- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time;
- (void)setSeekable:(BOOL) b_seekable;
- (void)setStreamTitle: (NSString *)o_title;
- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
- (void)setSeekable: (BOOL)b_seekable;
- (void)setVolumeLevel: (float)f_volumeLevel;
- (void)setNonActive:(id)noData;
- (void)setActive:(id)noData;
- (void)setNonActive: (id)noData;
- (void)setActive: (id)noData;
- (void)focus:(NSTimer *)timer;
- (void)unfocus:(NSTimer *)timer;
- (void)mouseExited:(NSEvent *)theEvent;
- (void)focus: (NSTimer *)timer;
- (void)unfocus: (NSTimer *)timer;
- (void)mouseExited: (NSEvent *)theEvent;
- (void)fadeIn;
- (void)fadeOut;
- (NSTimer *)fadeTimer;
- (void)setFadeTimer:(NSTimer *)timer;
- (void)setFadeTimer: (NSTimer *)timer;
- (void)autoHide;
- (void)keepVisible:(NSTimer *)timer;
- (void)keepVisible: (NSTimer *)timer;
- (void)mouseDown:(NSEvent *)theEvent;
- (void)mouseDragged:(NSEvent *)theEvent;
- (void)mouseDown: (NSEvent *)theEvent;
- (void)mouseDragged: (NSEvent *)theEvent;
- (BOOL)isDisplayed;
- (void)setVoutWasUpdated: (int) i_screen;
- (void)setVoutWasUpdated: (int)i_screen;
@end
@interface VLCFSPanelView : NSView
......@@ -80,8 +80,8 @@
NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
}
- (id)initWithFrame:(NSRect)frameRect;
- (void)drawRect:(NSRect)rect;
- (id)initWithFrame: (NSRect)frameRect;
- (void)drawRect: (NSRect)rect;
- (void)setPlay;
- (void)setPause;
......@@ -94,23 +94,23 @@
- (IBAction)next:(id)sender;
- (IBAction)forward:(id)sender;
- (IBAction)backward:(id)sender;
- (IBAction)fsTimeSliderUpdate:(id)sender;
- (IBAction)fsVolumeSliderUpdate:(id)sender;
- (IBAction)fsTimeSliderUpdate: (id)sender;
- (IBAction)fsVolumeSliderUpdate: (id)sender;
@end
@interface VLCFSTimeSlider : NSSlider
{
}
- (void)drawKnobInRect:(NSRect)knobRect;
- (void)drawRect:(NSRect)rect;
- (void)drawKnobInRect: (NSRect)knobRect;
- (void)drawRect: (NSRect)rect;
@end
@interface VLCFSVolumeSlider : NSSlider
{
}
- (void)drawKnobInRect:(NSRect)knobRect;
- (void)drawRect:(NSRect)rect;
- (void)drawKnobInRect: (NSRect)knobRect;
- (void)drawRect: (NSRect)rect;
@end
......@@ -93,17 +93,6 @@
return YES;
}
#if GC_ENABLED
- (void)finalize
{
/* dealloc isn't called on 10.5 in case that GC is enabled, so we need to provide the functionality here */
[[NSNotificationCenter defaultCenter] removeObserver: self];
[self setFadeTimer:nil];
[super finalize];
}
#endif
-(void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
......
......@@ -94,16 +94,6 @@
return o_error_panel;
}
#if GC_ENABLED
-(void)finalize
{
/* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
[[NSNotificationCenter defaultCenter] removeObserver:self];
[o_interaction_list removeAllObjects];
[super finalize];
}
#endif
-(void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
......@@ -278,7 +268,7 @@
{
if( p_dialog->i_flags & DIALOG_USER_PROGRESS )
{
[o_prog_description setStringValue: \
[o_prog_description setStringValue:
[NSString stringWithUTF8String: p_dialog->psz_description]];
[o_prog_bar setDoubleValue: (double)p_dialog->val.f_float];
......
......@@ -51,9 +51,6 @@ unsigned int CocoaKeyToVLC( unichar i_key );
@"/System/Library/CoreServices/SystemVersion.plist"] \
objectForKey: @"ProductVersion"] floatValue]
/* switch this to 1, if you want to use Obj-C with GC */
#define GC_ENABLED 0
/*****************************************************************************
* intf_sys_t: description and status of the interface
*****************************************************************************/
......@@ -106,14 +103,14 @@ struct intf_sys_t
id o_sfilters; /* VLCsFilters */
id o_update; /* VLCUpdate */
id o_eyetv; /* VLCEyeTVController */
BOOL nib_main_loaded; /* reference to the main-nib */
BOOL nib_open_loaded; /* reference to the open-nib */
BOOL nib_about_loaded; /* reference to the about-nib */
BOOL nib_wizard_loaded; /* reference to the wizard-nib */
BOOL nib_extended_loaded; /* reference to the extended-nib */
BOOL nib_bookmarks_loaded; /* reference to the bookmarks-nib */
BOOL nib_sfilters_loaded; /* reference to the sfilters-nib */
BOOL nib_update_loaded; /* reference to the update-nib */
BOOL nib_main_loaded; /* main nibfile */
BOOL nib_open_loaded; /* open nibfile */
BOOL nib_about_loaded; /* about nibfile */
BOOL nib_wizard_loaded; /* wizard nibfile */
BOOL nib_extended_loaded; /* extended nibfile */
BOOL nib_bookmarks_loaded; /* bookmarks nibfile */
BOOL nib_sfilters_loaded; /* sfilters nibfile */
BOOL nib_update_loaded; /* update nibfile */
IBOutlet id o_window; /* main window */
IBOutlet id o_playlist_view;/* playlist view */
......@@ -125,14 +122,14 @@ struct intf_sys_t
float f_slider_old; /* old slider val */
IBOutlet id o_volumeslider; /* volume slider */
IBOutlet id o_main_pgbar; /* main interface progress bar */
IBOutlet id o_main_pgbar; /* playlist window progress bar */
IBOutlet id o_btn_prev; /* btn previous */
IBOutlet id o_btn_rewind; /* btn rewind */
IBOutlet id o_btn_play; /* btn play */
IBOutlet id o_btn_stop; /* btn stop */
IBOutlet id o_btn_ff; /* btn fast forward */
IBOutlet id o_btn_next; /* btn next */
IBOutlet id o_btn_fullscreen;/* btn fullscreen */
IBOutlet id o_btn_fullscreen;/* btn fullscreen (embedded vout window) */
IBOutlet id o_btn_playlist; /* btn playlist */
NSImage * o_img_play; /* btn play img */
......
/*****************************************************************************
* misc.h: code not specific to vlc
*****************************************************************************
* Copyright (C) 2003 the VideoLAN team
* Copyright (C) 2003-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......
......@@ -381,15 +381,6 @@ static NSMutableArray *blackoutWindows = NULL;
[super dealloc];
}
#if GC_ENABLED
- (void)finalize
{
/* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
[self unregisterDraggedTypes];
[super finalize];
}
#endif
- (void)awakeFromNib
{
[self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
......@@ -468,15 +459,6 @@ static NSMutableArray *blackoutWindows = NULL;
[super dealloc];
}
#if GC_ENABLED
- (void)finalize
{
/* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
[self unregisterDraggedTypes];
[super finalize];
}
#endif
- (void)awakeFromNib
{
[self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
......
/*****************************************************************************
* open.h: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......@@ -128,7 +128,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (void)openFileGeneric;
- (void)openFilePathChanged:(NSNotification *)o_notification;
- (IBAction)openFileBrowse:(id)sender;
- (void) pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo;
- (void)pathChosenInPanel: (NSOpenPanel *)sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo;
- (IBAction)openFileStreamChanged:(id)sender;
- (void)openDisc;
......
/*****************************************************************************
* output.h: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......
/*****************************************************************************
* output.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......
......@@ -139,6 +139,4 @@
- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;
- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue;
@end
/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......@@ -1667,13 +1667,6 @@
vlc_object_release( p_playlist );
return NO;
}
/* Delegate method of NSWindow */
/*- (void)windowWillClose:(NSNotification *)aNotification
{
[o_btn_playlist setState: NSOffState];
}
*/
@end
......@@ -111,16 +111,6 @@
[super dealloc];
}
#if GC_ENABLED
- (void)finalize
{
/* since dealloc isn't called with enabled GC on 10.5, we need this to prevent core crashes */
if( [o_statUpdateTimer isValid] )
[o_statUpdateTimer invalidate];
[super finalize];
}
#endif
- (IBAction)togglePlaylistInfoPanel:(id)sender
{
......@@ -514,11 +504,6 @@ static VLCInfoTreeItem *o_root_item = nil;
return ( i_tmp == IsALeafNode ) ? (-1) : (int)[i_tmp count];
}
/*- (int)selectedPlaylistItem
{
return i_item;
}
*/
- (void)refresh
{
p_item = [[[VLCMain sharedInstance] getInfo] getItem];
......
/*****************************************************************************
* prefs.h: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......
......@@ -409,16 +409,6 @@
[self setFrame:frame];
}
#if GC_ENABLED
- (void)finalize
{
/* since dealloc isn't called on 10.5 if GC is enabled and since GC is
* Obj-C only, we need to do this: */
if( psz_name ) free( psz_name );
[super finalize];
}
#endif
- (void)dealloc
{
if( o_label ) [o_label release];
......
......@@ -150,14 +150,17 @@ static VLCUpdate *_o_sharedInstance = nil;
[saveFilePanel setRequiredFileType: @"dmg"];
[saveFilePanel setCanSelectHiddenExtension: YES];
[saveFilePanel setCanCreateDirectories: YES];
[saveFilePanel beginSheetForDirectory:nil file: \
[[o_urlOfBinary componentsSeparatedByString:@"/"] lastObject] \
modalForWindow: o_update_window modalDelegate:self didEndSelector:sel \
contextInfo:nil];
[saveFilePanel beginSheetForDirectory:nil file:
[[o_urlOfBinary componentsSeparatedByString:@"/"] lastObject]
modalForWindow: o_update_window
modalDelegate:self
didEndSelector:sel
contextInfo:nil];
}
- (void)getLocationForSaving: (NSSavePanel *)sheet returnCode: \
(int)returnCode contextInfo: (void *)contextInfo
- (void)getLocationForSaving: (NSSavePanel *)sheet
returnCode: (int)returnCode
contextInfo: (void *)contextInfo
{
if( returnCode == NSOKButton )
{
......@@ -189,7 +192,7 @@ static VLCUpdate *_o_sharedInstance = nil;
BOOL gettingReleaseNote = NO;
int x = 0;
NSString * pathToReleaseNote;
pathToReleaseNote = [NSString stringWithFormat: \
pathToReleaseNote = [NSString stringWithFormat:
@"/tmp/vlc_releasenote_%d.tmp", mdate()];
[[NSUserDefaults standardUserDefaults] setObject: [NSDate date] forKey: kPrefUpdateLastTimeChecked];
......@@ -212,8 +215,8 @@ static VLCUpdate *_o_sharedInstance = nil;
{
msg_Dbg( p_intf, "release note found, desc = %s",
p_uit->file.psz_description );
[o_fld_releaseNote setString: \
[NSString stringWithUTF8String: \
[o_fld_releaseNote setString:
[NSString stringWithUTF8String:
(p_uit->file.psz_description)]];
/* download our release note
* We will read the temp file after this loop */
......@@ -222,20 +225,20 @@ static VLCUpdate *_o_sharedInstance = nil;
}
else if( p_uit->file.i_type == UPDATE_FILE_TYPE_BINARY )
{
msg_Dbg( p_intf, "binary found, version = %s, " \
"url=%s, size=%i MB", p_uit->release.psz_version, \
p_uit->file.psz_url, \
msg_Dbg( p_intf, "binary found, version = %s, "
"url=%s, size=%i MB", p_uit->release.psz_version,
p_uit->file.psz_url,
(int)((p_uit->file.l_size / 1024) / 1024) );
[o_fld_currentVersionAndSize setStringValue: [NSString \
stringWithFormat: \
_NS("The latest VLC media player release " \
"is %s (%i MB to download)."), \
p_uit->release.psz_version, ((p_uit->file.l_size \
[o_fld_currentVersionAndSize setStringValue:
[NSString stringWithFormat:
_NS("The latest VLC media player release "
"is %s (%i MB to download)."),
p_uit->release.psz_version, ((p_uit->file.l_size
/ 1024) / 1024)]];
if( o_urlOfBinary )
[o_urlOfBinary release];
o_urlOfBinary = [[NSString alloc] initWithUTF8String: \
o_urlOfBinary = [[NSString alloc] initWithUTF8String:
p_uit->file.psz_url];
}
if( p_uit->release.i_status == UPDATE_RELEASE_STATUS_NEWER &&
......@@ -243,12 +246,12 @@ static VLCUpdate *_o_sharedInstance = nil;
{
/* our version is outdated, let the user download the new
* release */
[o_fld_status setStringValue: _NS("This version of VLC " \
[o_fld_status setStringValue: _NS("This version of VLC "
"is outdated.")];
[o_btn_DownloadNow setEnabled: YES];
msg_Dbg( p_intf, "this version of VLC is outdated" );
/* put the mirror information */
msg_Dbg( p_intf, "used mirror: %s, %s [%s]", \
msg_Dbg( p_intf, "used mirror: %s, %s [%s]",
p_uit->mirror.psz_name, p_uit->mirror.psz_location,\
p_uit->mirror.psz_type );
/* make sure that we perform this check only once */
......@@ -261,7 +264,7 @@ static VLCUpdate *_o_sharedInstance = nil;
}
else if(! releaseChecked )
{
[o_fld_status setStringValue: _NS("This version of VLC " \
[o_fld_status setStringValue: _NS("This version of VLC "
"is the latest available.")];
[o_btn_DownloadNow setEnabled: NO];
msg_Dbg( p_intf, "current version is up-to-date" );
......@@ -295,21 +298,21 @@ static VLCUpdate *_o_sharedInstance = nil;
/* let's open our cached release note and display it
* we can't use NSString stringWithContentsOfFile:encoding:error:
* since it is Tiger only */
NSString * releaseNote = [[NSString alloc] initWithData: \
[NSData dataWithContentsOfFile: pathToReleaseNote] \
NSString * releaseNote = [[NSString alloc] initWithData:
[NSData dataWithContentsOfFile: pathToReleaseNote]
encoding: NSISOLatin1StringEncoding];
if( releaseNote )
[o_fld_releaseNote setString: releaseNote];
/* delete the file since it isn't needed anymore */
BOOL myBOOL = NO;
myBOOL = [[NSFileManager defaultManager] removeFileAtPath: \
myBOOL = [[NSFileManager defaultManager] removeFileAtPath:
pathToReleaseNote handler: nil];
}
else
{
/* don't confuse the user, but make her happy */
[o_fld_status setStringValue: _NS("This version of VLC " \
[o_fld_status setStringValue: _NS("This version of VLC "
"is the latest available.")];
[o_btn_DownloadNow setEnabled: NO];
msg_Dbg( p_intf, "current version is up-to-date" );
......@@ -332,8 +335,8 @@ static VLCUpdate *_o_sharedInstance = nil;
p_uit->file.i_type == UPDATE_FILE_TYPE_BINARY )
{
/* put the mirror information */
msg_Dbg( p_intf, "used mirror: %s, %s [%s]", \
p_uit->mirror.psz_name, p_uit->mirror.psz_location, \
msg_Dbg( p_intf, "used mirror: %s, %s [%s]",
p_uit->mirror.psz_name, p_uit->mirror.psz_location,
p_uit->mirror.psz_type );
/* that's our binary */
......
/*****************************************************************************
* vout.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2001-2006 the VideoLAN team
* Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
......@@ -72,7 +72,7 @@
- (id)getWindow;
+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *) view
frame: (NSRect *) s_frame;
frame: (NSRect *) s_frame;
+ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout;
- (void)enterFullscreen;
......
......@@ -143,7 +143,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
*****************************************************************************/
@implementation VLCVoutView
- (id)initWithFrame:(NSRect)frameRect
- (id)initWithFrame: (NSRect)frameRect
{
[super initWithFrame: frameRect];
p_vout = NULL;
......@@ -155,8 +155,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return self;
}
- (BOOL)setVout: (vout_thread_t *) vout subView: (NSView *) view
frame: (NSRect *) frame
- (BOOL)setVout: (vout_thread_t *) vout s
ubView: (NSView *) view
frame: (NSRect *) frame
{
int i_device;
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
......
/*****************************************************************************
* voutgl.m: MacOS X OpenGL provider
*****************************************************************************