Commit 506680c9 authored by Pierre Baillet's avatar Pierre Baillet
Browse files

. Arranged a few things

... still dirty, but the earthquake is coming...
parent 0317810e
...@@ -56,7 +56,7 @@ typedef struct intf_sys_s ...@@ -56,7 +56,7 @@ typedef struct intf_sys_s
{ {
/* SDL system information */ /* SDL system information */
SDL_Surface * p_display; SDL_Surface * p_display;
int isFullscreen; boolean_t b_Fullscreen;
} intf_sys_t; } intf_sys_t;
typedef struct vout_sys_s typedef struct vout_sys_s
...@@ -181,7 +181,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf) ...@@ -181,7 +181,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
{ {
SDL_FreeSurface( p_intf->p_vout->p_sys->p_display ); SDL_FreeSurface( p_intf->p_vout->p_sys->p_display );
if(p_intf->p_sys->isFullscreen == 1) if(p_intf->p_sys->b_Fullscreen == 0)
{ {
p_intf->p_vout->p_sys->p_display = p_intf->p_vout->p_sys->p_display =
SDL_SetVideoMode( SDL_SetVideoMode(
...@@ -191,7 +191,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf) ...@@ -191,7 +191,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
SDL_ANYFORMAT | SDL_ANYFORMAT |
SDL_HWSURFACE | SDL_HWSURFACE |
SDL_DOUBLEBUF); SDL_DOUBLEBUF);
p_intf->p_sys->isFullscreen = 0; p_intf->p_sys->b_Fullscreen = 1;
} }
else else
{ {
...@@ -204,7 +204,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf) ...@@ -204,7 +204,7 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
SDL_HWSURFACE | SDL_HWSURFACE |
SDL_DOUBLEBUF | SDL_DOUBLEBUF |
SDL_FULLSCREEN ); SDL_FULLSCREEN );
p_intf->p_sys->isFullscreen = 1; p_intf->p_sys->b_Fullscreen = 0;
} }
SDL_EventState(SDL_KEYUP , SDL_IGNORE); SDL_EventState(SDL_KEYUP , SDL_IGNORE);
p_intf->p_vout->p_sys->p_buffer[ 0 ] = p_intf->p_vout->p_sys->p_display->pixels; p_intf->p_vout->p_sys->p_buffer[ 0 ] = p_intf->p_vout->p_sys->p_display->pixels;
......
...@@ -167,7 +167,6 @@ vout_thread_t * vout_CreateThread ( char *psz_display, int i_root_window, ...@@ -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 ); p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
/* Initialize idle screen */ /* Initialize idle screen */
p_vout->last_display_date = mdate();
p_vout->last_display_date = 0; p_vout->last_display_date = 0;
p_vout->last_idle_date = 0; p_vout->last_idle_date = 0;
...@@ -930,8 +929,6 @@ static int InitThread( vout_thread_t *p_vout ) ...@@ -930,8 +929,6 @@ static int InitThread( vout_thread_t *p_vout )
/* Mark thread as running and return */ /* Mark thread as running and return */
p_vout->b_active = 1; p_vout->b_active = 1;
*p_vout->pi_status = THREAD_READY; *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"); intf_DbgMsg("thread ready\n");
...@@ -1766,20 +1763,20 @@ static int RenderIdle( vout_thread_t *p_vout ) ...@@ -1766,20 +1763,20 @@ static int RenderIdle( vout_thread_t *p_vout )
&i_width, &i_height ); &i_width, &i_height );
if( !Align( p_vout, &i_x, &i_y, i_width, i_height, CENTER_RALIGN, CENTER_RALIGN ) ) 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, vout_Print( p_vout->p_large_font,
p_vout->p_buffer[ p_vout->i_buffer_index ].p_data + 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, 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_bytes_per_pixel, p_vout->i_bytes_per_line,
p_vout->i_white_pixel, p_vout->i_gray_pixel, 0, 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, vout_Print( p_vout->p_large_font,
p_vout->p_buffer[ p_vout->i_buffer_index ].p_data + 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, 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_bytes_per_pixel, p_vout->i_bytes_per_line,
p_vout->i_white_pixel, p_vout->i_gray_pixel, 0, 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 ); SetBufferArea( p_vout, i_x, i_y, i_width, i_height + 16 );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment