Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
dac76415
Commit
dac76415
authored
Aug 03, 2011
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed compilation when using the 10.5 SDK
parent
01d1a3a6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
22 deletions
+17
-22
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+3
-5
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+0
-1
modules/gui/macosx/SideBarItem.h
modules/gui/macosx/SideBarItem.h
+2
-2
modules/gui/macosx/SideBarItem.m
modules/gui/macosx/SideBarItem.m
+7
-7
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+1
-3
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+1
-1
modules/gui/macosx/playlist.h
modules/gui/macosx/playlist.h
+2
-3
modules/gui/macosx/prefs_widgets.h
modules/gui/macosx/prefs_widgets.h
+1
-0
No files found.
modules/gui/macosx/MainWindow.h
View file @
dac76415
...
@@ -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
modules/gui/macosx/MainWindow.m
View file @
dac76415
...
@@ -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>
...
...
modules/gui/macosx/SideBarItem.h
View file @
dac76415
...
@@ -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
;
}
}
...
...
modules/gui/macosx/SideBarItem.m
View file @
dac76415
...
@@ -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
];
}
}
...
...
modules/gui/macosx/intf.h
View file @
dac76415
...
@@ -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
;
...
...
modules/gui/macosx/intf.m
View file @
dac76415
...
@@ -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
]
update
TimeSlider
];
[[
VLCMain
sharedInstance
]
update
PlaybackPosition
];
break
;
break
;
case
INPUT_EVENT_ABORT
:
case
INPUT_EVENT_ABORT
:
...
...
modules/gui/macosx/playlist.h
View file @
dac76415
...
@@ -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
;
...
...
modules/gui/macosx/prefs_widgets.h
View file @
dac76415
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment