Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
22599f01
Commit
22599f01
authored
Jan 01, 2008
by
ivoire
Browse files
add mutex to the sdl video_output
parent
5388d5c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/video_output/sdl.c
View file @
22599f01
...
...
@@ -69,6 +69,8 @@ struct vout_sys_t
vlc_bool_t
b_cursor_autohidden
;
mtime_t
i_lastmoved
;
mtime_t
i_lastpressed
;
/* to track dbl-clicks */
vlc_mutex_t
lock
;
};
/*****************************************************************************
...
...
@@ -151,6 +153,9 @@ static int Open ( vlc_object_t *p_this )
return
VLC_ENOMEM
;
}
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
/* Check if SDL video module has been initialized */
if
(
SDL_WasInit
(
SDL_INIT_VIDEO
)
!=
0
)
{
vlc_mutex_unlock
(
lock
);
...
...
@@ -159,7 +164,6 @@ static int Open ( vlc_object_t *p_this )
}
/* Allocate structure */
p_vout
->
pf_init
=
Init
;
p_vout
->
pf_end
=
End
;
p_vout
->
pf_manage
=
Manage
;
...
...
@@ -326,6 +330,8 @@ static void Close ( vlc_object_t *p_this )
CloseDisplay
(
p_vout
);
SDL_QuitSubSystem
(
SDL_INIT_VIDEO
);
vlc_mutex_destroy
(
&
p_vout
->
p_sys
->
lock
);
free
(
p_vout
->
p_sys
);
}
...
...
@@ -341,6 +347,8 @@ static int Manage( vout_thread_t *p_vout )
vlc_value_t
val
;
unsigned
int
i_width
,
i_height
,
i_x
,
i_y
;
vlc_mutex_lock
(
&
p_vout
->
p_sys
->
lock
);
/* Process events */
while
(
SDL_PollEvent
(
&
event
)
)
{
...
...
@@ -588,6 +596,8 @@ static int Manage( vout_thread_t *p_vout )
SDL_ShowCursor
(
0
);
}
vlc_mutex_unlock
(
&
p_vout
->
p_sys
->
lock
);
return
VLC_SUCCESS
;
}
...
...
@@ -667,6 +677,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
unsigned
int
x
,
y
,
w
,
h
;
SDL_Rect
disp
;
vlc_mutex_lock
(
&
p_vout
->
p_sys
->
lock
);
vout_PlacePicture
(
p_vout
,
p_vout
->
p_sys
->
i_width
,
p_vout
->
p_sys
->
i_height
,
&
x
,
&
y
,
&
w
,
&
h
);
disp
.
x
=
x
;
...
...
@@ -686,6 +698,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
SDL_DisplayYUVOverlay
(
p_pic
->
p_sys
->
p_overlay
,
&
disp
);
SDL_LockYUVOverlay
(
p_pic
->
p_sys
->
p_overlay
);
}
vlc_mutex_unlock
(
&
p_vout
->
p_sys
->
lock
);
}
/* following functions are local */
...
...
Write
Preview
Supports
Markdown
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