videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-08-14 21:25:09 +02:00
Code Releases Activity

Revert [23969] because mutex aren't needed

Browse Source
This commit is contained in:
Rémi Duraffort 2008-01-07 09:24:07 +00:00
parent cfa722f1f7
commit d70fb1f86a
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_output/sdl.c
View File

@ -72,8 +72,6 @@ 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;
};
/*****************************************************************************
@ -156,8 +154,6 @@ 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 )
{
@ -339,8 +335,6 @@ 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 );
}
@ -356,8 +350,6 @@ 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 ) )
{
@ -631,8 +623,6 @@ static int Manage( vout_thread_t *p_vout )
SDL_ShowCursor( 0 );
}
vlc_mutex_unlock( &p_vout->p_sys->lock );
return VLC_SUCCESS;
}
@ -712,8 +702,6 @@ 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;
@ -733,8 +721,6 @@ 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 */