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 1adf05c698e9c73769d5a55af718cdad9c6f5e8a..b003c92f37de68e5fee06e61289c2104b16fa184 100644 (file)
--- a/modules/access/vcdx/intf.h
+++ b/modules/access/vcdx/intf.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * intf.h: send info to intf.
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: intf.h,v 1.2 2003/12/05 04:24:47 rocky 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
  * 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
@@ -18,29 +18,34 @@
  *
  * 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;
-
-    vlc_bool_t          b_still;
-    vlc_bool_t          b_inf_still;
-    mtime_t             m_still_time;
+  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_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 
-    int                 control;
+  vcdplay_ctrl_t      control;
+#else
+  int                 control;
 #endif
-    vlc_bool_t          b_click, b_move, b_key_pressed;
+  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 );