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,
if( psz_afilters ) {
[o_comp_enable_ckb setState: (NSInteger)strstr( psz_afilters, "compressor" ) ];
free( psz_afilters );
}
}
else
[o_comp_enable_ckb setState: NSOffState];
......@@ -524,7 +524,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
if( psz_afilters ) {
[o_spat_enable_ckb setState: (NSInteger)strstr( psz_afilters, "spatializer" ) ];
free( psz_afilters );
}
}
else
[o_spat_enable_ckb setState: NSOffState];
......
......@@ -68,7 +68,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
- (void)awakeFromNib
{
[[NSNotificationCenter defaultCenter] addObserver: self
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(applicationWillFinishLaunching:)
name: NSApplicationWillFinishLaunchingNotification
object: nil];
......@@ -313,7 +313,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
if( [o_name isEqualToString:@""] )
{
if( [o_url isFileURL] )
if( [o_url isFileURL] )
o_name = [[NSFileManager defaultManager] displayNameAtPath: [o_url path]];
else
o_name = [o_url absoluteString];
......
......@@ -465,7 +465,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
if (!shouldDestroy)
{
NSRect content = NSMakeRect(0, 0, 1, 1);
dialogWindow = [[VLCDialogWindow alloc] initWithContentRect:content
dialogWindow = [[VLCDialogWindow alloc] initWithContentRect:content
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
backing:NSBackingStoreBuffered
defer:NO];
......@@ -551,7 +551,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
if( strcmp( [[dialogWindow title] UTF8String],
p_dialog->psz_title ) != 0 )
{
NSString *titleString = [NSString stringWithCString:p_dialog->psz_title
NSString *titleString = [NSString stringWithCString:p_dialog->psz_title
encoding:NSUTF8StringEncoding];
[dialogWindow setTitle:titleString];
......
......@@ -92,7 +92,7 @@ static ExtensionsManager* instance = nil;
{
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];
if( b_Active && extension_HasMenu( p_extensions_manager, p_ext ) )
......@@ -147,8 +147,8 @@ static ExtensionsManager* instance = nil;
[submenu addItem:[NSMenuItem separatorItem]];
NSMenuItem *deactivateItem = [submenu addItemWithTitle:@"Deactivate"
action:@selector(triggerMenu:)
NSMenuItem *deactivateItem = [submenu addItemWithTitle:@"Deactivate"
action:@selector(triggerMenu:)
keyEquivalent:@""];
[deactivateItem setTarget:self];
deactivateItem.tag = MENU_MAP(0, i_ext);
......
......@@ -96,7 +96,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
- (void)awakeFromNib
{
[[NSNotificationCenter defaultCenter] addObserver: self
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(applicationWillFinishLaunching:)
name: NSApplicationWillFinishLaunchingNotification
object: nil];
......
......@@ -113,10 +113,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
unsigned int i_keyModifiers = [[VLCMain sharedInstance] VLCModifiersToCocoa:o_key];
return [[[o_event charactersIgnoringModifiers] lowercaseString] isEqualToString: [[VLCMain sharedInstance] VLCKeyToString: o_key]] &&
(i_keyModifiers & NSShiftKeyMask) == ([o_event modifierFlags] & NSShiftKeyMask) &&
(i_keyModifiers & NSControlKeyMask) == ([o_event modifierFlags] & NSControlKeyMask) &&
(i_keyModifiers & NSAlternateKeyMask) == ([o_event modifierFlags] & NSAlternateKeyMask) &&
return [[[o_event charactersIgnoringModifiers] lowercaseString] isEqualToString: [[VLCMain sharedInstance] VLCKeyToString: o_key]] &&
(i_keyModifiers & NSShiftKeyMask) == ([o_event modifierFlags] & NSShiftKeyMask) &&
(i_keyModifiers & NSControlKeyMask) == ([o_event modifierFlags] & NSControlKeyMask) &&
(i_keyModifiers & NSAlternateKeyMask) == ([o_event modifierFlags] & NSAlternateKeyMask) &&
(i_keyModifiers & NSCommandKeyMask) == ([o_event modifierFlags] & NSCommandKeyMask);
}
......@@ -951,7 +951,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_split_view setHidden: YES];
[o_video_view setHidden: NO];
if( [[o_video_view subviews] count] > 0 )
[self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
}
......@@ -1022,7 +1022,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)setRepeatOne
{
[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
......@@ -1227,7 +1227,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
* which will fit inside the screen.
*
* 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>
* Copyright (C) 1996 Free Software Foundation, Inc.
*/
......@@ -1253,7 +1253,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
difference2 = screenRect.origin.y - frameRect.origin.y;
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
if (difference2 > 0)
{
......@@ -1281,7 +1281,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
be allowed to zoom to full screen.
*
* 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>
* Copyright (C) 1996 Free Software Foundation, Inc.
*/
......@@ -1361,7 +1361,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
// needed when entering lion fullscreen mode
if( b_fullscreen )
return proposedFrameSize;
if( [[VLCCoreInteraction sharedInstance] aspectRatioIsLocked] )
{
NSRect videoWindowFrame = [videoWindow frame];
......@@ -2364,14 +2364,14 @@ static VLCMainWindow *_o_sharedInstance = nil;
[NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
var_SetBool( pl_Get( VLCIntf ), "fullscreen", true );
vout_thread_t *p_vout = getVout();
if( p_vout )
{
var_SetBool( p_vout, "fullscreen", true );
vlc_object_release( p_vout );
}
[o_video_view setFrame: [[self contentView] frame]];
b_fullscreen = YES;
......@@ -2396,7 +2396,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([[VLCMain sharedInstance] activeVideoPlayback])
[o_bottombar_view setHidden: YES];
[self setMovableByWindowBackground: NO];
}
......@@ -2410,7 +2410,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
var_SetBool( pl_Get( VLCIntf ), "fullscreen", false );
vout_thread_t *p_vout = getVout();
if( p_vout )
{
......@@ -2444,7 +2444,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([[VLCMain sharedInstance] activeVideoPlayback])
[o_bottombar_view setHidden: NO];
[self setMovableByWindowBackground: YES];
}
......@@ -2851,7 +2851,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
* which will fit inside the screen.
*
* 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>
* Copyright (C) 1996 Free Software Foundation, Inc.
*/
......@@ -2877,7 +2877,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
difference2 = screenRect.origin.y - frameRect.origin.y;
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
if (difference2 > 0)
{
......@@ -2905,7 +2905,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
be allowed to zoom to full screen.
*
* 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>
* Copyright (C) 1996 Free Software Foundation, Inc.
*/
......
......@@ -183,7 +183,7 @@
{
var_SetBool( p_vout, "fullscreen", true );
vlc_object_release( p_vout );
}
}
}
else
msg_Err( VLCIntf, "unknown button action sender" );
......
/*
Copyright (c) 2011, Joachim Bengtsson
All rights reserved.
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.
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
All rights reserved.
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.
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
All rights reserved.
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.
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
All rights reserved.
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.
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
}
}
#pragma mark
#pragma mark
#pragma mark -
#pragma mark Event tap callbacks
......
......@@ -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
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
and easily accessible by the data source with the "children" property
SourceListItem *parent
- SourceListItem *child1;
- SourceListItem *child2;
......@@ -25,7 +25,7 @@
- SourceListItem *anotherChildOfChild2;
- SourceListItem *child3;
*/
@interface SideBarItem : NSObject {
......
......@@ -83,4 +83,4 @@
@property (readonly) NSUInteger numViews;
@end
\ No newline at end of file
@end
......@@ -184,4 +184,4 @@
- (IBAction)addTextModifierChanged:(id)sender;
- (IBAction)enableAddLogo:(id)sender;
- (IBAction)addLogoModifierChanged:(id)sender;
@end
\ No newline at end of file
@end
......@@ -868,7 +868,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
- (IBAction)enableExtract:(id)sender
{
BOOL b_state = [o_extract_ckb state];
BOOL b_state = [o_extract_ckb state];
[self setVideoFilter: "extract" on: b_state];
[o_extract_fld setEnabled: b_state];
[o_extract_lbl setEnabled: b_state];
......@@ -876,7 +876,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
- (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
......@@ -981,4 +981,4 @@ static VLCVideoEffects *_o_sharedInstance = nil;
}
}
@end
\ No newline at end of file
@end
......@@ -14,7 +14,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......
......@@ -14,7 +14,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......
......@@ -58,7 +58,7 @@ static VLAboutBox *_o_sharedInstance = nil;
} else {
_o_sharedInstance = [super init];
}
return _o_sharedInstance;
}
......@@ -118,7 +118,7 @@ static VLAboutBox *_o_sharedInstance = nil;
NSString *authors = [tmpArray componentsJoinedByString:@"\n\n"];
/* 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:@" "],
authors,
[[NSString stringWithUTF8String: psz_thanks] stringByReplacingOccurrencesOfString:@"\n" withString:@" " options:0 range:NSRangeFromString(@"680 2")]]];
......@@ -177,7 +177,7 @@ static VLAboutBox *_o_sharedInstance = nil;
if( f_current >= f_end )
{
/* 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;
[o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
......@@ -227,7 +227,7 @@ static VLAboutBox *_o_sharedInstance = nil;
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{
/* 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]];
}
......
......@@ -94,7 +94,7 @@
{
return nil;
}
if ( [o_command isEqualToString:@"play"] )
{
[[VLCCoreInteraction sharedInstance] play];
......
......@@ -79,7 +79,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
- (void)initStrings
{
/* localise the items */
/* main window */
[o_bookmarks_window setTitle: _NS("Bookmarks")];
[o_btn_add setTitle: _NS("Add")];
......@@ -93,7 +93,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
setStringValue: _NS("Position")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell]
setStringValue: _NS("Time")];
/* edit window */
[o_edit_btn_ok setTitle: _NS("OK")];
[o_edit_btn_cancel setTitle: _NS("Cancel")];
......@@ -115,7 +115,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input ) return;
seekpoint_t bookmark;
if( !input_Control( p_input, INPUT_GET_BOOKMARK, &bookmark ) )
......@@ -123,9 +123,9 @@ static VLCBookmarks *_o_sharedInstance = nil;
bookmark.psz_name = _("Untitled");
input_Control( p_input, INPUT_ADD_BOOKMARK, &bookmark );
}
vlc_object_release( p_input );
[o_tbl_dataTable reloadData];
}
......@@ -133,14 +133,14 @@ static VLCBookmarks *_o_sharedInstance = nil;
{
/* clear table */
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input )
return;
input_Control( p_input, INPUT_CLEAR_BOOKMARKS );
vlc_object_release( p_input );
[o_tbl_dataTable reloadData];
}
......@@ -154,7 +154,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
int i_bookmarks;
int row;
row = [o_tbl_dataTable selectedRow];
if( !p_input && row < 0 )
return;
......@@ -171,7 +171,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
(pp_bookmarks[row]->i_time_offset / 1000000)] stringValue]];
[o_edit_fld_bytes setStringValue: [[NSNumber numberWithInt:
pp_bookmarks[row]->i_byte_offset] stringValue]];
/* Just keep the pointer value to check if it
* changes. Note, we don't need to keep a reference to the object.
* so release it now. */
......@@ -204,7 +204,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
seekpoint_t **pp_bookmarks;
int i_bookmarks, i;
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input )
{
NSBeginCriticalAlertSheet(_NS("No input"), _NS("OK"),
......@@ -223,7 +223,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
vlc_object_release( p_input );
return;
}
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks ) != VLC_SUCCESS )
{
......@@ -232,24 +232,24 @@ static VLCBookmarks *_o_sharedInstance = nil;
}
i = [o_tbl_dataTable selectedRow];
free( pp_bookmarks[i]->psz_name );
pp_bookmarks[i]->psz_name = strdup([[o_edit_fld_name stringValue] UTF8String]);
pp_bookmarks[i]->i_byte_offset = [[o_edit_fld_bytes stringValue] intValue];
pp_bookmarks[i]->i_time_offset = ([[o_edit_fld_time stringValue] intValue] * 1000000);
if( input_Control( p_input, INPUT_CHANGE_BOOKMARK, pp_bookmarks[i], i )
!= VLC_SUCCESS )
{
msg_Warn( VLCIntf, "Unable to change the bookmark");
goto clear;
}
[o_tbl_dataTable reloadData];
vlc_object_release( p_input );
[NSApp endSheet: o_edit_window];
[o_edit_window close];
......@@ -278,7 +278,7 @@ clear:
_NS("The stream must be playing or paused for bookmarks to work."));
return;
}
seekpoint_t **pp_bookmarks;
int i_bookmarks ;
int i_first = -1;
......@@ -300,9 +300,9 @@ clear:
}
}
}
msg_Dbg( VLCIntf, "got the bookmark-indexes");
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks ) != VLC_SUCCESS )
{
......@@ -332,7 +332,7 @@ clear:
- (IBAction)goToBookmark:(id)sender
{
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input ) return;
input_Control( p_input, INPUT_SET_BOOKMARK, [o_tbl_dataTable selectedRow] );
......@@ -344,7 +344,7 @@ clear:
{
/* remove selected item */
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( !p_input ) return;
int i_focused = [o_tbl_dataTable selectedRow];
......@@ -353,7 +353,7 @@ clear:
input_Control( p_input, INPUT_DEL_BOOKMARK, i_focused );
vlc_object_release( p_input );
[o_tbl_dataTable reloadData];
}
......@@ -376,7 +376,7 @@ clear:
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
seekpoint_t **pp_bookmarks;
int i_bookmarks;
if( !p_input ) return 0;
else if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks ) != VLC_SUCCESS )
......
......@@ -37,7 +37,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
}
- (id)init
- (id)init
{
if (_o_sharedInstance) {
[self dealloc];
......@@ -89,7 +89,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
"end tell"];
NSDictionary *errorDict;
NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
if( nil == descriptor )
if( nil == descriptor )
{
NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
NSLog( @"opening EyeTV failed with error status '%@'", errorString );
......@@ -104,7 +104,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
@"tell application \"EyeTV\" to get current channel"];
NSDictionary *errorDict;
NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
if( nil == descriptor )
if( nil == descriptor )
{
NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
NSLog( @"EyeTV channel inventory failed with error status '%@'", errorString );
......@@ -144,7 +144,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
}
descriptor = [script executeAndReturnError:&errorDict];
if( nil == descriptor )
if( nil == descriptor )
{
NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
NSLog( @"EyeTV channel change failed with error status '%@'", errorString );
......@@ -197,7 +197,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
}
NSDictionary *errorDict;
NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
if( nil == descriptor )
if( nil == descriptor )
{
NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
NSLog( @"EyeTV source change failed with error status '%@'", errorString );
......@@ -212,7 +212,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
@"tell application \"EyeTV\" to get name of every channel"];
NSDictionary *errorDict;
NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
if( nil == descriptor )
if( nil == descriptor )
{
NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
NSLog( @"EyeTV channel inventory failed with error status '%@'", errorString );
......@@ -220,7 +220,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
else
{
int count = [descriptor numberOfItems];
int x=0;
int x=0;
NSMutableArray *channelArray = [NSMutableArray arrayWithCapacity:count];
while( x++ < count ) {
[channelArray addObject:[[descriptor descriptorAtIndex:x] stringValue]];
......
......@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......@@ -42,9 +42,9 @@
*****************************************************************************/
@implementation VLCFSPanel
/* We override this initializer so we can set the NSBorderlessWindowMask styleMask, and set a few other important settings */
- (id)initWithContentRect:(NSRect)contentRect
styleMask:(NSUInteger)aStyle
backing:(NSBackingStoreType)bufferingType
- (id)initWithContentRect:(NSRect)contentRect
styleMask:(NSUInteger)aStyle
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
{
id win = [super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];
......@@ -239,10 +239,10 @@
{
b_fadeQueued=NO;
[self setFadeTimer:
[NSTimer scheduledTimerWithTimeInterval:0.1
target:self
selector:@selector(focus:)
userInfo:NULL
[NSTimer scheduledTimerWithTimeInterval:0.1
target:self
selector:@selector(focus:)
userInfo:NULL
repeats:YES]];
}
}
......@@ -322,9 +322,9 @@
}
/* released in -autoHide and -dealloc */
hideAgainTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5
target: self
target: self
selector: @selector(keepVisible:)
userInfo: nil
userInfo: nil
repeats: YES] retain];
b_alreadyCounting = YES;
}
......
......@@ -1370,9 +1370,9 @@ unsigned int CocoaKeyToVLC( unichar i_key )
unsigned int i_keyModifiers = [self VLCModifiersToCocoa: str];
if( [[[o_event charactersIgnoringModifiers] lowercaseString] isEqualToString: [self VLCKeyToString: str]] &&
(i_keyModifiers & NSShiftKeyMask) == (i_pressed_modifiers & NSShiftKeyMask) &&
(i_keyModifiers & NSControlKeyMask) == (i_pressed_modifiers & NSControlKeyMask) &&
(i_keyModifiers & NSAlternateKeyMask) == (i_pressed_modifiers & NSAlternateKeyMask) &&
(i_keyModifiers & NSShiftKeyMask) == (i_pressed_modifiers & NSShiftKeyMask) &&
(i_keyModifiers & NSControlKeyMask) == (i_pressed_modifiers & NSControlKeyMask) &&
(i_keyModifiers & NSAlternateKeyMask) == (i_pressed_modifiers & NSAlternateKeyMask) &&
(i_keyModifiers & NSCommandKeyMask) == (i_pressed_modifiers & NSCommandKeyMask) )
{
b_found_key = YES;
......@@ -1415,7 +1415,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
}
}
module_config_free (p_config);
if( o_usedHotkeys )
[o_usedHotkeys release];
o_usedHotkeys = [[NSArray alloc] initWithArray: o_tempArray copyItems: YES];
......@@ -1432,7 +1432,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
if (b_nativeFullscreenMode)
{
// this is called twice in certain situations, so only toogle if we really need to
if( ( b_fullscreen && !([NSApp currentSystemPresentationOptions] & NSApplicationPresentationFullScreen) ) ||
if( ( b_fullscreen && !([NSApp currentSystemPresentationOptions] & NSApplicationPresentationFullScreen) ) ||
( !b_fullscreen && ([NSApp currentSystemPresentationOptions] & NSApplicationPresentationFullScreen) ) )