Commit 420ec3aa authored by Renaud Dartus's avatar Renaud Dartus

* Fixed close button support in SDL

* Fixed --width and --height support in SDL
parent b8899c0c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_sdl.c: SDL interface plugin * intf_sdl.c: SDL interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_sdl.c,v 1.22 2001/01/15 06:18:23 sam Exp $ * $Id: intf_sdl.c,v 1.23 2001/01/15 12:42:57 reno Exp $
* *
* Authors: * Authors:
* *
...@@ -156,7 +156,7 @@ void intf_SDLManage( intf_thread_t *p_intf ) ...@@ -156,7 +156,7 @@ void intf_SDLManage( intf_thread_t *p_intf )
} }
break; break;
case SDL_QUIT: case SDL_QUIT:
intf_ProcessKey( p_intf, INTF_KEY_QUIT ); intf_ProcessKey( p_intf, SDLK_q );
break; break;
default: default:
break; break;
...@@ -190,9 +190,6 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf) ...@@ -190,9 +190,6 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
vlc_mutex_unlock( &p_intf->p_vout->change_lock ); vlc_mutex_unlock( &p_intf->p_vout->change_lock );
} }
void intf_SDL_Keymap(intf_thread_t * p_intf ) void intf_SDL_Keymap(intf_thread_t * p_intf )
{ {
/* p_intf->p_intf_getKey = intf_getKey; */ /* p_intf->p_intf_getKey = intf_getKey; */
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "video_output.h" #include "video_output.h"
#include "intf_msg.h" #include "intf_msg.h"
#include "main.h"
/***************************************************************************** /*****************************************************************************
* vout_sys_t: video output SDL method descriptor * vout_sys_t: video output SDL method descriptor
...@@ -112,8 +113,10 @@ int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display, ...@@ -112,8 +113,10 @@ int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display,
p_vout->p_sys->b_fullscreen = 0; p_vout->p_sys->b_fullscreen = 0;
} }
p_vout->p_sys->i_width = VOUT_WIDTH_DEFAULT; p_vout->p_sys->i_width = main_GetIntVariable( VOUT_WIDTH_VAR,
p_vout->p_sys->i_height = VOUT_HEIGHT_DEFAULT; VOUT_WIDTH_DEFAULT );
p_vout->p_sys->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
VOUT_HEIGHT_DEFAULT );
if( SDLOpenDisplay(p_vout) ) if( SDLOpenDisplay(p_vout) )
{ {
......
Markdown is supported
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