Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
2c15069f
Commit
2c15069f
authored
Dec 18, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed compilation if VLM is not enabled
parent
c81134f4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+4
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+12
-0
No files found.
modules/gui/macosx/intf.h
View file @
2c15069f
...
@@ -106,7 +106,9 @@ struct intf_sys_t
...
@@ -106,7 +106,9 @@ struct intf_sys_t
id
o_wizard
;
/* VLCWizard */
id
o_wizard
;
/* VLCWizard */
id
o_extended
;
/* VLCExtended */
id
o_extended
;
/* VLCExtended */
id
o_bookmarks
;
/* VLCBookmarks */
id
o_bookmarks
;
/* VLCBookmarks */
#ifdef ENABLE_VLM
id
o_vlm
;
/* VLCVLMController */
id
o_vlm
;
/* VLCVLMController */
#endif
id
o_embedded_list
;
/* VLCEmbeddedList*/
id
o_embedded_list
;
/* VLCEmbeddedList*/
id
o_coredialogs
;
/* VLCCoreDialogProvider */
id
o_coredialogs
;
/* VLCCoreDialogProvider */
VLCInformation
*
o_info
;
/* VLCInformation */
VLCInformation
*
o_info
;
/* VLCInformation */
...
@@ -119,7 +121,9 @@ struct intf_sys_t
...
@@ -119,7 +121,9 @@ struct intf_sys_t
BOOL
nib_bookmarks_loaded
;
/* bookmarks nibfile */
BOOL
nib_bookmarks_loaded
;
/* bookmarks nibfile */
BOOL
nib_prefs_loaded
;
/* preferences nibfile */
BOOL
nib_prefs_loaded
;
/* preferences nibfile */
BOOL
nib_info_loaded
;
/* information panel nibfile */
BOOL
nib_info_loaded
;
/* information panel nibfile */
#ifdef ENABLE_VLM
BOOL
nib_vlm_loaded
;
/* VLM Panel nibfile */
BOOL
nib_vlm_loaded
;
/* VLM Panel nibfile */
#endif
BOOL
nib_coredialogs_loaded
;
/* CoreDialogs nibfile */
BOOL
nib_coredialogs_loaded
;
/* CoreDialogs nibfile */
IBOutlet
VLCControllerWindow
*
o_window
;
/* main window */
IBOutlet
VLCControllerWindow
*
o_window
;
/* main window */
...
...
modules/gui/macosx/intf.m
View file @
2c15069f
...
@@ -52,7 +52,9 @@
...
@@ -52,7 +52,9 @@
#import "AppleRemote.h"
#import "AppleRemote.h"
#import "eyetv.h"
#import "eyetv.h"
#import "simple_prefs.h"
#import "simple_prefs.h"
#ifdef ENABLE_VLM
#import "vlm.h"
#import "vlm.h"
#endif
#import <AddressBook/AddressBook.h>
/* for crashlog send mechanism */
#import <AddressBook/AddressBook.h>
/* for crashlog send mechanism */
#import <IOKit/hidsystem/ev_keymap.h>
/* for the media key support */
#import <IOKit/hidsystem/ev_keymap.h>
/* for the media key support */
...
@@ -352,7 +354,9 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -352,7 +354,9 @@ static VLCMain *_o_sharedMainInstance = nil;
o_prefs
=
nil
;
o_prefs
=
nil
;
o_open
=
[[
VLCOpen
alloc
]
init
];
o_open
=
[[
VLCOpen
alloc
]
init
];
o_wizard
=
[[
VLCWizard
alloc
]
init
];
o_wizard
=
[[
VLCWizard
alloc
]
init
];
#ifdef ENABLE_VLM
o_vlm
=
[[
VLCVLMController
alloc
]
init
];
o_vlm
=
[[
VLCVLMController
alloc
]
init
];
#endif
o_extended
=
nil
;
o_extended
=
nil
;
o_bookmarks
=
[[
VLCBookmarks
alloc
]
init
];
o_bookmarks
=
[[
VLCBookmarks
alloc
]
init
];
o_embedded_list
=
[[
VLCEmbeddedList
alloc
]
init
];
o_embedded_list
=
[[
VLCEmbeddedList
alloc
]
init
];
...
@@ -1445,10 +1449,12 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key )
...
@@ -1445,10 +1449,12 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key )
return
nil
;
return
nil
;
}
}
#ifdef ENABLE_VLM
-
(
id
)
vlm
-
(
id
)
vlm
{
{
return
o_vlm
;
return
o_vlm
;
}
}
#endif
-
(
id
)
bookmarks
-
(
id
)
bookmarks
{
{
...
@@ -2191,10 +2197,16 @@ end:
...
@@ -2191,10 +2197,16 @@ end:
-
(
IBAction
)
showVLM
:(
id
)
sender
-
(
IBAction
)
showVLM
:(
id
)
sender
{
{
#ifdef ENABLE_VLM
if
(
!
nib_vlm_loaded
)
if
(
!
nib_vlm_loaded
)
nib_vlm_loaded
=
[
NSBundle
loadNibNamed
:
@"VLM"
owner
:
NSApp
];
nib_vlm_loaded
=
[
NSBundle
loadNibNamed
:
@"VLM"
owner
:
NSApp
];
[
o_vlm
showVLMWindow
];
[
o_vlm
showVLMWindow
];
#else
NSAlert
*
theAlert
;
theAlert
=
[
NSAlert
alertWithMessageText
:
_NS
(
"VLM not available"
)
defaultButton
:
_NS
(
"OK"
)
alternateButton
:
nil
otherButton
:
nil
informativeTextWithFormat
:
_NS
(
"The VideoLAN Manager was not enabled in this version of VLC."
)];
[
theAlert
runModal
];
#endif
}
}
-
(
IBAction
)
showExtended
:(
id
)
sender
-
(
IBAction
)
showExtended
:(
id
)
sender
...
...
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