do not catch VLCException in sample

[vlc] / modules / video_filter / filter_common.h

diff --git a/modules/video_filter/filter_common.h b/modules/video_filter/filter_common.h
index 6a3433cdb13f37eb37d7cffcdd7f3385466d865a..2efc0521d3a6744be35a8d0b091787524e385a0c 100644 (file)
--- a/modules/video_filter/filter_common.h
+++ b/modules/video_filter/filter_common.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * filter_common.h: Common filter functions
  *****************************************************************************
- * Copyright (C) 2001, 2002, 2003 VideoLAN
- * $Id: filter_common.h,v 1.2 2003/01/17 16:18:03 sam Exp $
+ * Copyright (C) 2001, 2002, 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #define ALLOCATE_DIRECTBUFFERS( i_max ) \
@@ -43,10 +43,10 @@
         }                                                                     \
                                                                               \
         /* Allocate the picture */                                            \
-        vout_AllocatePicture( p_vout, p_pic,                                  \
+        vout_AllocatePicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma, \
                               p_vout->output.i_width,                         \
                               p_vout->output.i_height,                        \
-                              p_vout->output.i_chroma );                      \
+                              p_vout->output.i_aspect );                      \
                                                                               \
         if( !p_pic->i_planes )                                                \
         {                                                                     \
@@ -61,17 +61,42 @@
         I_OUTPUTPICTURES++;                                                   \
     }                                                                         \
 
+/*****************************************************************************
+ * SetParentVal: forward variable value to parent whithout triggering the
+ *               callback
+ *****************************************************************************/
+static int SetParentVal( vlc_object_t *p_this, char const *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+    var_Change( (vlc_object_t *)p_data, psz_var, VLC_VAR_SETVALUE,
+                 &newval, NULL );
+    return VLC_SUCCESS;
+}
+
 #define ADD_CALLBACKS( newvout, handler ) \
+    var_AddCallback( newvout, "fullscreen", SetParentVal, p_vout );           \
     var_AddCallback( newvout, "mouse-x", SendEvents, p_vout );                \
     var_AddCallback( newvout, "mouse-y", SendEvents, p_vout );                \
     var_AddCallback( newvout, "mouse-moved", SendEvents, p_vout );            \
-    var_AddCallback( newvout, "mouse-clicked", SendEvents, p_vout );          \
-    var_AddCallback( newvout, "key-pressed", SendEvents, p_vout )
+    var_AddCallback( newvout, "mouse-clicked", SendEvents, p_vout );
 
 #define DEL_CALLBACKS( newvout, handler ) \
+    var_DelCallback( newvout, "fullscreen", SetParentVal, p_vout );           \
     var_DelCallback( newvout, "mouse-x", SendEvents, p_vout );                \
     var_DelCallback( newvout, "mouse-y", SendEvents, p_vout );                \
     var_DelCallback( newvout, "mouse-moved", SendEvents, p_vout );            \
-    var_DelCallback( newvout, "mouse-clicked", SendEvents, p_vout );          \
-    var_DelCallback( newvout, "key-pressed", SendEvents, p_vout )
+    var_DelCallback( newvout, "mouse-clicked", SendEvents, p_vout );
+
+#define ADD_PARENT_CALLBACKS( handler ) \
+    var_AddCallback( p_vout, "fullscreen", handler, NULL );                   \
+    var_AddCallback( p_vout, "aspect-ratio", handler, NULL );                 \
+    var_AddCallback( p_vout, "crop", handler, NULL );
+
+#define DEL_PARENT_CALLBACKS( handler ) \
+    var_DelCallback( p_vout, "fullscreen", handler, NULL );                   \
+    var_DelCallback( p_vout, "aspect-ratio", handler, NULL );                 \
+    var_DelCallback( p_vout, "crop", handler, NULL );
 
+static int  SendEventsToChild( vlc_object_t *, char const *,
+                               vlc_value_t, vlc_value_t, void * );