Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
6e5788c8
Commit
6e5788c8
authored
Apr 29, 2004
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Updated the Vout behaviour. Still a bit coupled to p_vout.
parent
7e6516d2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
23 deletions
+22
-23
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+16
-18
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+6
-5
No files found.
modules/gui/macosx/intf.m
View file @
6e5788c8
...
@@ -422,6 +422,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
...
@@ -422,6 +422,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
{
{
unsigned
int
i_key
=
0
;
unsigned
int
i_key
=
0
;
intf_thread_t
*
p_intf
=
[
NSApp
getIntf
];
intf_thread_t
*
p_intf
=
[
NSApp
getIntf
];
playlist_t
*
p_playlist
;
vlc_value_t
val
;
vlc_value_t
val
;
[
self
initStrings
];
[
self
initStrings
];
...
@@ -481,27 +482,24 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
...
@@ -481,27 +482,24 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
[
o_mi_fullscreen
setKeyEquivalent
:
[
NSString
stringWithFormat
:
@"%C"
,
VLCKeyToCocoa
(
i_key
)]];
[
o_mi_fullscreen
setKeyEquivalent
:
[
NSString
stringWithFormat
:
@"%C"
,
VLCKeyToCocoa
(
i_key
)]];
[
o_mi_fullscreen
setKeyEquivalentModifierMask
:
VLCModifiersToCocoa
(
i_key
)];
[
o_mi_fullscreen
setKeyEquivalentModifierMask
:
VLCModifiersToCocoa
(
i_key
)];
var_Create
(
p_intf
,
"fullscreen"
,
VLC_VAR_BOOL
);
var_Create
(
p_intf
,
"intf-change"
,
VLC_VAR_BOOL
);
var_Change
(
p_intf
,
"fullscreen"
,
VLC_VAR_INHERITVALUE
,
&
val
,
NULL
);
[
o_btn_fullscreen
setState
:
val
.
b_bool
];
var_Create
(
p_intf
,
"intf-change"
,
VLC_VAR_BOOL
);
[
self
setSubmenusEnabled
:
FALSE
];
[
self
setSubmenusEnabled
:
FALSE
];
[
self
manageVolumeSlider
];
[
self
manageVolumeSlider
];
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
)
{
/* Check if we need to start playing */
/* Check if we need to start playing */
if
(
p_intf
->
b_play
)
if
(
p_intf
->
b_play
)
{
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
)
{
{
playlist_Play
(
p_playlist
);
playlist_Play
(
p_playlist
);
vlc_object_release
(
p_playlist
);
}
}
var_Get
(
p_playlist
,
"fullscreen"
,
&
val
);
[
o_btn_fullscreen
setState
:
val
.
b_bool
];
vlc_object_release
(
p_playlist
);
}
}
}
}
...
@@ -864,11 +862,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
...
@@ -864,11 +862,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
p_intf
->
p_sys
->
b_intf_update
=
VLC_FALSE
;
p_intf
->
p_sys
->
b_intf_update
=
VLC_FALSE
;
}
}
if
(
p_intf
->
p_sys
->
b_fullscreen_update
)
if
(
p_intf
->
p_sys
->
b_fullscreen_update
)
{
{
vout_thread_t
*
p_vout
;
vout_thread_t
*
p_vout
;
vlc_value_t
val
;
vlc_value_t
val
;
if
(
var_Change
(
p_intf
,
"fullscreen"
,
VLC_VAR_INHERITVALUE
,
&
val
,
NULL
)
>=
0
&&
val
.
b_bool
)
if
(
var_Get
(
p_playlist
,
"fullscreen"
,
&
val
)
>=
0
&&
val
.
b_bool
)
{
{
[
o_btn_fullscreen
setState
:
VLC_TRUE
];
[
o_btn_fullscreen
setState
:
VLC_TRUE
];
}
}
...
@@ -876,11 +874,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
...
@@ -876,11 +874,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
{
{
[
o_btn_fullscreen
setState
:
VLC_FALSE
];
[
o_btn_fullscreen
setState
:
VLC_FALSE
];
}
}
p_vout
=
vlc_object_find
(
p_intf
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
p_vout
=
vlc_object_find
(
p_intf
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
if
(
p_vout
!=
NULL
)
if
(
p_vout
!=
NULL
)
{
{
[
o_btn_fullscreen
setEnabled
:
VLC_TRUE
];
[
o_btn_fullscreen
setEnabled
:
VLC_TRUE
];
vlc_object_release
(
p_vout
);
vlc_object_release
(
p_vout
);
}
}
else
else
{
{
...
...
modules/gui/macosx/vout.m
View file @
6e5788c8
...
@@ -959,8 +959,9 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -959,8 +959,9 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
-
(
void
)
toggleFullscreen
-
(
void
)
toggleFullscreen
{
{
config_PutInt
(
p_vout
,
"fullscreen"
,
!
p_vout
->
b_fullscreen
);
vlc_value_t
val
;
p_vout
->
i_changes
|=
VOUT_FULLSCREEN_CHANGE
;
val
.
b_bool
=
!
p_vout
->
b_fullscreen
;
var_Set
(
p_vout
,
"fullscreen"
,
val
);
}
}
-
(
BOOL
)
isFullscreen
-
(
BOOL
)
isFullscreen
...
@@ -1499,7 +1500,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1499,7 +1500,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
initDone
=
1
;
initDone
=
1
;
}
}
-
(
void
)
reloadTexture
-
(
void
)
reloadTexture
{
{
if
(
!
initDone
)
if
(
!
initDone
)
{
{
...
@@ -1519,7 +1520,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1519,7 +1520,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
PP_OUTPUTPICTURE
[
0
]
->
p_data
);
PP_OUTPUTPICTURE
[
0
]
->
p_data
);
}
}
-
(
void
)
goFullScreen
-
(
void
)
goFullScreen
{
{
/* Create the new pixel format */
/* Create the new pixel format */
NSOpenGLPixelFormatAttribute
attribs
[]
=
NSOpenGLPixelFormatAttribute
attribs
[]
=
...
@@ -1598,7 +1599,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1598,7 +1599,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
isFullScreen
=
1
;
isFullScreen
=
1
;
}
}
-
(
void
)
exitFullScreen
-
(
void
)
exitFullScreen
{
{
/* Free current OpenGL context */
/* Free current OpenGL context */
[
NSOpenGLContext
clearCurrentContext
];
[
NSOpenGLContext
clearCurrentContext
];
...
...
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