macosx: delay start in fullscreen animation to allow to finish resize animation befor...

[vlc] / modules / video_filter / mosaic.h

diff --git a/modules/video_filter/mosaic.h b/modules/video_filter/mosaic.h
index 214ced1af10c1eea8b5b549bc3e621d470477655..638f0727065234a63590ec80a8aaf525e314c5cf 100644 (file)
--- a/modules/video_filter/mosaic.h
+++ b/modules/video_filter/mosaic.h
@@ -1,25 +1,25 @@
 /*****************************************************************************
  * mosaic.h:
  *****************************************************************************
- * Copyright (C) 2004-2005 the VideoLAN team
+ * Copyright (C) 2004-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 typedef struct bridged_es_t
@@ -27,8 +27,12 @@ typedef struct bridged_es_t
     es_format_t fmt;
     picture_t *p_picture;
     picture_t **pp_last;
-    vlc_bool_t b_empty;
+    bool b_empty;
     char *psz_id;
+
+    int i_alpha;
+    int i_x;
+    int i_y;
 } bridged_es_t;
 
 typedef struct bridge_t
@@ -37,22 +41,19 @@ typedef struct bridge_t
     int i_es_num;
 } bridge_t;
 
-#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
-static bridge_t *__GetBridge( vlc_object_t *p_object )
+static bridge_t *GetBridge( vlc_object_t *p_object )
 {
-    vlc_object_t *p_libvlc_global = p_object->p_libvlc_global;
-    bridge_t *p_bridge;
+    vlc_object_t *p_libvlc = VLC_OBJECT( p_object->p_libvlc );
     vlc_value_t val;
 
-    if( var_Get( p_libvlc_global, "mosaic-struct", &val ) != VLC_SUCCESS )
+    if( var_Get( p_libvlc, "mosaic-struct", &val ) != VLC_SUCCESS )
     {
-        p_bridge = NULL;
+        return NULL;
     }
     else
     {
-        p_bridge = val.p_address;
+        return val.p_address;
     }
-
-    return p_bridge;
 }
+#define GetBridge(a) GetBridge( VLC_OBJECT(a) )