diff options
| author | Matthias Drochner <m.drochner@fz-juelich.de> | 2010-07-21 15:46:13 +0000 |
|---|---|---|
| committer | Matthias Drochner <m.drochner@fz-juelich.de> | 2010-07-21 15:46:13 +0000 |
| commit | 99995e9829efc897518c2cf3265dbcac7149c90d (patch) | |
| tree | cb21080962bcd34edde232900d9a27f3b9fc5aa5 | |
| parent | 1c9cf7069230ea1016879161d5530fbbd5721d43 (diff) | |
| download | xine-lib-99995e9829efc897518c2cf3265dbcac7149c90d.tar.gz xine-lib-99995e9829efc897518c2cf3265dbcac7149c90d.tar.bz2 | |
Add NetBSD support to the VCD input plugin
--HG--
extra : rebase_source : cfee1d5353fa3cacf4df8712fde15cd94e2ee3d4
| -rw-r--r-- | src/input/input_vcd.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 43980bd52..3e65f7203 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -29,6 +29,7 @@ #include <errno.h> #include <fcntl.h> #include <sys/ioctl.h> +#include <sys/param.h> #include <string.h> #include <netinet/in.h> #ifdef HAVE_LINUX_CDROM_H @@ -92,7 +93,7 @@ typedef struct { #if defined (__linux__) || defined(__sun) struct cdrom_tochdr tochdr; struct cdrom_tocentry tocent[100]; -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) struct ioc_toc_header tochdr; struct cd_toc_entry *tocent; off_t cur_sec; @@ -117,7 +118,7 @@ typedef struct { int cur_track; -#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306) uint8_t cur_min, cur_sec, cur_frame; #endif @@ -177,7 +178,7 @@ static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { return 0; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { struct ioc_read_toc_entry te; @@ -393,7 +394,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen, memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ return VCDSECTORSIZE; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_read (input_plugin_t *this_gen, char *buf, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; @@ -531,7 +532,7 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ return buf; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t nlen) { @@ -690,7 +691,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen, return offset ; /* FIXME */ } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { @@ -764,7 +765,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { return (off_t) 0; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; off_t len ; @@ -859,7 +860,7 @@ static int vcd_plugin_open (input_plugin_t *this_gen) { this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame; -#elif defined (__OpenBSD__) +#elif defined (__OpenBSD__) || defined(__NetBSD__) this->cur_min = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.frame; |