Some cleanup and unification with xine vcd plugin.

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

diff --git a/modules/access/vcdx/intf.h b/modules/access/vcdx/intf.h
index b82c994eb35939119e379483e96c6fa0d160cd0b..1c6961e8741268f095a0cc6b7ebec5516d0b5f49 100644 (file)
--- a/modules/access/vcdx/intf.h
+++ b/modules/access/vcdx/intf.h
@@ -27,13 +27,13 @@
 struct intf_sys_t
 {
   input_thread_t *p_input;
-  vcdplayer_t    *p_vcd;
+  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 +42,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 );