Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
mediastreamer2
Commits
b122cd21
Commit
b122cd21
authored
Feb 09, 2010
by
Simon Morlat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typo
hide mouse cursor in video window do SDL_quit() after closing the video window.
parent
ab1690f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
src/videoout.c
src/videoout.c
+3
-2
src/videostream.c
src/videostream.c
+1
-1
No files found.
src/videoout.c
View file @
b122cd21
...
...
@@ -132,6 +132,7 @@ static int sdl_create_window(SdlDisplay *wd, int w, int h){
ms_message
(
"planes= %p %p %p %i %i"
,
wd
->
lay
->
pixels
[
0
],
wd
->
lay
->
pixels
[
1
],
wd
->
lay
->
pixels
[
2
],
wd
->
lay
->
pixels
[
1
]
-
wd
->
lay
->
pixels
[
0
],
wd
->
lay
->
pixels
[
2
]
-
wd
->
lay
->
pixels
[
1
]);
}
SDL_ShowCursor
(
0
);
//Hide the mouse cursor if was displayed
return
0
;
}
...
...
@@ -148,8 +149,6 @@ static bool_t sdl_display_init(MSDisplay *obj, MSFilter *f, MSPicture *fbuf, MSP
ms_error
(
"Couldn't initialize SDL: %s"
,
SDL_GetError
());
return
FALSE
;
}
/* Clean up on exit */
atexit
(
SDL_Quit
);
wd
->
sdl_initialized
=
TRUE
;
ms_mutex_init
(
&
wd
->
sdl_mutex
,
NULL
);
ms_mutex_lock
(
&
wd
->
sdl_mutex
);
...
...
@@ -248,12 +247,14 @@ static void sdl_display_uninit(MSDisplay *obj){
}
wd
->
lay
=
NULL
;
wd
->
sdl_screen
=
NULL
;
ms_free
(
wd
);
#ifdef __linux
/*purge the event queue before leaving*/
for
(
i
=
0
;
SDL_PollEvent
(
&
event
)
&&
i
<
100
;
++
i
){
}
#endif
sdl_show_window
(
FALSE
);
SDL_Quit
();
}
MSDisplayDesc
ms_sdl_display_desc
=
{
...
...
src/videostream.c
View file @
b122cd21
...
...
@@ -172,7 +172,7 @@ VideoStream *video_stream_new(int locport, bool_t use_ipv6){
}
void
video_stream_set_sent_video_size
(
VideoStream
*
stream
,
MSVideoSize
vsize
){
ms_message
(
"Setting vid
o
e size %dx%d"
,
vsize
.
width
,
vsize
.
height
);
ms_message
(
"Setting vide
o
size %dx%d"
,
vsize
.
width
,
vsize
.
height
);
stream
->
sent_vsize
=
vsize
;
}
...
...
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