Removes trailing spaces. Removes tabs.

[vlc] / modules / access / vcdx / intf.h

diff --git a/modules/access/vcdx/intf.h b/modules/access/vcdx/intf.h
index 90c04b04799082f31c20cc7edfab77264bdb7ff7..b003c92f37de68e5fee06e61289c2104b16fa184 100644 (file)
--- a/modules/access/vcdx/intf.h
+++ b/modules/access/vcdx/intf.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * intf.h: send info to intf.
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: intf.h,v 1.4 2003/12/22 14:32:55 sam Exp $
+ * Copyright (C) 2001 the VideoLAN team
+ * $Id$
  *
- * Author: Stéphane Borel <stef@via.ecp.fr>
+ * Author: Stéphane Borel <stef@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
@@ -18,22 +18,26 @@
  *
  * 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.
  *****************************************************************************/
 
+#include <vlc/vlc.h>
+#include <vlc_input.h>
+#include "vcdplayer.h"
+
 /*****************************************************************************
  * intf_sys_t: description and status of interface
  *****************************************************************************/
 struct intf_sys_t
 {
-  input_thread_t    * p_input;
-  thread_vcd_data_t * p_vcd;
+  input_thread_t *p_input;
+  vcdplayer_t    *p_vcdplayer;
 
-  vlc_bool_t          b_still;        /* True if we are in a still frame */
-  vlc_bool_t          b_inf_still;    /* True if still wait time is infinite */
-  mtime_t             m_still_time;   /* Time in microseconds remaining
+  vlc_bool_t      b_still;           /* True if we are in a still frame */
+  vlc_bool_t      b_infinite_still;  /* True if still wait time is infinite */
+  mtime_t         m_still_time;      /* Time in microseconds remaining
                                          to wait in still frame.
-                                       */
+                     */
 #if FINISHED
   vcdplay_ctrl_t      control;
 #else
@@ -42,6 +46,6 @@ struct intf_sys_t
   vlc_bool_t          b_click, b_move, b_key_pressed;
 };
 
-int vcdIntfStillTime( struct intf_thread_t *, int );
+int vcdIntfStillTime( struct intf_thread_t * p_intf, uint8_t wait_time);
 int vcdIntfResetStillTime( intf_thread_t *p_intf );