diff options
Diffstat (limited to 'src/input')
27 files changed, 47 insertions, 41 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index fd2c5f570..efc3a88d8 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -27,7 +27,7 @@ * Date Author * ---- ------ * - * 01-Feb-2005 Pekka Jääskeläinen <poj@iki.fi> + * 01-Feb-2005 Pekka Jääskeläinen <poj@iki.fi> * * - This history log started. * - Disabled the automatic EPG updater thread until EPG demuxer @@ -111,6 +111,7 @@ #define LOG_VERBOSE /* #define LOG +#define LOG_READS */ #include "xine_internal.h" @@ -589,7 +590,8 @@ static tuner_t *tuner_init(xine_t * xine, int adapter) this = (tuner_t *) xine_xmalloc(sizeof(tuner_t)); _x_assert(this != NULL); - + + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "tuner_init adapter=%d\n", adapter); this->fd_frontend = -1; for (x = 0; x < MAX_FILTERS; x++) this->fd_pidfilter[x] = 0; @@ -634,7 +636,7 @@ static tuner_t *tuner_init(xine_t * xine, int adapter) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set EIT to nonblock: %s\n",strerror(errno)); /* and the internal filter used for PAT & PMT */ if(fcntl(this->fd_pidfilter[INTERNAL_FILTER], F_SETFL, O_NONBLOCK)<0) - xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set EIT to nonblock: %s\n",strerror(errno)); + xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set INTERNAL to nonblock: %s\n",strerror(errno)); /* and the frontend */ fcntl(this->fd_frontend, F_SETFL, O_NONBLOCK); @@ -1010,7 +1012,7 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters while (ioctl(this->fd_frontend, FE_GET_EVENT, &event) != -1); if (ioctl(this->fd_frontend, FE_SET_FRONTEND, front_param) <0) { - xprintf(this->xine, XINE_VERBOSITY_DEBUG, "setfront front: %s\n", strerror(errno)); + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "input_dvb: setfront front: %s\n", strerror(errno)); return 0; } @@ -1036,7 +1038,7 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters do { status = 0; if (ioctl(this->fd_frontend, FE_READ_STATUS, &status) < 0) { - xprintf(this->xine, XINE_VERBOSITY_DEBUG, "fe get event: %s\n", strerror(errno)); + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "input_dvb: fe get event: %s\n", strerror(errno)); return 0; } @@ -2476,8 +2478,10 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen, if (!this->tuned_in) return 0; dvb_event_handler (this); +#ifdef LOG_READS xprintf(this->class->xine,XINE_VERBOSITY_DEBUG, "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len); +#endif #ifndef DVB_NO_BUFFERING nbc_check_buffers (this->nbc); @@ -2529,9 +2533,11 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen, break; } +#ifdef LOG_READS xprintf(this->class->xine,XINE_VERBOSITY_DEBUG, "input_dvb: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len); +#endif if (n > 0){ this->curpos += n; @@ -2905,13 +2911,13 @@ static int dvb_plugin_open(input_plugin_t * this_gen) { fprintf(stderr,"input_dvb: 2a %x\n",tuner->feinfo.type); /* - * This is dvbc://<channel name>:<qam tuning parameters> + * This is dvba://<channel name>:<atsc tuning parameters> */ if (tuner->feinfo.type != FE_ATSC) { fprintf(stderr,"input_dvb: FAILED 1\n"); xprintf(this->class->xine, XINE_VERBOSITY_LOG, - _("input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-C)\n")); + _("input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-A)\n")); tuner_dispose(tuner); return 0; } diff --git a/src/input/input_http.c b/src/input/input_http.c index 6b7ae9158..6e8932700 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -829,7 +829,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { _("input_http: http status not 2xx: >%d %s<\n"), httpcode, httpstatus); return -7; - } else if (httpcode == 403) { + } else if (httpcode == 403 || httpcode == 401) { _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: http status not 2xx: >%d %s<\n"), diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 370dc6a71..11e1303e7 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -115,6 +115,8 @@ struct input_plugin_s { /* * read nlen bytes, return number of bytes read + * Should block until some bytes available for read; + * a return value of 0 indicates no data available */ off_t (*read) (input_plugin_t *this, char *buf, off_t nlen); diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 17c4223a2..6829470ff 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -517,11 +517,9 @@ static int extract_mrl(v4l_input_plugin_t *this, char *mrl) /* Get frequency, if available */ sscanf(locator, "/%d", &frequency); - lprintf("Tuner name: '%s' freq: %d\n", tuner_name, frequency); - } else { - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "input_v4l: No tuner name given. Expected syntax: v4l:/tuner/frequency\n" - "input_v4l: Using currently tuned settings\n"); + + /* cannot use xprintf to log in this routine */ + lprintf("input_v4l: Tuner name: %s frequency %d\n", tuner_name, frequency ); } this->frequency = frequency; diff --git a/src/input/libdvdnav/bswap.h b/src/input/libdvdnav/bswap.h index c1fc7a045..36543fba5 100644 --- a/src/input/libdvdnav/bswap.h +++ b/src/input/libdvdnav/bswap.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2000, 2001 Billy Biggs <vektor@dumbterm.net>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c index 270a565ac..0a2d0c3cb 100644 --- a/src/input/libdvdnav/decoder.c +++ b/src/input/libdvdnav/decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * 2002-2004 the dvdnav project * * This file is part of libdvdnav, a DVD navigation library. It is modified diff --git a/src/input/libdvdnav/decoder.h b/src/input/libdvdnav/decoder.h index 2a9e455c8..13768a70e 100644 --- a/src/input/libdvdnav/decoder.h +++ b/src/input/libdvdnav/decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * * This file is part of libdvdnav, a DVD navigation library. It is modified * from a file originally part of the Ogle DVD player. diff --git a/src/input/libdvdnav/dvd_input.c b/src/input/libdvdnav/dvd_input.c index 6b7bcaeab..7b35f5eef 100644 --- a/src/input/libdvdnav/dvd_input.c +++ b/src/input/libdvdnav/dvd_input.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2002 Samuel Hocevar <sam@zoy.org>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/dvd_input.h b/src/input/libdvdnav/dvd_input.h index c75de9656..dacf886d8 100644 --- a/src/input/libdvdnav/dvd_input.h +++ b/src/input/libdvdnav/dvd_input.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2001, 2002 Samuel Hocevar <sam@zoy.org>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c index 7ecd8f1ba..1cf493ef1 100644 --- a/src/input/libdvdnav/dvd_reader.c +++ b/src/input/libdvdnav/dvd_reader.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2004 Billy Biggs <vektor@dumbterm.net>, - * Håkan Hjort <d95hjort@dtek.chalmers.se>, - * Björn Englund <d4bjorn@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>, + * Björn Englund <d4bjorn@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h index abaa882d0..bb3f5053b 100644 --- a/src/input/libdvdnav/dvd_reader.h +++ b/src/input/libdvdnav/dvd_reader.h @@ -3,8 +3,8 @@ /* * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>, - * Håkan Hjort <d95hjort@dtek.chalmers.se>, - * Björn Englund <d4bjorn@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>, + * Björn Englund <d4bjorn@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/dvd_types.h b/src/input/libdvdnav/dvd_types.h index e942bf79f..17c437712 100644 --- a/src/input/libdvdnav/dvd_types.h +++ b/src/input/libdvdnav/dvd_types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Björn Englund, Håkan Hjort + * Copyright (C) 2000, 2001 Björn Englund, HÃ¥kan Hjort * * This file is part of libdvdnav, a DVD navigation library. It is a modified * file originally part of the Ogle DVD player project. diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c index 88045b8f3..8df1d133d 100644 --- a/src/input/libdvdnav/dvd_udf.c +++ b/src/input/libdvdnav/dvd_udf.c @@ -4,7 +4,7 @@ * * Modifications by: * Billy Biggs <vektor@dumbterm.net>. - * Björn Englund <d4bjorn@dtek.chalmers.se>. + * Björn Englund <d4bjorn@dtek.chalmers.se>. * * dvdudf: parse and read the UDF volume information of a DVD Video * Copyright (C) 1999 Christian Wolff for convergence integrated media diff --git a/src/input/libdvdnav/dvd_udf.h b/src/input/libdvdnav/dvd_udf.h index d7b2ab601..e0725e6f4 100644 --- a/src/input/libdvdnav/dvd_udf.h +++ b/src/input/libdvdnav/dvd_udf.h @@ -7,7 +7,7 @@ * * Modifications by: * Billy Biggs <vektor@dumbterm.net>. - * Björn Englund <d4bjorn@dtek.chalmers.se>. + * Björn Englund <d4bjorn@dtek.chalmers.se>. * * dvdudf: parse and read the UDF volume information of a DVD Video * Copyright (C) 1999 Christian Wolff for convergence integrated media diff --git a/src/input/libdvdnav/ifo_read.c b/src/input/libdvdnav/ifo_read.c index afc86b196..8f47d2a54 100644 --- a/src/input/libdvdnav/ifo_read.c +++ b/src/input/libdvdnav/ifo_read.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2000, 2001, 2002, 2003 - * Björn Englund <d4bjorn@dtek.chalmers.se>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * Björn Englund <d4bjorn@dtek.chalmers.se>, + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/ifo_read.h b/src/input/libdvdnav/ifo_read.h index 3b9b27f20..5a4c513ec 100644 --- a/src/input/libdvdnav/ifo_read.h +++ b/src/input/libdvdnav/ifo_read.h @@ -2,8 +2,8 @@ #define IFO_READ_H_INCLUDED /* - * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>, + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/ifo_types.h b/src/input/libdvdnav/ifo_types.h index e9332ecec..0935f75d0 100644 --- a/src/input/libdvdnav/ifo_types.h +++ b/src/input/libdvdnav/ifo_types.h @@ -2,8 +2,8 @@ #define IFO_TYPES_H_INCLUDED /* - * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>, + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/nav_print.c b/src/input/libdvdnav/nav_print.c index 5052deef9..14e14f373 100644 --- a/src/input/libdvdnav/nav_print.c +++ b/src/input/libdvdnav/nav_print.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort <d95hjort@dtek.chalmers.se> + * Copyright (C) 2000, 2001, 2002, 2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * Much of the contents in this file is based on VOBDUMP. * diff --git a/src/input/libdvdnav/nav_print.h b/src/input/libdvdnav/nav_print.h index 35d4b09f0..056603e8d 100644 --- a/src/input/libdvdnav/nav_print.h +++ b/src/input/libdvdnav/nav_print.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>, - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/nav_read.c b/src/input/libdvdnav/nav_read.c index 421678c78..1c57e2d52 100644 --- a/src/input/libdvdnav/nav_read.c +++ b/src/input/libdvdnav/nav_read.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort <d95hjort@dtek.chalmers.se> + * Copyright (C) 2000, 2001, 2002, 2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * 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 diff --git a/src/input/libdvdnav/nav_read.h b/src/input/libdvdnav/nav_read.h index 2f41c920d..4aa9d3c15 100644 --- a/src/input/libdvdnav/nav_read.h +++ b/src/input/libdvdnav/nav_read.h @@ -2,7 +2,7 @@ #define NAV_READ_H_INCLUDED /* - * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>. + * Copyright (C) 2000, 2001, 2002 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se>. * * 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 diff --git a/src/input/libdvdnav/nav_types.h b/src/input/libdvdnav/nav_types.h index cadcdeb5d..8cf745025 100644 --- a/src/input/libdvdnav/nav_types.h +++ b/src/input/libdvdnav/nav_types.h @@ -2,7 +2,7 @@ #define NAV_TYPES_H_INCLUDED /* - * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se> + * Copyright (C) 2000, 2001, 2002 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * The data structures in this file should represent the layout of the * pci and dsi packets as they are stored in the stream. Information diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c index 68d8062f3..6c01d14e8 100644 --- a/src/input/libdvdnav/vm.c +++ b/src/input/libdvdnav/vm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Håkan Hjort + * Copyright (C) 2000, 2001 HÃ¥kan Hjort * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net> * 2002-2004 the dvdnav project * diff --git a/src/input/libdvdnav/vm.h b/src/input/libdvdnav/vm.h index 07c822d13..214570254 100644 --- a/src/input/libdvdnav/vm.h +++ b/src/input/libdvdnav/vm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Håkan Hjort + * Copyright (C) 2000, 2001 HÃ¥kan Hjort * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net> * * This file is part of libdvdnav, a DVD navigation library. It is modified diff --git a/src/input/libdvdnav/vmcmd.c b/src/input/libdvdnav/vmcmd.c index 30f32576f..3e0a5fb55 100644 --- a/src/input/libdvdnav/vmcmd.c +++ b/src/input/libdvdnav/vmcmd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * 2002-2004 the dvdnav project * * This file is part of libdvdnav, a DVD navigation library. It is modified diff --git a/src/input/libdvdnav/vmcmd.h b/src/input/libdvdnav/vmcmd.h index 13e1261be..d3fd53ec2 100644 --- a/src/input/libdvdnav/vmcmd.h +++ b/src/input/libdvdnav/vmcmd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * * This file is part of libdvdnav, a DVD navigation library. It is modified * from a file originally part of the Ogle DVD player. diff --git a/src/input/vcd/libcdio/cdio/cd_types.h b/src/input/vcd/libcdio/cdio/cd_types.h index b03cc9f72..9f4a73f67 100644 --- a/src/input/vcd/libcdio/cdio/cd_types.h +++ b/src/input/vcd/libcdio/cdio/cd_types.h @@ -3,7 +3,7 @@ Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org> - and Heiko Eißfeldt <heiko@hexco.de> + and Heiko Eißfeldt <heiko@hexco.de> 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 |