* Fixed close button support in SDL

* Fixed --width and --height support in SDL

diff --git a/plugins/sdl/intf_sdl.c b/plugins/sdl/intf_sdl.c
index e1124962bf8aab93c459274cbd404b0587a63c78..70c6df860904e29ec43dd93dbd54b097ac76009b 100644 (file)
--- a/plugins/sdl/intf_sdl.c
+++ b/plugins/sdl/intf_sdl.c
@@ -2,7 +2,7 @@
  * intf_sdl.c: SDL interface plugin
  *****************************************************************************
  * 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:
  *
@@ -156,7 +156,7 @@ void intf_SDLManage( intf_thread_t *p_intf )
                 }
                 break;
             case SDL_QUIT:
-                intf_ProcessKey( p_intf, INTF_KEY_QUIT ); 
+                intf_ProcessKey( p_intf, SDLK_q );
                 break;
            default:
                 break;
@@ -189,9 +189,6 @@ void intf_SDL_Fullscreen(intf_thread_t * p_intf)
     p_intf->p_vout->p_sys->b_toggle_fullscreen = 1;
     vlc_mutex_unlock( &p_intf->p_vout->change_lock );
 } 
-    
-
-
 
 void intf_SDL_Keymap(intf_thread_t * p_intf )
 {

diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c
index ccc17de36defe30518f944c63d723270f464cb90..0b534e2eecccad7eaf6b60821288e49056e5c776 100644 (file)
--- a/plugins/sdl/vout_sdl.c
+++ b/plugins/sdl/vout_sdl.c
@@ -41,6 +41,7 @@
 #include "video_output.h"
 
 #include "intf_msg.h"
+#include "main.h"
 
 /*****************************************************************************
  * vout_sys_t: video output SDL method descriptor
@@ -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->i_width = VOUT_WIDTH_DEFAULT;
-    p_vout->p_sys->i_height = VOUT_HEIGHT_DEFAULT;
+    p_vout->p_sys->i_width = main_GetIntVariable( VOUT_WIDTH_VAR, 
+                                VOUT_WIDTH_DEFAULT );
+    p_vout->p_sys->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
+                                VOUT_HEIGHT_DEFAULT );
 
     if( SDLOpenDisplay(p_vout) )
     {