Changeset fd05dc698e736455dfa075fdb93f3600365f4e9d

Timestamp:

10/04/03 20:55:13 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1065293713 +0000

git-parent:

[0f814562371962e47d9f5b023c2ce1055c6002fb]

git-author:

Gildas Bazin <gbazin@videolan.org> 1065293713 +0000

Message:

* modules/access/vcdx/*: Brand new VCD input module using libcdio, libvcd and libvcdinfo. Courtesy of Rocky Bernstein.
* modules/access/cddax.c: Brand new CDDA input module using libcdio. Courtesy of Rocky Bernstein.
* modules/LIST: update.

Files:

• configure.ac (modified) (4 diffs)
• modules/LIST (modified) (10 diffs)
• modules/access/Modules.am (modified) (1 diff)
• modules/access/cddax.c (added)
• modules/access/vcdx/.cvsignore (added)
• modules/access/vcdx/Modules.am (added)
• modules/access/vcdx/access.c (added)
• modules/access/vcdx/cdrom.c (added)
• modules/access/vcdx/cdrom.h (added)
• modules/access/vcdx/demux.c (added)
• modules/access/vcdx/intf.c (added)
• modules/access/vcdx/intf.h (added)
• modules/access/vcdx/vcd.c (added)
• modules/access/vcdx/vcd.h (added)
• modules/access/vcdx/vcdplayer.c (added)
• modules/access/vcdx/vcdplayer.h (added)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-3 2003/10/04 11:59:59
+4 2003/10/04 18:55:12
-
-AC_INIT(vlc,0.6.3-cvs)
@@ -80 +80 @@
-    SYS=bsdi
-    CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
-
+ vcdx cddax
-    ;;
-  *bsd*)
@@ -1438 +1438 @@
-    AX_ADD_LDFLAGS([vcd cdda],[-framework IOKit -framework CoreFoundation])
-  fi
+fi
+
+dnl
+dnl  VCDX and CDX modules
+dnl
+AC_ARG_ENABLE(vcdx,
+  [  --enable-vcdx            VCD support with Navigation for Linux and Win32 (default enabled)])
+
+if test "${enable_vcdx}" != "no"
+then
+  PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.63,
+    enable_cdda="no"
+    AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
+    AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
+    AX_ADD_PLUGINS([cddax]), 
+    [AC_MSG_WARN(libcdio library not found)])
+
+  PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.18-cdio,
+    enable_vcd="no"
+    AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
+    AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    AX_ADD_PLUGINS([vcdx]), 
+[AC_MSG_WARN(vcdinfo library not found)])
-fi
-
@@ -3361 +3384 @@
-  modules/access/v4l/Makefile
-  modules/access/vcd/Makefile
+  modules/access/vcdx/Makefile
-  modules/access_output/Makefile
-  modules/audio_filter/Makefile

modules/LIST

@@ -1 +1 @@
-List of vlc plugins (221)
-
-
-
-
-
-
+
+
+
+
- * a52sys: A/52 decapsulation demuxer.
-
@@ -64 +62 @@
- * cdda: input module to read audio CDs
-
+ * cddax: input module to read audio CDs vi libcdio
+
- * cinepak: Cinepack video decoder
-
@@ -86 +86 @@
- * distort: miscellaneous image effects filter.
-
- * downmix3dn: 3D Now! accelerated version of downmix.
-
- * downmix: downmix module, used by the AC3 decoder.
-
- * downmixsse: SSE accelerated version of downmix.
-
- * dshow: DirectShow access plugin for encoding cards under Windows
-
-
+/packetizer
-
- * dtstospdif: Audio converter that encapsulates DTS into S/PDIF
@@ -197 +191 @@
- * id3tag: ID3 tag parser/skipper using libid3tag
- 
- * idctaltivec: AltiVec accelerated version of idct.
- 
- * idctclassic: another version of idct.
-
- * idct: inverse DCT module, used by mpeg_video_old
-
- * idctmmxext: MMX EXT accelerated version of idct.
- 
- * idctmmx: MMX accelerated version of idct.
- 
- * imdct3dn: 3D Now! Accelerated A/52 DCT
-
- * imdct: IMDCT module for the A/52 decoder
-
- * imdctsse: SSE accelerated A/52 DCT
-
- * invert: inverse video filter.
-
@@ -255 +233 @@
- * mkv: Matroska demuxer
-
- * motion3dnow: 3D Now! accelerated version of motion.
- 
- * motionaltivec: AltiVec accelerated version of motion.
-
- * motionblur: Motion blur filter
-
- * motionmmxext: MMX EXT accelerated version of motion.
- 
- * motionmmx: MMX accelerated version of motion.
-
- * motion: motion compensation module for mpeg_video_old
-
- * mp4: MP4 file input module
-
- and 
+/
-
- * mpeg_system: helper module for TS, PS and PES management
-
- * mpeg_video_old: MPEG and MPEG2 video decoder.
-
- * mpga: MPEG-I/II Audio demuxer
-
@@ -301 +267 @@
- * oss: audio output module using the OSS /dev/dsp interface.
- 
- * packetizer_a52: A/52 audio packetizer
-
- * packetizer_copy: Simple copy packetizer
-
@@ -309 +273 @@
- * packetizer_mpeg4video: MPEG4 video packetizer
-
- * packetizer_mpegaudio: MPEG audio packetizer
- 
- * packetizer_mpegvideo: MPEG video packetizer
- 
- * packetizer_vorbis: Vorbis packetizer
-
- * pda: interface for iPaq using the Gtk2+ widget set.
-
@@ -379 +339 @@
- * stream_out_transcode: audio & video transcoder using ffmpeg
-
-
+ for text subtitles
-
- * svgalib: SGVAlib output plugin
@@ -393 +353 @@
- * test4: Stress test module
-
-
+/packetizer
-
- * transform: filter for horizontal and vertical image flips and
@@ -420 +380 @@
- * vcd: input module for accessing Video CDs.
-
+ * vcdx: input module for accessing Video CDs with navigation & stills
+
- * visual: visualisation system
-
-
+/packetizer
-
- * vout_directx: video output module using the DirectX API.

modules/access/Modules.am

@@ -11 +11 @@
-        vcd/cdrom_internals.h \
-        $(NULL)
+SOURCES_cddax = \
+        cddax.c \
+        vcdx/cdrom.c \
+        vcdx/cdrom.h