* modules/video_output/directx/*: embedded vout plays nicer with multi-monitor setups.

[vlc] / include / vout_synchro.h

diff --git a/include/vout_synchro.h b/include/vout_synchro.h
index 50a7302cad1eaa62be467c8db90db82775503f77..8445a6004c793977f1d9700c2509316e2bf24966 100644 (file)
--- a/include/vout_synchro.h
+++ b/include/vout_synchro.h
@@ -2,7 +2,7 @@
  * vout_synchro.h: frame-dropping structures
  *****************************************************************************
  * Copyright (C) 1999-2003 VideoLAN
- * $Id: vout_synchro.h,v 1.2 2003/06/09 00:33:34 massiot Exp $
+ * $Id: vout_synchro.h,v 1.4 2004/01/25 18:17:08 zorglub Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -12,7 +12,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 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
@@ -46,7 +46,9 @@ struct vout_synchro_t
     /* decoding values */
     mtime_t         p_tau[4];                  /* average decoding durations */
     unsigned int    pi_meaningful[4];            /* number of durations read */
-    /* and p_vout->render_time (read with p_vout->change_lock) */
+
+    /* render_time filled by SynchroChoose() */
+    int i_render_time;
 
     /* stream context */
     int             i_nb_ref;                /* Number of reference pictures */
@@ -68,7 +70,7 @@ struct vout_synchro_t
 /* Pictures types */
 #define I_CODING_TYPE           1
 #define P_CODING_TYPE           2
-#define B_CODING_TYPE           3     
+#define B_CODING_TYPE           3
 #define D_CODING_TYPE           4 /* MPEG-1 ONLY */
 /* other values are reserved */
 
@@ -80,11 +82,11 @@ struct vout_synchro_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-#define vout_SynchroInit(a,b,c) __vout_SynchroInit(VLC_OBJECT(a),b,c)
-VLC_EXPORT( vout_synchro_t *, __vout_SynchroInit, ( vlc_object_t *, vout_thread_t *, int ) );
+#define vout_SynchroInit(a,b) __vout_SynchroInit(VLC_OBJECT(a),b)
+VLC_EXPORT( vout_synchro_t *, __vout_SynchroInit, ( vlc_object_t *, int ) );
 VLC_EXPORT( void, vout_SynchroRelease,        ( vout_synchro_t * ) );
 VLC_EXPORT( void, vout_SynchroReset,          ( vout_synchro_t * ) );
-VLC_EXPORT( vlc_bool_t, vout_SynchroChoose,   ( vout_synchro_t *, int ) );
+VLC_EXPORT( vlc_bool_t, vout_SynchroChoose,   ( vout_synchro_t *, int, int ) );
 VLC_EXPORT( void, vout_SynchroTrash,          ( vout_synchro_t * ) );
 VLC_EXPORT( void, vout_SynchroDecode,         ( vout_synchro_t * ) );
 VLC_EXPORT( void, vout_SynchroEnd,            ( vout_synchro_t *, int, vlc_bool_t ) );