diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/vcd/libcdio/cdio/cdio.h | 137 | ||||
| -rw-r--r-- | src/input/vcd/libvcd/libvcd/version.h | 12 | ||||
| -rw-r--r-- | src/input/vcd/vcdplayer.c | 6 | ||||
| -rw-r--r-- | src/input/vcd/xineplug_inp_vcd.c | 7 |
4 files changed, 88 insertions, 74 deletions
diff --git a/src/input/vcd/libcdio/cdio/cdio.h b/src/input/vcd/libcdio/cdio/cdio.h index e0d8ae311..f9e2a38e3 100644 --- a/src/input/vcd/libcdio/cdio/cdio.h +++ b/src/input/vcd/libcdio/cdio/cdio.h @@ -1,5 +1,5 @@ /* -*- c -*- - $Id: cdio.h,v 1.3 2005/01/01 02:43:58 rockyb Exp $ + $Id: cdio.h,v 1.4 2005/04/27 23:28:42 rockyb Exp $ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> @@ -20,7 +20,9 @@ */ /** \file cdio.h - * \brief The top-level header for libcdio: the CD Input and Control library. + * + * \brief The top-level header for libcdio: the CD Input and Control + * library. Applications include this for anything regarding libcdio. */ @@ -69,8 +71,11 @@ extern "C" { char psz_revision[CDIO_MMC_HW_REVISION_LEN+1]; } cdio_hwinfo_t; +/* For compatability. */ +#define CdIo CdIo_t + /** This is an opaque structure for the CD object. */ - typedef struct _CdIo CdIo; + typedef struct _CdIo CdIo_t; /** This is an opaque structure for the CD-Text object. */ typedef struct cdtext cdtext_t; @@ -148,7 +153,7 @@ extern "C" { @return 0 if success and 1 for failure, and 2 if no routine. If the CD is ejected *p_cdio is freed and p_cdio set to NULL. */ - int cdio_eject_media (CdIo **p_cdio); + int cdio_eject_media (CdIo_t **p_cdio); /*! Free any resources associated with p_cdio. Call this when done using p_cdio @@ -156,7 +161,7 @@ extern "C" { @param p_cdio the CD object to eliminated. */ - void cdio_destroy (CdIo *p_cdio); + void cdio_destroy (CdIo_t *p_cdio); /*! Free device list returned by cdio_get_devices or @@ -178,7 +183,7 @@ extern "C" { @return the value associatd with "key" or NULL if p_cdio is NULL or "key" does not exist. */ - const char * cdio_get_arg (const CdIo *p_cdio, const char key[]); + const char * cdio_get_arg (const CdIo_t *p_cdio, const char key[]); /*! Get CD-Text information for a CdIo object. @@ -191,7 +196,7 @@ extern "C" { If i_track is 0 or CDIO_CDROM_LEADOUT_TRACK the track returned is the information assocated with the CD. */ - const cdtext_t *cdio_get_cdtext (CdIo *p_cdio, track_t i_track); + const cdtext_t *cdio_get_cdtext (CdIo_t *p_cdio, track_t i_track); /*! Get the default CD device. @@ -206,7 +211,7 @@ extern "C" { there is no media in it and it is possible for this routine to return NULL even though there may be a hardware CD-ROM. */ - char * cdio_get_default_device (const CdIo *p_cdio); + char * cdio_get_default_device (const CdIo_t *p_cdio); /*! Return an array of device names. If you want a specific devices for a driver, give that device. If you want hardware @@ -266,7 +271,7 @@ extern "C" { that we've got. The notion of "CD" is extended a little to include DVD's. */ - discmode_t cdio_get_discmode (CdIo *p_cdio); + discmode_t cdio_get_discmode (CdIo_t *p_cdio); /*! Get the what kind of device we've got. @@ -280,7 +285,7 @@ extern "C" { there is no media in it and it is possible for this routine to return NULL even though there may be a hardware CD-ROM. */ - void cdio_get_drive_cap (const CdIo *p_cdio, + void cdio_get_drive_cap (const CdIo_t *p_cdio, cdio_drive_read_cap_t *p_read_cap, cdio_drive_write_cap_t *p_write_cap, cdio_drive_misc_cap_t *p_misc_cap); @@ -305,7 +310,7 @@ extern "C" { @return a string with driver name or NULL if CdIo is NULL (we haven't initialized a specific device. */ - const char * cdio_get_driver_name (const CdIo *p_cdio); + const char * cdio_get_driver_name (const CdIo_t *p_cdio); /*! Get the driver id. @@ -314,7 +319,7 @@ extern "C" { @return the driver id.. */ - driver_id_t cdio_get_driver_id (const CdIo *p_cdio); + driver_id_t cdio_get_driver_id (const CdIo_t *p_cdio); /*! Get the number of the first track. @@ -322,20 +327,20 @@ extern "C" { @return the track number or CDIO_INVALID_TRACK on error. */ - track_t cdio_get_first_track_num(const CdIo *p_cdio); + track_t cdio_get_first_track_num(const CdIo_t *p_cdio); /*! Get the CD-ROM hardware info via a SCSI MMC INQUIRY command. False is returned if we had an error getting the information. */ - bool cdio_get_hwinfo ( const CdIo *p_cdio, + bool cdio_get_hwinfo ( const CdIo_t *p_cdio, /* out*/ cdio_hwinfo_t *p_hw_info ); /*! Return the Joliet level recognized for p_cdio. */ - uint8_t cdio_get_joliet_level(const CdIo *p_cdio); + uint8_t cdio_get_joliet_level(const CdIo_t *p_cdio); /*! Get the media catalog number (MCN) from the CD. @@ -347,7 +352,7 @@ extern "C" { string when done with it. */ - char * cdio_get_mcn (const CdIo *p_cdio); + char * cdio_get_mcn (const CdIo_t *p_cdio); /*! Get the number of tracks on the CD. @@ -355,12 +360,12 @@ extern "C" { @return the number of tracks, or CDIO_INVALID_TRACK if there is an error. */ - track_t cdio_get_num_tracks (const CdIo *p_cdio); + track_t cdio_get_num_tracks (const CdIo_t *p_cdio); /*! Get the format (audio, mode2, mode1) of track. */ - track_format_t cdio_get_track_format(const CdIo *p_cdio, track_t i_track); + track_format_t cdio_get_track_format(const CdIo_t *p_cdio, track_t i_track); /*! Return true if we have XA data (green, mode2 form1) or @@ -370,7 +375,7 @@ extern "C" { FIXME: there's gotta be a better design for this and get_track_format? */ - bool cdio_get_track_green(const CdIo *p_cdio, track_t i_track); + bool cdio_get_track_green(const CdIo_t *p_cdio, track_t i_track); /*! Get the starting LBA for track number @@ -384,7 +389,7 @@ extern "C" { @param i_track the track number we want the LSN for @return the starting LBA or CDIO_INVALID_LBA on error. */ - lba_t cdio_get_track_lba(const CdIo *p_cdio, track_t i_track); + lba_t cdio_get_track_lba(const CdIo_t *p_cdio, track_t i_track); /*! Return the starting MSF (minutes/secs/frames) for track number @@ -398,7 +403,7 @@ extern "C" { @param i_track the track number we want the LSN for @return the starting LSN or CDIO_INVALID_LSN on error. */ - lsn_t cdio_get_track_lsn(const CdIo *p_cdio, track_t i_track); + lsn_t cdio_get_track_lsn(const CdIo_t *p_cdio, track_t i_track); /*! Return the starting MSF (minutes/secs/frames) for track number @@ -410,7 +415,7 @@ extern "C" { @return true if things worked or false if there is no track entry. */ - bool cdio_get_track_msf(const CdIo *p_cdio, track_t i_track, + bool cdio_get_track_msf(const CdIo_t *p_cdio, track_t i_track, /*out*/ msf_t *msf); /*! @@ -421,7 +426,7 @@ extern "C" { @return the number of sectors or 0 if there is an error. */ - unsigned int cdio_get_track_sec_count(const CdIo *p_cdio, track_t i_track); + unsigned int cdio_get_track_sec_count(const CdIo_t *p_cdio, track_t i_track); /*! Reposition read offset @@ -433,7 +438,7 @@ extern "C" { SEEK_SET or SEEK_END. @return (off_t) -1 on error. */ - off_t cdio_lseek(const CdIo *p_cdio, off_t offset, int whence); + off_t cdio_lseek(const CdIo_t *p_cdio, off_t offset, int whence); /*! Reads into buf the next size bytes. @@ -441,7 +446,7 @@ extern "C" { @return (ssize_t) -1 on error. */ - ssize_t cdio_read(const CdIo *p_cdio, void *buf, size_t size); + ssize_t cdio_read(const CdIo_t *p_cdio, void *buf, size_t size); /*! Read an audio sector @@ -452,7 +457,7 @@ extern "C" { @return 0 if no error, nonzero otherwise. */ - int cdio_read_audio_sector (const CdIo *p_cdio, void *buf, lsn_t lsn); + int cdio_read_audio_sector (const CdIo_t *p_cdio, void *buf, lsn_t lsn); /*! Reads audio sectors @@ -464,7 +469,7 @@ extern "C" { @return 0 if no error, nonzero otherwise. */ - int cdio_read_audio_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn, + int cdio_read_audio_sectors (const CdIo_t *p_cdio, void *buf, lsn_t lsn, unsigned int i_sectors); /*! @@ -478,7 +483,7 @@ extern "C" { @return 0 if no error, nonzero otherwise. */ - int cdio_read_mode1_sector (const CdIo *p_cdio, void *buf, lsn_t lsn, + int cdio_read_mode1_sector (const CdIo_t *p_cdio, void *buf, lsn_t lsn, bool b_form2); /*! @@ -493,7 +498,7 @@ extern "C" { @return 0 if no error, nonzero otherwise. */ - int cdio_read_mode1_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn, + int cdio_read_mode1_sectors (const CdIo_t *p_cdio, void *buf, lsn_t lsn, bool b_form2, unsigned int i_sectors); /*! @@ -507,7 +512,7 @@ extern "C" { @return 0 if no error, nonzero otherwise. */ - int cdio_read_mode2_sector (const CdIo *p_cdio, void *buf, lsn_t lsn, + int cdio_read_mode2_sector (const CdIo_t *p_cdio, void *buf, lsn_t lsn, bool b_form2); /*! @@ -522,7 +527,7 @@ extern "C" { @return 0 if no error, nonzero otherwise. */ - int cdio_read_mode2_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn, + int cdio_read_mode2_sectors (const CdIo_t *p_cdio, void *buf, lsn_t lsn, bool b_form2, unsigned int i_sectors); /*! @@ -533,7 +538,7 @@ extern "C" { @param value the value to assocaiate with key @return 0 if no error was found, and nonzero otherwise. */ - int cdio_set_arg (CdIo *p_cdio, const char key[], const char value[]); + int cdio_set_arg (CdIo_t *p_cdio, const char key[], const char value[]); /*! Get the size of the CD in logical block address (LBA) units. @@ -541,7 +546,7 @@ extern "C" { @param p_cdio the CD object queried @return the size */ - uint32_t cdio_stat_size (const CdIo *p_cdio); + uint32_t cdio_stat_size (const CdIo_t *p_cdio); /*! Initialize CD Reading and control routines. Should be called first. @@ -597,7 +602,7 @@ extern "C" { @return the cdio object or NULL on error or no device. */ - CdIo * cdio_open (const char *source_name, driver_id_t driver_id); + CdIo_t * cdio_open (const char *source_name, driver_id_t driver_id); /*! Sets up to read from place specified by source_name, driver_id and access mode. This or cdio_open should be called before using @@ -607,36 +612,36 @@ extern "C" { @return the cdio object or NULL on error or no device. */ - CdIo * cdio_open_am (const char *psz_source_name, - driver_id_t driver_id, const char *psz_access_mode); + CdIo_t * cdio_open_am (const char *psz_source_name, + driver_id_t driver_id, const char *psz_access_mode); /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or .cue file @return the cdio object or NULL on error or no device. */ - CdIo * cdio_open_bincue (const char *psz_cue_name); + CdIo_t * cdio_open_bincue (const char *psz_cue_name); /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or .cue file @return the cdio object or NULL on error or no device.. */ - CdIo * cdio_open_am_bincue (const char *psz_cue_name, + CdIo_t * cdio_open_am_bincue (const char *psz_cue_name, const char *psz_access_mode); /*! Set up cdrdao CD disk-image for reading. Source is the .toc file @return the cdio object or NULL on error or no device. */ - CdIo * cdio_open_cdrdao (const char *psz_toc_name); + CdIo_t * cdio_open_cdrdao (const char *psz_toc_name); /*! Set up cdrdao CD disk-image for reading. Source is the .toc file @return the cdio object or NULL on error or no device.. */ - CdIo * cdio_open_am_cdrdao (const char *psz_toc_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_cdrdao (const char *psz_toc_name, + const char *psz_access_mode); /*! Return a string containing the default CUE file that would be used when none is specified. @@ -662,7 +667,7 @@ extern "C" { @return the cdio object for subsequent operations. NULL on error or there is no driver for a some sort of hardware CD-ROM. */ - CdIo * cdio_open_cd (const char *device_name); + CdIo_t * cdio_open_cd (const char *device_name); /*! Set up CD-ROM for reading. The device_name is the some sort of device name. @@ -670,15 +675,15 @@ extern "C" { @return the cdio object for subsequent operations. NULL on error or there is no driver for a some sort of hardware CD-ROM. */ - CdIo * cdio_open_am_cd (const char *psz_device, - const char *psz_access_mode); + CdIo_t * cdio_open_am_cd (const char *psz_device, + const char *psz_access_mode); /*! CDRWIN BIN/CUE CD disc-image routines. Source is the .cue file @return the cdio object for subsequent operations. NULL on error. */ - CdIo * cdio_open_cue (const char *cue_name); + CdIo_t * cdio_open_cue (const char *cue_name); /*! Set up CD-ROM for reading using the BSDI driver. The device_name is the some sort of device name. @@ -688,7 +693,7 @@ extern "C" { @see cdio_open */ - CdIo * cdio_open_bsdi (const char *psz_source_name); + CdIo_t * cdio_open_bsdi (const char *psz_source_name); /*! Set up CD-ROM for reading using the BSDI driver. The device_name is the some sort of device name. @@ -698,8 +703,8 @@ extern "C" { @see cdio_open */ - CdIo * cdio_open_am_bsdi (const char *psz_source_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_bsdi (const char *psz_source_name, + const char *psz_access_mode); /*! Return a string containing the default device name that the BSDI driver would use when none is specified. @@ -727,7 +732,7 @@ extern "C" { @see cdio_open_cd, cdio_open */ - CdIo * cdio_open_freebsd (const char *paz_source_name); + CdIo_t * cdio_open_freebsd (const char *paz_source_name); /*! Set up CD-ROM for reading using the FreeBSD driver. The device_name is the some sort of device name. @@ -736,8 +741,8 @@ extern "C" { @see cdio_open_cd, cdio_open */ - CdIo * cdio_open_am_freebsd (const char *psz_source_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_freebsd (const char *psz_source_name, + const char *psz_access_mode); /*! Return a string containing the default device name that the FreeBSD driver would use when none is specified. @@ -761,7 +766,7 @@ extern "C" { there is no media in it and it is possible for this routine to return NULL even though there may be a hardware CD-ROM. */ - CdIo * cdio_open_linux (const char *source_name); + CdIo_t * cdio_open_linux (const char *source_name); /*! Set up CD-ROM for reading using the GNU/Linux driver. The device_name is the some sort of device name. @@ -769,8 +774,8 @@ extern "C" { @return the cdio object for subsequent operations. NULL on error or there is no GNU/Linux driver. */ - CdIo * cdio_open_am_linux (const char *source_name, - const char *access_mode); + CdIo_t * cdio_open_am_linux (const char *source_name, + const char *access_mode); /*! Return a string containing the default device name that the GNU/Linux driver would use when none is specified. A scan is made @@ -797,7 +802,7 @@ extern "C" { @return the cdio object for subsequent operations. NULL on error or there is no Solaris driver. */ - CdIo * cdio_open_solaris (const char *source_name); + CdIo_t * cdio_open_solaris (const char *source_name); /*! Set up CD-ROM for reading using the Sun Solaris driver. The device_name is the some sort of device name. @@ -805,8 +810,8 @@ extern "C" { @return the cdio object for subsequent operations. NULL on error or there is no Solaris driver. */ - CdIo * cdio_open_am_solaris (const char *psz_source_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_solaris (const char *psz_source_name, + const char *psz_access_mode); /*! Return a string containing the default device name that the Solaris driver would use when none is specified. A scan is made @@ -838,7 +843,7 @@ extern "C" { @see cdio_open_cd, cdio_open */ - CdIo * cdio_open_osx (const char *psz_source_name); + CdIo_t * cdio_open_osx (const char *psz_source_name); /*! Set up CD-ROM for reading using the Apple OSX driver. The device_name is the some sort of device name. @@ -847,8 +852,8 @@ extern "C" { @see cdio_open_cd, cdio_open */ - CdIo * cdio_open_am_osx (const char *psz_source_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_osx (const char *psz_source_name, + const char *psz_access_mode); /*! Return a string containing the default device name that the OSX driver would use when none is specified. A scan is made @@ -872,15 +877,15 @@ extern "C" { there is no media in it and it is possible for this routine to return NULL even though there may be a hardware CD-ROM. */ - CdIo * cdio_open_win32 (const char *source_name); + CdIo_t * cdio_open_win32 (const char *source_name); /*! Set up CD-ROM for reading using the Microsoft Windows driver. The device_name is the some sort of device name. NULL is returned on error or there is no Microsof Windows driver. */ - CdIo * cdio_open_am_win32 (const char *psz_source_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_win32 (const char *psz_source_name, + const char *psz_access_mode); /*! Return a string containing the default device name that the Win32 driver would use when none is specified. A scan is made @@ -901,15 +906,15 @@ extern "C" { @return true on success; NULL on error or there is no Nero driver. */ - CdIo * cdio_open_nrg (const char *source_name); + CdIo_t * cdio_open_nrg (const char *source_name); /*! Set up CD-ROM for reading using the Nero driver. The device_name is the some sort of device name. @return true on success; NULL on error or there is no Nero driver. */ - CdIo * cdio_open_am_nrg (const char *psz_source_name, - const char *psz_access_mode); + CdIo_t * cdio_open_am_nrg (const char *psz_source_name, + const char *psz_access_mode); /*! Return a string containing the default device name that the NRG driver would use when none is specified. A scan is made diff --git a/src/input/vcd/libvcd/libvcd/version.h b/src/input/vcd/libvcd/libvcd/version.h index d71374724..0cd2096d3 100644 --- a/src/input/vcd/libvcd/libvcd/version.h +++ b/src/input/vcd/libvcd/libvcd/version.h @@ -1 +1,11 @@ -#define LIBVCD_VERSION "0.7.20a" +/* $Id: version.h,v 1.4 2005/04/27 23:28:42 rockyb Exp $ */ +/** \file version.h + * \brief A file simply containing the library version number. + */ + +/*! LIBVCD_VERSION can as a string in programs to show what version is used. */ +#define LIBVCD_VERSION "0.7.21-" + +/*! LIBCDIO_VERSION_NUM can be used for testing in the C preprocessor */ +#define LIBVCD_VERSION_NUM 21 + diff --git a/src/input/vcd/vcdplayer.c b/src/input/vcd/vcdplayer.c index 408aff6e3..c37c0de4d 100644 --- a/src/input/vcd/vcdplayer.c +++ b/src/input/vcd/vcdplayer.c @@ -1,5 +1,5 @@ /* - $Id: vcdplayer.c,v 1.15 2005/01/08 15:12:42 rockyb Exp $ + $Id: vcdplayer.c,v 1.16 2005/04/27 23:28:41 rockyb Exp $ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> @@ -467,7 +467,7 @@ _vcdplayer_set_entry(vcdplayer_t *p_vcdplayer, unsigned int num) _vcdplayer_set_origin(p_vcdplayer); - dbg_print(INPUT_DBG_LSN, "LSN: %u, track_end LSN: %u\n", + dbg_print((INPUT_DBG_LSN|INPUT_DBG_PBC), "LSN: %u, track_end LSN: %u\n", p_vcdplayer->i_lsn, p_vcdplayer->track_end_lsn); } } @@ -909,7 +909,7 @@ vcdplayer_read (vcdplayer_t *p_vcdplayer, uint8_t *p_buf, */ { - CdIo *p_img = vcdinfo_get_cd_image(p_vcdplayer->vcd); + CdIo_t *p_img = vcdinfo_get_cd_image(p_vcdplayer->vcd); typedef struct { uint8_t subheader [CDIO_CD_SUBHEADER_SIZE]; uint8_t data [M2F2_SECTOR_SIZE]; diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index fe9b3899c..1fbda9508 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,5 @@ /* - $Id: xineplug_inp_vcd.c,v 1.36 2005/04/17 14:55:35 rockyb Exp $ + $Id: xineplug_inp_vcd.c,v 1.37 2005/04/27 23:28:42 rockyb Exp $ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> @@ -78,7 +78,6 @@ #include "vcdplayer.h" #include "vcdio.h" - /* A xine define. */ #ifndef BUF_DEMUX_BLOCK #define BUF_DEMUX_BLOCK 0x05000000 @@ -909,7 +908,7 @@ static int vcd_class_eject_media (input_class_t *this_gen) { int ret; - CdIo *cdio=vcdinfo_get_cd_image(my_vcd.player.vcd); + CdIo_t *cdio=vcdinfo_get_cd_image(my_vcd.player.vcd); dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); if (NULL == cdio) return 0; @@ -1685,7 +1684,7 @@ vcd_init (xine_t *xine, void *data) enumeration vcdplayer_autoplay_t in vcdplayer.h. */ static const char *autoplay_modes[] = - { "track", "entry", "segment", "playlist", NULL }; + { "MPEG track", "entry", "segment", "playback-control item", NULL }; /*Note: these labels have to be listed in the same order as the enumeration vcdplayer_slider_length_t in vcdplayer.h. |