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
506680c9
Commit
506680c9
authored
Aug 29, 2000
by
Pierre Baillet
Browse files
. Arranged a few things
... still dirty, but the earthquake is coming...
parent
0317810e
Changes
2
Hide whitespace changes
Inline
Side-by-side
plugins/sdl/intf_sdl.c
View file @
506680c9
...
...
@@ -56,7 +56,7 @@ typedef struct intf_sys_s
{
/* SDL system information */
SDL_Surface
*
p_display
;
int
is
Fullscreen
;
boolean_t
b_
Fullscreen
;
}
intf_sys_t
;
typedef
struct
vout_sys_s
...
...
@@ -181,7 +181,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
{
SDL_FreeSurface
(
p_intf
->
p_vout
->
p_sys
->
p_display
);
if
(
p_intf
->
p_sys
->
is
Fullscreen
==
1
)
if
(
p_intf
->
p_sys
->
b_
Fullscreen
==
0
)
{
p_intf
->
p_vout
->
p_sys
->
p_display
=
SDL_SetVideoMode
(
...
...
@@ -191,7 +191,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
SDL_ANYFORMAT
|
SDL_HWSURFACE
|
SDL_DOUBLEBUF
);
p_intf
->
p_sys
->
is
Fullscreen
=
0
;
p_intf
->
p_sys
->
b_
Fullscreen
=
1
;
}
else
{
...
...
@@ -204,7 +204,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
SDL_HWSURFACE
|
SDL_DOUBLEBUF
|
SDL_FULLSCREEN
);
p_intf
->
p_sys
->
is
Fullscreen
=
1
;
p_intf
->
p_sys
->
b_
Fullscreen
=
0
;
}
SDL_EventState
(
SDL_KEYUP
,
SDL_IGNORE
);
p_intf
->
p_vout
->
p_sys
->
p_buffer
[
0
]
=
p_intf
->
p_vout
->
p_sys
->
p_display
->
pixels
;
...
...
src/video_output/video_output.c
View file @
506680c9
...
...
@@ -167,7 +167,6 @@ vout_thread_t * vout_CreateThread ( char *psz_display, int i_root_window,
p_vout
->
i_bytes_per_pixel
*
8
,
p_vout
->
i_bytes_per_line
);
/* Initialize idle screen */
p_vout
->
last_display_date
=
mdate
();
p_vout
->
last_display_date
=
0
;
p_vout
->
last_idle_date
=
0
;
...
...
@@ -930,8 +929,6 @@ static int InitThread( vout_thread_t *p_vout )
/* Mark thread as running and return */
p_vout
->
b_active
=
1
;
*
p_vout
->
pi_status
=
THREAD_READY
;
/* cheats the clock so that the display come as soon as the thread is run */
p_vout
->
last_display_date
=
mdate
()
-
5000000
;
intf_DbgMsg
(
"thread ready
\n
"
);
...
...
@@ -1766,20 +1763,20 @@ static int RenderIdle( vout_thread_t *p_vout )
&
i_width
,
&
i_height
);
if
(
!
Align
(
p_vout
,
&
i_x
,
&
i_y
,
i_width
,
i_height
,
CENTER_RALIGN
,
CENTER_RALIGN
)
)
{
i_amount
=
(
int
)
((
current_date
-
p_vout
->
last_display_date
-
VOUT_IDLE_DELAY
)
/
5000LL
);
i_amount
=
(
int
)
((
current_date
-
p_vout
->
last_display_date
)
/
5000LL
);
vout_Print
(
p_vout
->
p_large_font
,
p_vout
->
p_buffer
[
p_vout
->
i_buffer_index
].
p_data
+
i_x
*
p_vout
->
i_bytes_per_pixel
+
i_y
*
p_vout
->
i_bytes_per_line
,
p_vout
->
i_bytes_per_pixel
,
p_vout
->
i_bytes_per_line
,
p_vout
->
i_white_pixel
,
p_vout
->
i_gray_pixel
,
0
,
WIDE_TEXT
|
OUTLINED_TEXT
,
psz_text
,
i_amount
);
WIDE_TEXT
|
OUTLINED_TEXT
,
psz_text
,
(
i_amount
/
10
)
%
100
);
vout_Print
(
p_vout
->
p_large_font
,
p_vout
->
p_buffer
[
p_vout
->
i_buffer_index
].
p_data
+
i_x
*
p_vout
->
i_bytes_per_pixel
+
(
i_y
+
16
)
*
p_vout
->
i_bytes_per_line
,
p_vout
->
i_bytes_per_pixel
,
p_vout
->
i_bytes_per_line
,
p_vout
->
i_white_pixel
,
p_vout
->
i_gray_pixel
,
0
,
WIDE_TEXT
|
OUTLINED_TEXT
,
psz_wtext
,
(
i_amount
/
2
)
%
110
);
WIDE_TEXT
|
OUTLINED_TEXT
,
psz_wtext
,
(
i_amount
/
30
)
%
110
);
SetBufferArea
(
p_vout
,
i_x
,
i_y
,
i_width
,
i_height
+
16
);
...
...
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