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
7c8209d9
Commit
7c8209d9
authored
Oct 17, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "XCB: reset the X11 screen saver when displaying a picture"
This reverts commit
48be3549
.
parent
99aa0dd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
7 deletions
+0
-7
modules/video_output/xcb/glx.c
modules/video_output/xcb/glx.c
+0
-3
modules/video_output/xcb/x11.c
modules/video_output/xcb/x11.c
+0
-2
modules/video_output/xcb/xvideo.c
modules/video_output/xcb/xvideo.c
+0
-2
No files found.
modules/video_output/xcb/glx.c
View file @
7c8209d9
...
@@ -466,11 +466,8 @@ static void PictureRender (vout_display_t *vd, picture_t *pic)
...
@@ -466,11 +466,8 @@ static void PictureRender (vout_display_t *vd, picture_t *pic)
static
void
PictureDisplay
(
vout_display_t
*
vd
,
picture_t
*
pic
)
static
void
PictureDisplay
(
vout_display_t
*
vd
,
picture_t
*
pic
)
{
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
xcb_connection_t
*
conn
=
XGetXCBConnection
(
sys
->
display
);
xcb_force_screen_saver
(
conn
,
XCB_SCREEN_SAVER_RESET
);
vout_display_opengl_Display
(
&
sys
->
vgl
,
&
vd
->
source
);
vout_display_opengl_Display
(
&
sys
->
vgl
,
&
vd
->
source
);
xcb_flush
(
conn
);
picture_Release
(
pic
);
picture_Release
(
pic
);
}
}
...
...
modules/video_output/xcb/x11.c
View file @
7c8209d9
...
@@ -433,8 +433,6 @@ static void Display (vout_display_t *vd, picture_t *pic)
...
@@ -433,8 +433,6 @@ static void Display (vout_display_t *vd, picture_t *pic)
if
(
!
p_sys
->
visible
)
if
(
!
p_sys
->
visible
)
goto
out
;
goto
out
;
xcb_force_screen_saver
(
p_sys
->
conn
,
XCB_SCREEN_SAVER_RESET
);
if
(
segment
!=
0
)
if
(
segment
!=
0
)
ck
=
xcb_shm_put_image_checked
(
p_sys
->
conn
,
p_sys
->
window
,
p_sys
->
gc
,
ck
=
xcb_shm_put_image_checked
(
p_sys
->
conn
,
p_sys
->
window
,
p_sys
->
gc
,
/* real width */
pic
->
p
->
i_pitch
/
pic
->
p
->
i_pixel_pitch
,
/* real width */
pic
->
p
->
i_pitch
/
pic
->
p
->
i_pixel_pitch
,
...
...
modules/video_output/xcb/xvideo.c
View file @
7c8209d9
...
@@ -691,8 +691,6 @@ static void Display (vout_display_t *vd, picture_t *pic)
...
@@ -691,8 +691,6 @@ static void Display (vout_display_t *vd, picture_t *pic)
if
(
!
p_sys
->
visible
)
if
(
!
p_sys
->
visible
)
goto
out
;
goto
out
;
xcb_force_screen_saver
(
p_sys
->
conn
,
XCB_SCREEN_SAVER_RESET
);
if
(
segment
)
if
(
segment
)
ck
=
xcb_xv_shm_put_image_checked
(
p_sys
->
conn
,
p_sys
->
port
,
ck
=
xcb_xv_shm_put_image_checked
(
p_sys
->
conn
,
p_sys
->
port
,
p_sys
->
window
,
p_sys
->
gc
,
segment
,
p_sys
->
id
,
0
,
p_sys
->
window
,
p_sys
->
gc
,
segment
,
p_sys
->
id
,
0
,
...
...
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