Use VLC_CODEC_S24(B|L)32

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

diff --git a/modules/access/vcdx/vcd.h b/modules/access/vcdx/vcd.h
index 2331f9c2d4c583e12bf56a2eb18f4281ce973633..586aabac036ec60961a589f26a743625013ef756 100644 (file)
--- a/modules/access/vcdx/vcd.h
+++ b/modules/access/vcdx/vcd.h
@@ -2,41 +2,40 @@
  * vcd.h : VCD input module header for vlc
  *         using libcdio, libvcd and libvcdinfo
  *****************************************************************************
- * Copyright (C) 2003, 2004 the VideoLAN team
+ * Copyright (C) 2003, 2004 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *
- * 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.
  *****************************************************************************/
 
 #include <libvcd/info.h>
+#include <vlc_interface.h>
 
 #define VCD_MRL_PREFIX "vcdx://"
 
 /*****************************************************************************
  * vcd_data_t: structure for communication between access and intf.
  *****************************************************************************/
-typedef struct
-{
-#if FINISHED
+typedef struct {
+#ifdef FINISHED
     vcdplay_ptr             vmg;
 #endif
-    intf_thread_t *         p_intf;
 
-#if DEMUX_FINISHED
+#ifdef DEMUX_FINISHED
     int                     i_audio_nb;
     int                     i_spu_nb;
 #endif
@@ -44,7 +43,7 @@ typedef struct
     int                     i_still_time;
     bool              b_end_of_cell;
 
-#if FINISHED
+#ifdef FINISHED
     vcdplay_event_t         event;
     vcdplay_ctrl_t          control;
     vcdplay_highlight_t     hli;
@@ -53,4 +52,4 @@ typedef struct
 } vcd_data_t;
 
 int  VCDSetArea      ( access_t * );
-int  VCDSeek         ( access_t *, off_t );
+int  VCDSeek         ( access_t *, uint64_t );