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
508958eb
Commit
508958eb
authored
Apr 22, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: added support for the Boss Key (close #7243)
parent
28618398
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
NEWS
NEWS
+1
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+18
-2
No files found.
NEWS
View file @
508958eb
...
...
@@ -164,6 +164,7 @@ OS X Interface:
handler for ftp, mms, rtmp, rtp, rtsp, sftp, smb and udp streams
(system-wide settings)
* add support for the Video Title option
* add support for the Boss Key
* The Streaming/Transcoding wizard and the open dialog's output panel are
deprecated now and will be removed in a future release.
...
...
modules/gui/macosx/intf.m
View file @
508958eb
...
...
@@ -94,6 +94,8 @@ static int PlaybackModeUpdated(vlc_object_t *, const char *,
vlc_value_t
,
vlc_value_t
,
void
*
);
static
int
VolumeUpdated
(
vlc_object_t
*
,
const
char
*
,
vlc_value_t
,
vlc_value_t
,
void
*
);
static
int
BossCallback
(
vlc_object_t
*
,
const
char
*
,
vlc_value_t
,
vlc_value_t
,
void
*
);
#pragma mark -
#pragma mark VLC Interface Object Callbacks
...
...
@@ -453,6 +455,18 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
return
VLC_SUCCESS
;
}
static
int
BossCallback
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
new_val
,
void
*
param
)
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
[[
VLCCoreInteraction
sharedInstance
]
performSelectorOnMainThread
:
@selector
(
pause
)
withObject
:
nil
waitUntilDone
:
NO
];
[[
VLCApplication
sharedApplication
]
hide
:
nil
];
[
o_pool
release
];
return
VLC_SUCCESS
;
}
/*****************************************************************************
* ShowController: Callback triggered by the show-intf playlist variable
* through the ShowIntf-control-intf, to let us show the controller-win;
...
...
@@ -678,6 +692,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-toggle-fscontrol"
,
ShowController
,
self
);
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-show"
,
ShowController
,
self
);
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-boss"
,
BossCallback
,
self
);
// var_AddCallback(p_playlist, "item-change", PLItemChanged, self);
var_AddCallback
(
p_playlist
,
"activity"
,
PLItemChanged
,
self
);
var_AddCallback
(
p_playlist
,
"leaf-to-parent"
,
PlaylistUpdated
,
self
);
...
...
@@ -861,6 +876,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_DelCallback
(
p_playlist
,
"mute"
,
VolumeUpdated
,
self
);
var_DelCallback
(
p_intf
->
p_libvlc
,
"intf-toggle-fscontrol"
,
ShowController
,
self
);
var_DelCallback
(
p_intf
->
p_libvlc
,
"intf-show"
,
ShowController
,
self
);
var_DelCallback
(
p_intf
->
p_libvlc
,
"intf-boss"
,
BossCallback
,
self
);
if
(
p_current_input
)
{
var_DelCallback
(
p_current_input
,
"intf-event"
,
InputEvent
,
[
VLCMain
sharedInstance
]);
...
...
@@ -1385,7 +1401,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[
iTunesApp
playpause
];
}
}
}
b_has_itunes_paused
=
NO
;
...
...
@@ -1421,7 +1437,7 @@ static VLCMain *_o_sharedMainInstance = nil;
}
}
/* Declare user activity.
This wakes the display if it is off, and postpones display sleep according to the users system preferences
Available from 10.7.3 */
...
...
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