KEY_SPACE = 32, simplify several outputs and interfaces

[vlc] / modules / gui / beos / VideoOutput.cpp

diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index e74369a258d458f863bba3c4006683ae6aa3f98e..e6538bd8544083dd11c6d47f25f6f611d112b3cb 100644 (file)
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -47,7 +47,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
 #include <vlc_keys.h>
@@ -112,7 +112,7 @@ static const int beos_keys[][2] =
     { B_RIGHT_ARROW, KEY_RIGHT },
     { B_UP_ARROW,    KEY_UP },
     { B_DOWN_ARROW,  KEY_DOWN },
-    { B_SPACE,       KEY_SPACE },
+    { B_SPACE,       ' ' },
     { B_ENTER,       KEY_ENTER },
     { B_F1_KEY,      KEY_F1 },
     { B_F2_KEY,      KEY_F2 },
@@ -1123,9 +1123,7 @@ VLCView::MouseDown(BPoint where)
 void
 VLCView::MouseUp( BPoint where )
 {
-    vlc_value_t val;
-    val.b_bool = true;
-    var_Set( p_vout, "mouse-clicked", val );
+    var_SetBool( p_vout, "mouse-clicked", true );
 }
 
 /*****************************************************************************
@@ -1228,10 +1226,7 @@ int OpenVideo ( vlc_object_t *p_this )
     /* Allocate structure */
     p_vout->p_sys = (vout_sys_t*) malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
-        return( 1 );
-    }
+        return 1;
     p_vout->p_sys->i_width = p_vout->render.i_width;
     p_vout->p_sys->i_height = p_vout->render.i_height;
     p_vout->p_sys->source_chroma = p_vout->render.i_chroma;
@@ -1271,8 +1266,6 @@ int Init( vout_thread_t *p_vout )
     p_vout->output.i_chroma = colspace[p_vout->p_sys->p_window->colspace_index].chroma;
     p_vout->p_sys->i_index = 0;
 
-    p_vout->b_direct = 1;
-
     p_vout->output.i_rmask  = 0x00ff0000;
     p_vout->output.i_gmask  = 0x0000ff00;
     p_vout->output.i_bmask  = 0x000000ff;
@@ -1374,7 +1367,7 @@ void Display( vout_thread_t *p_vout, picture_t *p_pic )
 
 static int Control( vout_thread_t * p_vout, int i_query, va_list args )
 {
-    return vout_vaControlDefault( p_vout, i_query, args );
+    return VLC_EGENERIC;
 }
 
 /* following functions are local */