Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
5c5bd817
Commit
5c5bd817
authored
Jun 18, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: add NSApplicationDelegate for VLCMain class and correct one method declaration
parent
21614a27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
modules/gui/macosx/CompatibilityFixes.h
modules/gui/macosx/CompatibilityFixes.h
+1
-0
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+1
-2
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+3
-3
No files found.
modules/gui/macosx/CompatibilityFixes.h
View file @
5c5bd817
...
...
@@ -35,6 +35,7 @@
#ifndef MAC_OS_X_VERSION_10_6
@protocol
NSAnimationDelegate
<
NSObject
>
@end
@protocol
NSApplicationDelegate
<
NSObject
>
@end
@protocol
NSWindowDelegate
<
NSObject
>
@end
@protocol
NSComboBoxDataSource
<
NSObject
>
@end
@protocol
NSTextFieldDelegate
<
NSObject
>
@end
...
...
modules/gui/macosx/intf.h
View file @
5c5bd817
...
...
@@ -86,7 +86,7 @@ struct intf_sys_t
@class
VLCEmbeddedWindow
;
@class
VLCControls
;
@class
VLCPlaylist
;
@interface
VLCMain
:
NSObject
<
NSWindowDelegate
>
@interface
VLCMain
:
NSObject
<
NSWindowDelegate
,
NSApplicationDelegate
>
{
intf_thread_t
*
p_intf
;
/* The main intf object */
input_thread_t
*
p_current_input
;
...
...
@@ -196,7 +196,6 @@ struct intf_sys_t
-
(
void
)
showFullscreenController
;
-
(
void
)
updateDelays
;
-
(
void
)
initStrings
;
-
(
BOOL
)
application
:(
NSApplication
*
)
o_app
openFiles
:(
NSString
*
)
o_filename
;
-
(
IBAction
)
crashReporterAction
:(
id
)
sender
;
-
(
IBAction
)
openCrashLog
:(
id
)
sender
;
...
...
modules/gui/macosx/intf.m
View file @
5c5bd817
...
...
@@ -906,7 +906,7 @@ static VLCMain *_o_sharedMainInstance = nil;
#pragma mark -
#pragma mark File opening over dock icon
-
(
BOOL
)
application
:(
NSApplication
*
)
o_app
openFiles
:(
NSArray
*
)
o_names
-
(
void
)
application
:(
NSApplication
*
)
o_app
openFiles
:(
NSArray
*
)
o_names
{
BOOL
b_autoplay
=
config_GetInt
(
VLCIntf
,
"macosx-autoplay"
);
char
*
psz_uri
=
make_URI
([[
o_names
objectAtIndex
:
0
]
UTF8String
],
"file"
);
...
...
@@ -923,7 +923,7 @@ static VLCMain *_o_sharedMainInstance = nil;
if
(
!
b_returned
)
{
free
(
psz_uri
);
return
YES
;
return
;
}
}
}
...
...
@@ -947,7 +947,7 @@ static VLCMain *_o_sharedMainInstance = nil;
else
[
o_playlist
appendArray
:
o_result
atPos
:
-
1
enqueue
:
YES
];
return
(
TRUE
)
;
return
;
}
/* When user click in the Dock icon our double click in the finder */
...
...
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