From b535c2d4f8d84adb22c741170e6fd11b3cfc4478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 31 May 2007 22:24:29 +0200 Subject: Move libcdio and libvcd into contrib/ --HG-- rename : src/input/vcd/libcdio/FreeBSD/freebsd.c => contrib/libcdio/FreeBSD/freebsd.c rename : src/input/vcd/libcdio/FreeBSD/freebsd.h => contrib/libcdio/FreeBSD/freebsd.h rename : src/input/vcd/libcdio/FreeBSD/freebsd_cam.c => contrib/libcdio/FreeBSD/freebsd_cam.c rename : src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c => contrib/libcdio/FreeBSD/freebsd_ioctl.c rename : src/input/vcd/libcdio/MSWindows/Makefile.am => contrib/libcdio/MSWindows/Makefile.am rename : src/input/vcd/libcdio/MSWindows/aspi32.c => contrib/libcdio/MSWindows/aspi32.c rename : src/input/vcd/libcdio/MSWindows/aspi32.h => contrib/libcdio/MSWindows/aspi32.h rename : src/input/vcd/libcdio/MSWindows/win32.c => contrib/libcdio/MSWindows/win32.c rename : src/input/vcd/libcdio/MSWindows/win32.h => contrib/libcdio/MSWindows/win32.h rename : src/input/vcd/libcdio/MSWindows/win32_ioctl.c => contrib/libcdio/MSWindows/win32_ioctl.c rename : src/input/vcd/libcdio/Makefile.am => contrib/libcdio/Makefile.am rename : src/input/vcd/libcdio/_cdio_bsdi.c => contrib/libcdio/_cdio_bsdi.c rename : src/input/vcd/libcdio/_cdio_generic.c => contrib/libcdio/_cdio_generic.c rename : src/input/vcd/libcdio/_cdio_linux.c => contrib/libcdio/_cdio_linux.c rename : src/input/vcd/libcdio/_cdio_osx.c => contrib/libcdio/_cdio_osx.c rename : src/input/vcd/libcdio/_cdio_stdio.c => contrib/libcdio/_cdio_stdio.c rename : src/input/vcd/libcdio/_cdio_stdio.h => contrib/libcdio/_cdio_stdio.h rename : src/input/vcd/libcdio/_cdio_stream.c => contrib/libcdio/_cdio_stream.c rename : src/input/vcd/libcdio/_cdio_stream.h => contrib/libcdio/_cdio_stream.h rename : src/input/vcd/libcdio/_cdio_sunos.c => contrib/libcdio/_cdio_sunos.c rename : src/input/vcd/libcdio/cd_types.c => contrib/libcdio/cd_types.c rename : src/input/vcd/libcdio/cdio.c => contrib/libcdio/cdio.c rename : src/input/vcd/libcdio/cdio/Makefile.am => contrib/libcdio/cdio/Makefile.am rename : src/input/vcd/libcdio/cdio/bytesex.h => contrib/libcdio/cdio/bytesex.h rename : src/input/vcd/libcdio/cdio/bytesex_asm.h => contrib/libcdio/cdio/bytesex_asm.h rename : src/input/vcd/libcdio/cdio/cd_types.h => contrib/libcdio/cdio/cd_types.h rename : src/input/vcd/libcdio/cdio/cdio.h => contrib/libcdio/cdio/cdio.h rename : src/input/vcd/libcdio/cdio/cdtext.h => contrib/libcdio/cdio/cdtext.h rename : src/input/vcd/libcdio/cdio/ds.h => contrib/libcdio/cdio/ds.h rename : src/input/vcd/libcdio/cdio/dvd.h => contrib/libcdio/cdio/dvd.h rename : src/input/vcd/libcdio/cdio/iso9660.h => contrib/libcdio/cdio/iso9660.h rename : src/input/vcd/libcdio/cdio/logging.h => contrib/libcdio/cdio/logging.h rename : src/input/vcd/libcdio/cdio/scsi_mmc.h => contrib/libcdio/cdio/scsi_mmc.h rename : src/input/vcd/libcdio/cdio/sector.h => contrib/libcdio/cdio/sector.h rename : src/input/vcd/libcdio/cdio/types.h => contrib/libcdio/cdio/types.h rename : src/input/vcd/libcdio/cdio/util.h => contrib/libcdio/cdio/util.h rename : src/input/vcd/libcdio/cdio/version.h => contrib/libcdio/cdio/version.h rename : src/input/vcd/libcdio/cdio/xa.h => contrib/libcdio/cdio/xa.h rename : src/input/vcd/libcdio/cdio_assert.h => contrib/libcdio/cdio_assert.h rename : src/input/vcd/libcdio/cdio_private.h => contrib/libcdio/cdio_private.h rename : src/input/vcd/libcdio/cdtext.c => contrib/libcdio/cdtext.c rename : src/input/vcd/libcdio/cdtext_private.h => contrib/libcdio/cdtext_private.h rename : src/input/vcd/libcdio/ds.c => contrib/libcdio/ds.c rename : src/input/vcd/libcdio/generic.h => contrib/libcdio/generic.h rename : src/input/vcd/libcdio/image.h => contrib/libcdio/image.h rename : src/input/vcd/libcdio/image/Makefile.am => contrib/libcdio/image/Makefile.am rename : src/input/vcd/libcdio/image/bincue.c => contrib/libcdio/image/bincue.c rename : src/input/vcd/libcdio/image/cdrdao.c => contrib/libcdio/image/cdrdao.c rename : src/input/vcd/libcdio/image/nrg.c => contrib/libcdio/image/nrg.c rename : src/input/vcd/libcdio/image/nrg.h => contrib/libcdio/image/nrg.h rename : src/input/vcd/libcdio/image_common.h => contrib/libcdio/image_common.h rename : src/input/vcd/libcdio/iso9660.c => contrib/libcdio/iso9660.c rename : src/input/vcd/libcdio/iso9660_fs.c => contrib/libcdio/iso9660_fs.c rename : src/input/vcd/libcdio/iso9660_private.h => contrib/libcdio/iso9660_private.h rename : src/input/vcd/libcdio/logging.c => contrib/libcdio/logging.c rename : src/input/vcd/libcdio/portable.h => contrib/libcdio/portable.h rename : src/input/vcd/libcdio/scsi_mmc.c => contrib/libcdio/scsi_mmc.c rename : src/input/vcd/libcdio/scsi_mmc.h => contrib/libcdio/scsi_mmc.h rename : src/input/vcd/libcdio/scsi_mmc_private.h => contrib/libcdio/scsi_mmc_private.h rename : src/input/vcd/libcdio/sector.c => contrib/libcdio/sector.c rename : src/input/vcd/libcdio/util.c => contrib/libcdio/util.c rename : src/input/vcd/libcdio/xa.c => contrib/libcdio/xa.c rename : src/input/vcd/libvcd/Makefile.am => contrib/libvcd/Makefile.am rename : src/input/vcd/libvcd/bitvec.h => contrib/libvcd/bitvec.h rename : src/input/vcd/libvcd/bytesex.h => contrib/libvcd/bytesex.h rename : src/input/vcd/libvcd/bytesex_asm.h => contrib/libvcd/bytesex_asm.h rename : src/input/vcd/libvcd/data_structures.c => contrib/libvcd/data_structures.c rename : src/input/vcd/libvcd/data_structures.h => contrib/libvcd/data_structures.h rename : src/input/vcd/libvcd/dict.h => contrib/libvcd/dict.h rename : src/input/vcd/libvcd/directory.c => contrib/libvcd/directory.c rename : src/input/vcd/libvcd/directory.h => contrib/libvcd/directory.h rename : src/input/vcd/libvcd/files.c => contrib/libvcd/files.c rename : src/input/vcd/libvcd/image.c => contrib/libvcd/image.c rename : src/input/vcd/libvcd/image_bincue.c => contrib/libvcd/image_bincue.c rename : src/input/vcd/libvcd/image_cdrdao.c => contrib/libvcd/image_cdrdao.c rename : src/input/vcd/libvcd/image_nrg.c => contrib/libvcd/image_nrg.c rename : src/input/vcd/libvcd/image_sink.h => contrib/libvcd/image_sink.h rename : src/input/vcd/libvcd/inf.c => contrib/libvcd/inf.c rename : src/input/vcd/libvcd/info.c => contrib/libvcd/info.c rename : src/input/vcd/libvcd/info_private.c => contrib/libvcd/info_private.c rename : src/input/vcd/libvcd/info_private.h => contrib/libvcd/info_private.h rename : src/input/vcd/libvcd/libvcd/Makefile.am => contrib/libvcd/libvcd/Makefile.am rename : src/input/vcd/libvcd/libvcd/files.h => contrib/libvcd/libvcd/files.h rename : src/input/vcd/libvcd/libvcd/files_private.h => contrib/libvcd/libvcd/files_private.h rename : src/input/vcd/libvcd/libvcd/inf.h => contrib/libvcd/libvcd/inf.h rename : src/input/vcd/libvcd/libvcd/info.h => contrib/libvcd/libvcd/info.h rename : src/input/vcd/libvcd/libvcd/logging.h => contrib/libvcd/libvcd/logging.h rename : src/input/vcd/libvcd/libvcd/sector.h => contrib/libvcd/libvcd/sector.h rename : src/input/vcd/libvcd/libvcd/types.h => contrib/libvcd/libvcd/types.h rename : src/input/vcd/libvcd/libvcd/version.h => contrib/libvcd/libvcd/version.h rename : src/input/vcd/libvcd/logging.c => contrib/libvcd/logging.c rename : src/input/vcd/libvcd/mpeg.c => contrib/libvcd/mpeg.c rename : src/input/vcd/libvcd/mpeg.h => contrib/libvcd/mpeg.h rename : src/input/vcd/libvcd/mpeg_stream.c => contrib/libvcd/mpeg_stream.c rename : src/input/vcd/libvcd/mpeg_stream.h => contrib/libvcd/mpeg_stream.h rename : src/input/vcd/libvcd/obj.h => contrib/libvcd/obj.h rename : src/input/vcd/libvcd/pbc.c => contrib/libvcd/pbc.c rename : src/input/vcd/libvcd/pbc.h => contrib/libvcd/pbc.h rename : src/input/vcd/libvcd/salloc.c => contrib/libvcd/salloc.c rename : src/input/vcd/libvcd/salloc.h => contrib/libvcd/salloc.h rename : src/input/vcd/libvcd/sector.c => contrib/libvcd/sector.c rename : src/input/vcd/libvcd/sector_private.h => contrib/libvcd/sector_private.h rename : src/input/vcd/libvcd/stream.c => contrib/libvcd/stream.c rename : src/input/vcd/libvcd/stream.h => contrib/libvcd/stream.h rename : src/input/vcd/libvcd/stream_stdio.c => contrib/libvcd/stream_stdio.c rename : src/input/vcd/libvcd/stream_stdio.h => contrib/libvcd/stream_stdio.h rename : src/input/vcd/libvcd/util.c => contrib/libvcd/util.c rename : src/input/vcd/libvcd/util.h => contrib/libvcd/util.h rename : src/input/vcd/libvcd/vcd.c => contrib/libvcd/vcd.c rename : src/input/vcd/libvcd/vcd.h => contrib/libvcd/vcd.h rename : src/input/vcd/libvcd/vcd_assert.h => contrib/libvcd/vcd_assert.h rename : src/input/vcd/libvcd/vcd_read.c => contrib/libvcd/vcd_read.c rename : src/input/vcd/libvcd/vcd_read.h => contrib/libvcd/vcd_read.h --- src/input/vcd/libcdio/_cdio_stream.c | 200 ----------------------------------- 1 file changed, 200 deletions(-) delete mode 100644 src/input/vcd/libcdio/_cdio_stream.c (limited to 'src/input/vcd/libcdio/_cdio_stream.c') diff --git a/src/input/vcd/libcdio/_cdio_stream.c b/src/input/vcd/libcdio/_cdio_stream.c deleted file mode 100644 index fc1f7fce7..000000000 --- a/src/input/vcd/libcdio/_cdio_stream.c +++ /dev/null @@ -1,200 +0,0 @@ -/* - $Id: _cdio_stream.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $ - - Copyright (C) 2000, 2004 Herbert Valerio Riedel - - 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 - GNU 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include "cdio_assert.h" - -/* #define STREAM_DEBUG */ - -#include -#include -#include "_cdio_stream.h" - -static const char _rcsid[] = "$Id: _cdio_stream.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $"; - -/* - * DataSource implementations - */ - -struct _CdioDataSource { - void* user_data; - cdio_stream_io_functions op; - int is_open; - long position; -}; - -/* - Open if not already open. - Return false if we hit an error. Errno should be set for that error. -*/ -static bool -_cdio_stream_open_if_necessary(CdioDataSource *obj) -{ - cdio_assert (obj != NULL); - - if (!obj->is_open) { - if (obj->op.open(obj->user_data)) { - cdio_warn ("could not open input stream..."); - return false; - } else { - cdio_debug ("opened source..."); - obj->is_open = 1; - obj->position = 0; - } - } - return true; -} - -/*! - Like 3 fseek and in fact may be the same. - - This function sets the file position indicator for the stream - pointed to by stream. The new position, measured in bytes, is obtained - by adding offset bytes to the position specified by whence. If whence - is set to SEEK_SET, SEEK_CUR, or SEEK_END, the offset is relative to - the start of the file, the current position indicator, or end-of-file, - respectively. A successful call to the fseek function clears the end- - of-file indicator for the stream and undoes any effects of the - ungetc(3) function on the same stream. - - RETURN VALUE - Upon successful completion, return 0, - Otherwise, -1 is returned and the global variable errno is set to indi- - cate the error. -*/ -long -cdio_stream_seek(CdioDataSource* obj, long offset, int whence) -{ - cdio_assert (obj != NULL); - - if (!_cdio_stream_open_if_necessary(obj)) - /* errno is set by _cdio_stream_open_if necessary. */ - return -1; - - if (obj->position != offset) { -#ifdef STREAM_DEBUG - cdio_warn("had to reposition DataSource from %ld to %ld!", obj->position, offset); -#endif - obj->position = offset; - return obj->op.seek(obj->user_data, offset, whence); - } - - return 0; -} - -CdioDataSource* -cdio_stream_new(void *user_data, const cdio_stream_io_functions *funcs) -{ - CdioDataSource *new_obj; - - new_obj = _cdio_malloc (sizeof (CdioDataSource)); - - new_obj->user_data = user_data; - memcpy(&(new_obj->op), funcs, sizeof(cdio_stream_io_functions)); - - return new_obj; -} - -/*! - Like fread(3) and in fact may be the same. - - DESCRIPTION: - The function fread reads nmemb elements of data, each size bytes long, - from the stream pointed to by stream, storing them at the location - given by ptr. - - RETURN VALUE: - return the number of items successfully read or written (i.e., - not the number of characters). If an error occurs, or the - end-of-file is reached, the return value is a short item count - (or zero). - - We do not distinguish between end-of-file and error, and callers - must use feof(3) and ferror(3) to determine which occurred. -*/ -long -cdio_stream_read(CdioDataSource* obj, void *ptr, long size, long nmemb) -{ - long read_bytes; - - cdio_assert (obj != NULL); - - if (!_cdio_stream_open_if_necessary(obj)) return 0; - - read_bytes = obj->op.read(obj->user_data, ptr, size*nmemb); - obj->position += read_bytes; - - return read_bytes; -} - -/*! - Return whatever size of stream reports, I guess unit size is bytes. - On error return -1; - */ -long int -cdio_stream_stat(CdioDataSource* obj) -{ - cdio_assert (obj != NULL); - - if (!_cdio_stream_open_if_necessary(obj)) return -1; - - return obj->op.stat(obj->user_data); -} - -void -cdio_stream_close(CdioDataSource* obj) -{ - cdio_assert (obj != NULL); - - if (obj->is_open) { - cdio_debug ("closed source..."); - obj->op.close(obj->user_data); - obj->is_open = 0; - obj->position = 0; - } -} - -void -cdio_stream_destroy(CdioDataSource* obj) -{ - cdio_assert (obj != NULL); - - cdio_stream_close(obj); - - obj->op.free(obj->user_data); - - free(obj); -} - - -/* - * Local variables: - * c-file-style: "gnu" - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ -- cgit v1.2.3