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
59cb414d
Commit
59cb414d
authored
Apr 13, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* implemented showintf-support. Thanks to ipkiss for pointing out that this was missing on OSX.
parent
52f92c68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
4 deletions
+26
-4
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+1
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+25
-4
No files found.
modules/gui/macosx/intf.h
View file @
59cb414d
...
@@ -71,6 +71,7 @@ struct intf_sys_t
...
@@ -71,6 +71,7 @@ struct intf_sys_t
vlc_bool_t
b_current_title_update
;
vlc_bool_t
b_current_title_update
;
vlc_bool_t
b_fullscreen_update
;
vlc_bool_t
b_fullscreen_update
;
vlc_bool_t
b_volume_update
;
vlc_bool_t
b_volume_update
;
vlc_bool_t
b_intf_show
;
/* menus handlers */
/* menus handlers */
vlc_bool_t
b_input_update
;
vlc_bool_t
b_input_update
;
...
...
modules/gui/macosx/intf.m
View file @
59cb414d
...
@@ -184,9 +184,22 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
...
@@ -184,9 +184,22 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
{
intf_thread_t
*
p_intf
=
VLCIntf
;
intf_thread_t
*
p_intf
=
VLCIntf
;
p_intf
->
p_sys
->
b_playlist_update
=
TRUE
;
p_intf
->
p_sys
->
b_playlist_update
=
VLC_TRUE
;
p_intf
->
p_sys
->
b_intf_update
=
TRUE
;
p_intf
->
p_sys
->
b_intf_update
=
VLC_TRUE
;
p_intf
->
p_sys
->
b_playmode_update
=
TRUE
;
p_intf
->
p_sys
->
b_playmode_update
=
VLC_TRUE
;
return
VLC_SUCCESS
;
}
/*****************************************************************************
* ShowController: Callback triggered by the show-intf playlist variable
* through the ShowIntf-control-intf, to let us show the controller-win;
* usually when in fullscreen-mode
*****************************************************************************/
static
int
ShowController
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
intf_thread_t
*
p_intf
=
VLCIntf
;
p_intf
->
p_sys
->
b_intf_show
=
VLC_TRUE
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -198,7 +211,7 @@ static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
...
@@ -198,7 +211,7 @@ static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
{
intf_thread_t
*
p_intf
=
VLCIntf
;
intf_thread_t
*
p_intf
=
VLCIntf
;
p_intf
->
p_sys
->
b_fullscreen_update
=
TRUE
;
p_intf
->
p_sys
->
b_fullscreen_update
=
VLC_
TRUE
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -449,6 +462,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -449,6 +462,7 @@ static VLCMain *_o_sharedMainInstance = nil;
val
.
b_bool
=
VLC_FALSE
;
val
.
b_bool
=
VLC_FALSE
;
var_AddCallback
(
p_playlist
,
"fullscreen"
,
FullscreenChanged
,
self
);
var_AddCallback
(
p_playlist
,
"fullscreen"
,
FullscreenChanged
,
self
);
var_AddCallback
(
p_playlist
,
"intf-show"
,
ShowController
,
self
);
[
o_embedded_window
setFullscreen
:
var_GetBool
(
p_playlist
,
[
o_embedded_window
setFullscreen
:
var_GetBool
(
p_playlist
,
"fullscreen"
)];
"fullscreen"
)];
...
@@ -1001,6 +1015,13 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1001,6 +1015,13 @@ static VLCMain *_o_sharedMainInstance = nil;
p_intf
->
p_sys
->
b_fullscreen_update
=
VLC_FALSE
;
p_intf
->
p_sys
->
b_fullscreen_update
=
VLC_FALSE
;
}
}
if
(
p_intf
->
p_sys
->
b_intf_show
)
{
[
o_window
makeKeyAndOrderFront
:
self
];
p_intf
->
p_sys
->
b_intf_show
=
VLC_FALSE
;
}
if
(
p_input
&&
!
p_input
->
b_die
)
if
(
p_input
&&
!
p_input
->
b_die
)
{
{
vlc_value_t
val
;
vlc_value_t
val
;
...
...
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