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 2f853280df123a223c63f1098697c8d7d7aca935..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>
@@ -77,7 +77,6 @@ struct vout_sys_t
 
 };
 
-#define MOUSE_IDLE_TIMEOUT 2000000    // two seconds
 #define MIN_AUTO_VSYNC_REFRESH 61    // Hz
 
 /*****************************************************************************
@@ -113,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 },
@@ -984,6 +983,7 @@ VLCView::VLCView(BRect bounds, vout_thread_t *p_vout_instance )
       fIgnoreDoubleClick(false)
 {
     p_vout = p_vout_instance;
+    fMouseHideTimeout = var_GetInteger(p_vout, "mouse-hide-timeout") * 1000;
     SetViewColor(B_TRANSPARENT_32_BIT);
 }
 
@@ -1123,9 +1123,7 @@ VLCView::MouseDown(BPoint where)
 void
 VLCView::MouseUp( BPoint where )
 {
-    vlc_value_t val;
-    val.b_bool = VLC_TRUE;
-    var_Set( p_vout, "mouse-clicked", val );
+    var_SetBool( p_vout, "mouse-clicked", true );
 }
 
 /*****************************************************************************
@@ -1152,7 +1150,7 @@ VLCView::MouseMoved(BPoint point, uint32 transit, const BMessage* dragMessage)
     var_Set( p_vout, "mouse-x", val );
     val.i_int = ( (int)point.y - i_y ) * p_vout->render.i_height / i_height;
     var_Set( p_vout, "mouse-y", val );
-    val.b_bool = VLC_TRUE;
+    val.b_bool = true;
     var_Set( p_vout, "mouse-moved", val );
 }
 
@@ -1169,7 +1167,7 @@ VLCView::Pulse()
     if (!fCursorHidden)
     {
         if (fCursorInside
-            && mdate() - fLastMouseMovedTime > MOUSE_IDLE_TIMEOUT)
+            && mdate() - fLastMouseMovedTime > fMouseHideTimeout)
         {
             be_app->ObscureCursor();
             fCursorHidden = true;
@@ -1221,17 +1219,14 @@ static void BeosCloseDisplay( vout_thread_t *p_vout );
  *****************************************************************************
  * This function allocates and initializes a BeOS vout method.
  *****************************************************************************/
-int E_(OpenVideo) ( vlc_object_t *p_this )
+int OpenVideo ( vlc_object_t *p_this )
 {
     vout_thread_t * p_vout = (vout_thread_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;
@@ -1344,7 +1337,7 @@ static int Manage( vout_thread_t * p_vout )
  *****************************************************************************
  * Terminate an output method created by DummyCreateOutputMethod
  *****************************************************************************/
-void E_(CloseVideo) ( vlc_object_t *p_this )
+void CloseVideo ( vlc_object_t *p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *)p_this;
 
@@ -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 */