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

macosx: fixed compilation when using the 10.5 SDK

parent 01d1a3a6
...@@ -27,10 +27,7 @@ ...@@ -27,10 +27,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "PXSourceList.h" #import "PXSourceList.h"
#import <vlc_input.h> #import <vlc_input.h>
#import "misc.h"
#ifndef MAC_OS_X_VERSION_10_6
@protocol NSWindowDelegate <NSObject> @end
#endif
@interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate> { @interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate> {
IBOutlet id o_play_btn; IBOutlet id o_play_btn;
...@@ -126,4 +123,5 @@ ...@@ -126,4 +123,5 @@
NSImage * o_time_sld_gradient_right_img; NSImage * o_time_sld_gradient_right_img;
} }
- (void)loadImagesInDarkStyle:(BOOL)b_value; - (void)loadImagesInDarkStyle:(BOOL)b_value;
@end @end
\ No newline at end of file
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#import "CoreInteraction.h" #import "CoreInteraction.h"
#import "AudioEffects.h" #import "AudioEffects.h"
#import "MainMenu.h" #import "MainMenu.h"
#import "misc.h"
#import "controls.h" // TODO: remove me #import "controls.h" // TODO: remove me
#import "SideBarItem.h" #import "SideBarItem.h"
#import <vlc_playlist.h> #import <vlc_playlist.h>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
/*An example of a class that could be used to represent a Source List Item /*An example of a class that could be used to represent a Source List Item
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)
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
NSString *identifier; NSString *identifier;
NSImage *icon; NSImage *icon;
NSInteger badgeValue; NSInteger badgeValue;
NSArray *children; NSArray *children;
} }
......
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
{ {
badgeValue = -1; //We don't want a badge value by default badgeValue = -1; //We don't want a badge value by default
} }
return self; return self;
} }
+ (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier + (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier
{ {
SideBarItem *item = [SideBarItem itemWithTitle:aTitle identifier:anIdentifier icon:nil]; SideBarItem *item = [SideBarItem itemWithTitle:aTitle identifier:anIdentifier icon:nil];
return item; return item;
} }
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
+ (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier icon:(NSImage*)anIcon + (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier icon:(NSImage*)anIcon
{ {
SideBarItem *item = [[[SideBarItem alloc] init] autorelease]; SideBarItem *item = [[[SideBarItem alloc] init] autorelease];
[item setTitle:aTitle]; [item setTitle:aTitle];
[item setIdentifier:anIdentifier]; [item setIdentifier:anIdentifier];
[item setIcon:anIcon]; [item setIcon:anIcon];
return item; return item;
} }
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
[identifier release]; [identifier release];
[icon release]; [icon release];
[children release]; [children release];
[super dealloc]; [super dealloc];
} }
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
identifier = nil; identifier = nil;
icon = nil; icon = nil;
children = nil; children = nil;
[super finalize]; [super finalize];
} }
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#import "SPMediaKeyTap.h" /* for the media key support */ #import "SPMediaKeyTap.h" /* for the media key support */
#import "misc.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
...@@ -78,9 +79,6 @@ struct intf_sys_t ...@@ -78,9 +79,6 @@ struct intf_sys_t
/***************************************************************************** /*****************************************************************************
* VLCMain interface * VLCMain interface
*****************************************************************************/ *****************************************************************************/
#ifndef MAC_OS_X_VERSION_10_6
@protocol NSWindowDelegate <NSObject> @end
#endif
@class AppleRemote; @class AppleRemote;
@class VLCInformation; @class VLCInformation;
@class VLCEmbeddedWindow; @class VLCEmbeddedWindow;
......
...@@ -290,7 +290,7 @@ static int InputEvent( vlc_object_t *p_this, const char *psz_var, ...@@ -290,7 +290,7 @@ static int InputEvent( vlc_object_t *p_this, const char *psz_var,
case INPUT_EVENT_DEAD: case INPUT_EVENT_DEAD:
[[VLCMain sharedInstance] updateName]; [[VLCMain sharedInstance] updateName];
[[VLCMain sharedInstance] updateTimeSlider]; [[VLCMain sharedInstance] updatePlaybackPosition];
break; break;
case INPUT_EVENT_ABORT: case INPUT_EVENT_ABORT:
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#import "PXSourceList.h"
/***************************************************************************** /*****************************************************************************
* VLCPlaylistView interface * VLCPlaylistView interface
*****************************************************************************/ *****************************************************************************/
...@@ -34,9 +36,6 @@ ...@@ -34,9 +36,6 @@
/***************************************************************************** /*****************************************************************************
* VLCPlaylistCommon interface * VLCPlaylistCommon interface
*****************************************************************************/ *****************************************************************************/
#ifndef MAC_OS_X_VERSION_10_6
@protocol NSOutlineViewDataSource <NSObject> @end
#endif
@interface VLCPlaylistCommon : NSObject <NSOutlineViewDataSource, NSOutlineViewDelegate> @interface VLCPlaylistCommon : NSObject <NSOutlineViewDataSource, NSOutlineViewDelegate>
{ {
IBOutlet id o_tc_name; IBOutlet id o_tc_name;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#ifndef MAC_OS_X_VERSION_10_6 #ifndef MAC_OS_X_VERSION_10_6
@protocol NSComboBoxDataSource <NSObject> @end @protocol NSComboBoxDataSource <NSObject> @end
@protocol NSTextFieldDelegate <NSObject> @end @protocol NSTextFieldDelegate <NSObject> @end
@protocol NSTableViewDataSource <NSObject> @end
#endif #endif
static NSMenu *o_keys_menu = nil; static NSMenu *o_keys_menu = nil;
......
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