X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fwall.c;h=0d4a18d90f24b5eb64d2b3bb7b3b48a1ac1ab472;hb=b1ddf9183c295d92b5cfc412a13583b8b7caa216;hp=e1ff941817b6b249c618bc80cdb243eac6c65089;hpb=00a30b7bca39ee783fb2912aa15962dcf18dd97b;p=vlc

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index e1ff941817..0d4a18d90f 100644
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * wall.c : Wall video plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: wall.c,v 1.5 2003/01/09 17:47:05 sam Exp $
+ * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,28 +44,32 @@ static void Render    ( vout_thread_t *, picture_t * );
 
 static void RemoveAllVout  ( vout_thread_t *p_vout );
 
+static int  SendEvents( vlc_object_t *, char const *,
+                        vlc_value_t, vlc_value_t, void * );
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define COLS_TEXT N_("number of columns")
-#define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \
-    "which to split the video")
+#define COLS_TEXT N_("Number of columns")
+#define COLS_LONGTEXT N_("Select the number of horizontal video windows in " \
+    "which to split the video.")
 
-#define ROWS_TEXT N_("number of rows")
-#define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \
-    "which to split the video")
+#define ROWS_TEXT N_("Number of rows")
+#define ROWS_LONGTEXT N_("Select the number of vertical video windows in " \
+    "which to split the video.")
 
-#define ACTIVE_TEXT N_("active windows")
-#define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \
+#define ACTIVE_TEXT N_("Active windows")
+#define ACTIVE_LONGTEXT N_("Comma separated list of active windows, " \
     "defaults to all")
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL );
-    add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT );
-    add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT );
-    add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT );
-    set_description( _("image wall video module") );
+    set_description( _("wall video filter") );
     set_capability( "video filter", 0 );
+
+    add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
+    add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
+    add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, VLC_FALSE );
+
     add_shortcut( "wall" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -90,6 +94,25 @@ struct vout_sys_t
     } *pp_vout;
 };
 
+/*****************************************************************************
+ * Control: control facility for the vout (forwards to child vout)
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+    int i_row, i_col, i_vout = 0;
+
+    for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ )
+    {
+        for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ )
+        {
+            vout_vaControl( p_vout->p_sys->pp_vout[ i_vout ].p_vout,
+                            i_query, args );
+            i_vout++;
+        }
+    }
+    return VLC_SUCCESS;
+}
+
 /*****************************************************************************
  * Create: allocates Wall video thread output method
  *****************************************************************************
@@ -114,6 +137,7 @@ static int Create( vlc_object_t *p_this )
     p_vout->pf_manage = NULL;
     p_vout->pf_render = Render;
     p_vout->pf_display = NULL;
+    p_vout->pf_control = Control;
 
     /* Look what method was requested */
     p_vout->p_sys->i_col = config_GetInt( p_vout, "wall-cols" );
@@ -260,6 +284,9 @@ static int Init( vout_thread_t *p_vout )
                 RemoveAllVout( p_vout );
                 return VLC_EGENERIC;
             }
+            ADD_CALLBACKS(
+                p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout,
+                SendEvents );
 
             p_vout->p_sys->i_vout++;
         }
@@ -267,6 +294,8 @@ static int Init( vout_thread_t *p_vout )
 
     ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
 
+    ADD_PARENT_CALLBACKS( SendEventsToChild );
+
     return VLC_SUCCESS;
 }
 
@@ -296,6 +325,8 @@ static void Destroy( vlc_object_t *p_this )
 
     RemoveAllVout( p_vout );
 
+    DEL_PARENT_CALLBACKS( SendEventsToChild );
+
     free( p_vout->p_sys->pp_vout );
     free( p_vout->p_sys );
 }
@@ -414,8 +445,78 @@ static void RemoveAllVout( vout_thread_t *p_vout )
          --p_vout->p_sys->i_vout;
          if( p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].b_active )
          {
+             DEL_CALLBACKS(
+                 p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout,
+                 SendEvents );
+             vlc_object_detach(
+                 p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout );
              vout_Destroy(
-               p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout );
+                 p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout );
          }
     }
 }
+
+/*****************************************************************************
+ * SendEvents: forward mouse and keyboard events to the parent p_vout
+ *****************************************************************************/
+static int SendEvents( vlc_object_t *p_this, char const *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)_p_vout;
+    int i_vout;
+    vlc_value_t sentval = newval;
+
+    /* Find the video output index */
+    for( i_vout = 0; i_vout < p_vout->p_sys->i_vout; i_vout++ )
+    {
+        if( p_this == (vlc_object_t *)p_vout->p_sys->pp_vout[ i_vout ].p_vout )
+        {
+            break;
+        }
+    }
+
+    if( i_vout == p_vout->p_sys->i_vout )
+    {
+        return VLC_EGENERIC;
+    }
+
+    /* Translate the mouse coordinates */
+    if( !strcmp( psz_var, "mouse-x" ) )
+    {
+        sentval.i_int += p_vout->output.i_width
+                          * (i_vout % p_vout->p_sys->i_col)
+                          / p_vout->p_sys->i_col;
+    }
+    else if( !strcmp( psz_var, "mouse-y" ) )
+    {
+        sentval.i_int += p_vout->output.i_height
+                          * (i_vout / p_vout->p_sys->i_row)
+                          / p_vout->p_sys->i_row;
+    }
+
+    var_Set( p_vout, psz_var, sentval );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * SendEventsToChild: forward events to the child/children vout
+ *****************************************************************************/
+static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    int i_row, i_col, i_vout = 0;
+
+    for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ )
+    {
+        for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ )
+        {
+            var_Set( p_vout->p_sys->pp_vout[ i_vout ].p_vout, psz_var, newval);
+            if( !strcmp( psz_var, "fullscreen" ) ) break;
+            i_vout++;
+        }
+    }
+
+    return VLC_SUCCESS;
+}