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

macosx: fixed white spacing errors

Found by the GTM Xcode plugin, which was finally updated for Xcode4
parent 01fad0ca
...@@ -425,7 +425,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf, ...@@ -425,7 +425,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
if( psz_afilters ) { if( psz_afilters ) {
[o_comp_enable_ckb setState: (NSInteger)strstr( psz_afilters, "compressor" ) ]; [o_comp_enable_ckb setState: (NSInteger)strstr( psz_afilters, "compressor" ) ];
free( psz_afilters ); free( psz_afilters );
} }
else else
[o_comp_enable_ckb setState: NSOffState]; [o_comp_enable_ckb setState: NSOffState];
...@@ -524,7 +524,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf, ...@@ -524,7 +524,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
if( psz_afilters ) { if( psz_afilters ) {
[o_spat_enable_ckb setState: (NSInteger)strstr( psz_afilters, "spatializer" ) ]; [o_spat_enable_ckb setState: (NSInteger)strstr( psz_afilters, "spatializer" ) ];
free( psz_afilters ); free( psz_afilters );
} }
else else
[o_spat_enable_ckb setState: NSOffState]; [o_spat_enable_ckb setState: NSOffState];
......
...@@ -68,7 +68,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -68,7 +68,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
- (void)awakeFromNib - (void)awakeFromNib
{ {
[[NSNotificationCenter defaultCenter] addObserver: self [[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(applicationWillFinishLaunching:) selector: @selector(applicationWillFinishLaunching:)
name: NSApplicationWillFinishLaunchingNotification name: NSApplicationWillFinishLaunchingNotification
object: nil]; object: nil];
...@@ -313,7 +313,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -313,7 +313,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
if( [o_name isEqualToString:@""] ) if( [o_name isEqualToString:@""] )
{ {
if( [o_url isFileURL] ) if( [o_url isFileURL] )
o_name = [[NSFileManager defaultManager] displayNameAtPath: [o_url path]]; o_name = [[NSFileManager defaultManager] displayNameAtPath: [o_url path]];
else else
o_name = [o_url absoluteString]; o_name = [o_url absoluteString];
......
...@@ -465,7 +465,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil; ...@@ -465,7 +465,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
if (!shouldDestroy) if (!shouldDestroy)
{ {
NSRect content = NSMakeRect(0, 0, 1, 1); NSRect content = NSMakeRect(0, 0, 1, 1);
dialogWindow = [[VLCDialogWindow alloc] initWithContentRect:content dialogWindow = [[VLCDialogWindow alloc] initWithContentRect:content
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO]; defer:NO];
...@@ -551,7 +551,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil; ...@@ -551,7 +551,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
if( strcmp( [[dialogWindow title] UTF8String], if( strcmp( [[dialogWindow title] UTF8String],
p_dialog->psz_title ) != 0 ) p_dialog->psz_title ) != 0 )
{ {
NSString *titleString = [NSString stringWithCString:p_dialog->psz_title NSString *titleString = [NSString stringWithCString:p_dialog->psz_title
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
[dialogWindow setTitle:titleString]; [dialogWindow setTitle:titleString];
......
...@@ -92,7 +92,7 @@ static ExtensionsManager* instance = nil; ...@@ -92,7 +92,7 @@ static ExtensionsManager* instance = nil;
{ {
bool b_Active = extension_IsActivated( p_extensions_manager, p_ext ); bool b_Active = extension_IsActivated( p_extensions_manager, p_ext );
NSString *titleString = [NSString stringWithCString:p_ext->psz_title NSString *titleString = [NSString stringWithCString:p_ext->psz_title
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
if( b_Active && extension_HasMenu( p_extensions_manager, p_ext ) ) if( b_Active && extension_HasMenu( p_extensions_manager, p_ext ) )
...@@ -147,8 +147,8 @@ static ExtensionsManager* instance = nil; ...@@ -147,8 +147,8 @@ static ExtensionsManager* instance = nil;
[submenu addItem:[NSMenuItem separatorItem]]; [submenu addItem:[NSMenuItem separatorItem]];
NSMenuItem *deactivateItem = [submenu addItemWithTitle:@"Deactivate" NSMenuItem *deactivateItem = [submenu addItemWithTitle:@"Deactivate"
action:@selector(triggerMenu:) action:@selector(triggerMenu:)
keyEquivalent:@""]; keyEquivalent:@""];
[deactivateItem setTarget:self]; [deactivateItem setTarget:self];
deactivateItem.tag = MENU_MAP(0, i_ext); deactivateItem.tag = MENU_MAP(0, i_ext);
......
...@@ -96,7 +96,7 @@ static VLCMainMenu *_o_sharedInstance = nil; ...@@ -96,7 +96,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
- (void)awakeFromNib - (void)awakeFromNib
{ {
[[NSNotificationCenter defaultCenter] addObserver: self [[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(applicationWillFinishLaunching:) selector: @selector(applicationWillFinishLaunching:)
name: NSApplicationWillFinishLaunchingNotification name: NSApplicationWillFinishLaunchingNotification
object: nil]; object: nil];
......
...@@ -113,10 +113,10 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -113,10 +113,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
unsigned int i_keyModifiers = [[VLCMain sharedInstance] VLCModifiersToCocoa:o_key]; unsigned int i_keyModifiers = [[VLCMain sharedInstance] VLCModifiersToCocoa:o_key];
return [[[o_event charactersIgnoringModifiers] lowercaseString] isEqualToString: [[VLCMain sharedInstance] VLCKeyToString: o_key]] && return [[[o_event charactersIgnoringModifiers] lowercaseString] isEqualToString: [[VLCMain sharedInstance] VLCKeyToString: o_key]] &&
(i_keyModifiers & NSShiftKeyMask) == ([o_event modifierFlags] & NSShiftKeyMask) && (i_keyModifiers & NSShiftKeyMask) == ([o_event modifierFlags] & NSShiftKeyMask) &&
(i_keyModifiers & NSControlKeyMask) == ([o_event modifierFlags] & NSControlKeyMask) && (i_keyModifiers & NSControlKeyMask) == ([o_event modifierFlags] & NSControlKeyMask) &&
(i_keyModifiers & NSAlternateKeyMask) == ([o_event modifierFlags] & NSAlternateKeyMask) && (i_keyModifiers & NSAlternateKeyMask) == ([o_event modifierFlags] & NSAlternateKeyMask) &&
(i_keyModifiers & NSCommandKeyMask) == ([o_event modifierFlags] & NSCommandKeyMask); (i_keyModifiers & NSCommandKeyMask) == ([o_event modifierFlags] & NSCommandKeyMask);
} }
...@@ -951,7 +951,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -951,7 +951,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_split_view setHidden: YES]; [o_split_view setHidden: YES];
[o_video_view setHidden: NO]; [o_video_view setHidden: NO];
if( [[o_video_view subviews] count] > 0 ) if( [[o_video_view subviews] count] > 0 )
[self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]]; [self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
} }
...@@ -1022,7 +1022,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1022,7 +1022,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)setRepeatOne - (void)setRepeatOne
{ {
[o_repeat_btn setImage: o_repeat_one_img]; [o_repeat_btn setImage: o_repeat_one_img];
[o_repeat_btn setAlternateImage: o_repeat_one_pressed_img]; [o_repeat_btn setAlternateImage: o_repeat_one_pressed_img];
} }
- (void)setRepeatAll - (void)setRepeatAll
...@@ -1227,7 +1227,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1227,7 +1227,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
* which will fit inside the screen. * which will fit inside the screen.
* *
* This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+. * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
* Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>, * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
* Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk> * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Copyright (C) 1996 Free Software Foundation, Inc. * Copyright (C) 1996 Free Software Foundation, Inc.
*/ */
...@@ -1253,7 +1253,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1253,7 +1253,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
difference2 = screenRect.origin.y - frameRect.origin.y; difference2 = screenRect.origin.y - frameRect.origin.y;
difference2 -= difference; difference2 -= difference;
// Take in account the space between the top of window and the top of the // Take in account the space between the top of window and the top of the
// screen which can be used to move the bottom of the window on the screen // screen which can be used to move the bottom of the window on the screen
if (difference2 > 0) if (difference2 > 0)
{ {
...@@ -1281,7 +1281,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1281,7 +1281,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
be allowed to zoom to full screen. be allowed to zoom to full screen.
* *
* This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+. * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
* Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>, * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
* Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk> * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Copyright (C) 1996 Free Software Foundation, Inc. * Copyright (C) 1996 Free Software Foundation, Inc.
*/ */
...@@ -1361,7 +1361,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1361,7 +1361,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
// needed when entering lion fullscreen mode // needed when entering lion fullscreen mode
if( b_fullscreen ) if( b_fullscreen )
return proposedFrameSize; return proposedFrameSize;
if( [[VLCCoreInteraction sharedInstance] aspectRatioIsLocked] ) if( [[VLCCoreInteraction sharedInstance] aspectRatioIsLocked] )
{ {
NSRect videoWindowFrame = [videoWindow frame]; NSRect videoWindowFrame = [videoWindow frame];
...@@ -2364,14 +2364,14 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2364,14 +2364,14 @@ static VLCMainWindow *_o_sharedInstance = nil;
[NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)]; [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
var_SetBool( pl_Get( VLCIntf ), "fullscreen", true ); var_SetBool( pl_Get( VLCIntf ), "fullscreen", true );
vout_thread_t *p_vout = getVout(); vout_thread_t *p_vout = getVout();
if( p_vout ) if( p_vout )
{ {
var_SetBool( p_vout, "fullscreen", true ); var_SetBool( p_vout, "fullscreen", true );
vlc_object_release( p_vout ); vlc_object_release( p_vout );
} }
[o_video_view setFrame: [[self contentView] frame]]; [o_video_view setFrame: [[self contentView] frame]];
b_fullscreen = YES; b_fullscreen = YES;
...@@ -2396,7 +2396,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2396,7 +2396,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([[VLCMain sharedInstance] activeVideoPlayback]) if ([[VLCMain sharedInstance] activeVideoPlayback])
[o_bottombar_view setHidden: YES]; [o_bottombar_view setHidden: YES];
[self setMovableByWindowBackground: NO]; [self setMovableByWindowBackground: NO];
} }
...@@ -2410,7 +2410,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2410,7 +2410,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
{ {
var_SetBool( pl_Get( VLCIntf ), "fullscreen", false ); var_SetBool( pl_Get( VLCIntf ), "fullscreen", false );
vout_thread_t *p_vout = getVout(); vout_thread_t *p_vout = getVout();
if( p_vout ) if( p_vout )
{ {
...@@ -2444,7 +2444,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2444,7 +2444,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([[VLCMain sharedInstance] activeVideoPlayback]) if ([[VLCMain sharedInstance] activeVideoPlayback])
[o_bottombar_view setHidden: NO]; [o_bottombar_view setHidden: NO];
[self setMovableByWindowBackground: YES]; [self setMovableByWindowBackground: YES];
} }
...@@ -2851,7 +2851,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2851,7 +2851,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
* which will fit inside the screen. * which will fit inside the screen.
* *
* This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+. * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
* Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>, * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
* Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk> * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Copyright (C) 1996 Free Software Foundation, Inc. * Copyright (C) 1996 Free Software Foundation, Inc.
*/ */
...@@ -2877,7 +2877,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2877,7 +2877,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
difference2 = screenRect.origin.y - frameRect.origin.y; difference2 = screenRect.origin.y - frameRect.origin.y;
difference2 -= difference; difference2 -= difference;
// Take in account the space between the top of window and the top of the // Take in account the space between the top of window and the top of the
// screen which can be used to move the bottom of the window on the screen // screen which can be used to move the bottom of the window on the screen
if (difference2 > 0) if (difference2 > 0)
{ {
...@@ -2905,7 +2905,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2905,7 +2905,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
be allowed to zoom to full screen. be allowed to zoom to full screen.
* *
* This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+. * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
* Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>, * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
* Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk> * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Copyright (C) 1996 Free Software Foundation, Inc. * Copyright (C) 1996 Free Software Foundation, Inc.
*/ */
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
{ {
var_SetBool( p_vout, "fullscreen", true ); var_SetBool( p_vout, "fullscreen", true );
vlc_object_release( p_vout ); vlc_object_release( p_vout );
} }
} }
else else
msg_Err( VLCIntf, "unknown button action sender" ); msg_Err( VLCIntf, "unknown button action sender" );
......
/* /*
Copyright (c) 2011, Joachim Bengtsson Copyright (c) 2011, Joachim Bengtsson
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. * Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
......
/* /*
Copyright (c) 2011, Joachim Bengtsson Copyright (c) 2011, Joachim Bengtsson
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. * Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
......
/* /*
Copyright (c) 2011, Joachim Bengtsson Copyright (c) 2011, Joachim Bengtsson
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. * Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
......
/* /*
Copyright (c) 2011, Joachim Bengtsson Copyright (c) 2011, Joachim Bengtsson
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. * Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
...@@ -185,7 +185,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv ...@@ -185,7 +185,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
} }
} }
#pragma mark #pragma mark
#pragma mark - #pragma mark -
#pragma mark Event tap callbacks #pragma mark Event tap callbacks
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
Provides a title, an identifier, and an icon to be shown, as well as a badge value and a property to determine Provides a title, an identifier, and an icon to be shown, as well as a badge value and a property to determine
whether the current item has a badge or not (`badgeValue` is set to -1 if no badge is shown) whether the current item has a badge or not (`badgeValue` is set to -1 if no badge is shown)
Used to form a hierarchical model of SourceListItem instances – similar to the Source List tree structure Used to form a hierarchical model of SourceListItem instances – similar to the Source List tree structure
and easily accessible by the data source with the "children" property and easily accessible by the data source with the "children" property
SourceListItem *parent SourceListItem *parent
- SourceListItem *child1; - SourceListItem *child1;
- SourceListItem *child2; - SourceListItem *child2;
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
- SourceListItem *anotherChildOfChild2; - SourceListItem *anotherChildOfChild2;
- SourceListItem *child3; - SourceListItem *child3;
*/ */
@interface SideBarItem : NSObject { @interface SideBarItem : NSObject {
......
...@@ -83,4 +83,4 @@ ...@@ -83,4 +83,4 @@
@property (readonly) NSUInteger numViews; @property (readonly) NSUInteger numViews;
@end @end
\ No newline at end of file
...@@ -184,4 +184,4 @@ ...@@ -184,4 +184,4 @@
- (IBAction)addTextModifierChanged:(id)sender; - (IBAction)addTextModifierChanged:(id)sender;
- (IBAction)enableAddLogo:(id)sender; - (IBAction)enableAddLogo:(id)sender;
- (IBAction)addLogoModifierChanged:(id)sender; - (IBAction)addLogoModifierChanged:(id)sender;
@end @end
\ No newline at end of file
...@@ -868,7 +868,7 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -868,7 +868,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
- (IBAction)enableExtract:(id)sender - (IBAction)enableExtract:(id)sender
{ {
BOOL b_state = [o_extract_ckb state]; BOOL b_state = [o_extract_ckb state];
[self setVideoFilter: "extract" on: b_state]; [self setVideoFilter: "extract" on: b_state];
[o_extract_fld setEnabled: b_state]; [o_extract_fld setEnabled: b_state];
[o_extract_lbl setEnabled: b_state]; [o_extract_lbl setEnabled: b_state];
...@@ -876,7 +876,7 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -876,7 +876,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
- (IBAction)extractModifierChanged:(id)sender - (IBAction)extractModifierChanged:(id)sender
{ {
[self setVideoFilterProperty: "extract-component" forFilter: "extract" integer: [o_extract_fld intValue]]; [self setVideoFilterProperty: "extract-component" forFilter: "extract" integer: [o_extract_fld intValue]];
} }
- (IBAction)enableInvert:(id)sender - (IBAction)enableInvert:(id)sender
...@@ -981,4 +981,4 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -981,4 +981,4 @@ static VLCVideoEffects *_o_sharedInstance = nil;
} }
} }
@end @end
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......
...@@ -58,7 +58,7 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -58,7 +58,7 @@ static VLAboutBox *_o_sharedInstance = nil;
} else { } else {
_o_sharedInstance = [super init]; _o_sharedInstance = [super init];
} }
return _o_sharedInstance; return _o_sharedInstance;
} }
...@@ -118,7 +118,7 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -118,7 +118,7 @@ static VLAboutBox *_o_sharedInstance = nil;
NSString *authors = [tmpArray componentsJoinedByString:@"\n\n"]; NSString *authors = [tmpArray componentsJoinedByString:@"\n\n"];
/* setup the authors and thanks field */ /* setup the authors and thanks field */
[o_credits_textview setString: [NSString stringWithFormat: @"%@\n\n\n\n\n\n%@\n\n%@\n\n", [o_credits_textview setString: [NSString stringWithFormat: @"%@\n\n\n\n\n\n%@\n\n%@\n\n",
[_NS(INTF_ABOUT_MSG) stringByReplacingOccurrencesOfString:@"\n" withString:@" "], [_NS(INTF_ABOUT_MSG) stringByReplacingOccurrencesOfString:@"\n" withString:@" "],
authors, authors,
[[NSString stringWithUTF8String: psz_thanks] stringByReplacingOccurrencesOfString:@"\n" withString:@" " options:0 range:NSRangeFromString(@"680 2")]]]; [[NSString stringWithUTF8String: psz_thanks] stringByReplacingOccurrencesOfString:@"\n" withString:@" " options:0 range:NSRangeFromString(@"680 2")]]];
...@@ -177,7 +177,7 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -177,7 +177,7 @@ static VLAboutBox *_o_sharedInstance = nil;
if( f_current >= f_end ) if( f_current >= f_end )
{ {
/* f_end may be wrong on first run, so don't trust it too much */ /* f_end may be wrong on first run, so don't trust it too much */
if( f_end == [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height ) if( f_end == [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height )
{ {
b_restart = YES; b_restart = YES;
[o_credits_textview scrollPoint:NSMakePoint( 0, 0 )]; [o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
...@@ -227,7 +227,7 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -227,7 +227,7 @@ static VLAboutBox *_o_sharedInstance = nil;
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{ {
/* delegate to update button states (we're the frameLoadDelegate for our help's webview)« */ /* delegate to update button states (we're the frameLoadDelegate for our help's webview)« */
[o_help_fwd_btn setEnabled: [o_help_web_view canGoForward]]; [o_help_fwd_btn setEnabled: [o_help_web_view canGoForward]];
[o_help_bwd_btn setEnabled: [o_help_web_view canGoBack]]; [o_help_bwd_btn setEnabled: [o_help_web_view canGoBack]];
} }
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
{ {
return nil; return nil;
} }
if ( [o_command isEqualToString:@"play"] ) if ( [o_command isEqualToString:@"play"] )
{ {
[[VLCCoreInteraction sharedInstance] play]; [[VLCCoreInteraction sharedInstance] play];
......
...@@ -79,7 +79,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -79,7 +79,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
- (void)initStrings - (void)initStrings
{ {
/* localise the items */ /* localise the items */
/* main window */ /* main window */
[o_bookmarks_window setTitle: _NS("Bookmarks")]; [o_bookmarks_window setTitle: _NS("Bookmarks")];
[o_btn_add setTitle: _NS("Add")]; [o_btn_add setTitle: _NS("Add")];
...@@ -93,7 +93,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -93,7 +93,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
setStringValue: _NS("Position")]; setStringValue: _NS("Position")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell] [[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell]
setStringValue: _NS("Time")]; setStringValue: _NS("Time")];
/* edit window */ /* edit window */
[o_edit_btn_ok setTitle: _NS("OK")]; [o_edit_btn_ok setTitle: _NS("OK")];
[o_edit_btn_cancel setTitle: _NS("Cancel")]; [o_edit_btn_cancel setTitle: _NS("Cancel")];
...@@ -115,7 +115,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -115,7 +115,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
input_thread_t * p_input = pl_CurrentInput( VLCIntf ); input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input ) return; if( !p_input ) return;
seekpoint_t bookmark; seekpoint_t bookmark;
if( !input_Control( p_input, INPUT_GET_BOOKMARK, &bookmark ) ) if( !input_Control( p_input, INPUT_GET_BOOKMARK, &bookmark ) )
...@@ -123,9 +123,9 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -123,9 +123,9 @@ static VLCBookmarks *_o_sharedInstance = nil;
bookmark.psz_name = _("Untitled"); bookmark.psz_name = _("Untitled");
input_Control( p_input, INPUT_ADD_BOOKMARK, &bookmark ); input_Control( p_input, INPUT_ADD_BOOKMARK, &bookmark );
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
[o_tbl_dataTable reloadData]; [o_tbl_dataTable reloadData];
} }
...@@ -133,14 +133,14 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -133,14 +133,14 @@ static VLCBookmarks *_o_sharedInstance = nil;
{ {
/* clear table */ /* clear table */
input_thread_t * p_input = pl_CurrentInput( VLCIntf ); input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input ) if( !p_input )
return; return;
input_Control( p_input, INPUT_CLEAR_BOOKMARKS ); input_Control( p_input, INPUT_CLEAR_BOOKMARKS );
vlc_object_release( p_input ); vlc_object_release( p_input );
[o_tbl_dataTable reloadData]; [o_tbl_dataTable reloadData];
} }
...@@ -154,7 +154,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -154,7 +154,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
int i_bookmarks; int i_bookmarks;
int row; int row;
row = [o_tbl_dataTable selectedRow]; row = [o_tbl_dataTable selectedRow];
if( !p_input && row < 0 ) if( !p_input && row < 0 )
return; return;
...@@ -171,7 +171,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -171,7 +171,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
(pp_bookmarks[row]->i_time_offset / 1000000)] stringValue]];