diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/demuxers/demux_avi.c | 12 | ||||
-rw-r--r-- | src/demuxers/demux_film.c | 4 | ||||
-rw-r--r-- | src/demuxers/demux_flv.c | 4 | ||||
-rw-r--r-- | src/demuxers/demux_matroska.c | 16 | ||||
-rw-r--r-- | src/demuxers/ebml.c | 14 | ||||
-rw-r--r-- | src/input/input_http.c | 6 | ||||
-rw-r--r-- | src/input/input_net.c | 6 | ||||
-rw-r--r-- | src/input/input_pnm.c | 2 | ||||
-rw-r--r-- | src/input/input_stdin_fifo.c | 4 | ||||
-rw-r--r-- | src/libmusepack/Makefile.am | 2 | ||||
-rw-r--r-- | src/libmusepack/diff_against_svn.patch | 19 | ||||
-rw-r--r-- | src/libmusepack/musepack/config_types.h | 2 | ||||
-rw-r--r-- | src/xine-engine/input_rip.c | 10 |
13 files changed, 61 insertions, 40 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index d61b75e3f..0c3c06ecf 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.216 2005/01/09 20:52:19 tmattern Exp $ + * $Id: demux_avi.c,v 1.217 2005/02/03 07:19:05 valtri Exp $ * * demultiplexer for avi streams * @@ -639,7 +639,7 @@ static int idx_grow(demux_avi_t *this, int (*stopper)(demux_avi_t *, void *), } } if (!valid_chunk) { - xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIiMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)chunk_pos); + xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIdMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)chunk_pos); } chunk_pos = this->input->seek(this->input, this->idx_grow.nexttagoffset, SEEK_SET); if (chunk_pos != this->idx_grow.nexttagoffset) { @@ -783,7 +783,7 @@ static avi_t *AVI_init(demux_avi_t *this) { this->idx_grow.nexttagoffset = this->input->get_current_pos(this->input); if (this->input->read(this->input, data,8) != 8 ) { - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %" PRIiMAX "\n", (intmax_t)this->idx_grow.nexttagoffset); + xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %" PRIdMAX "\n", (intmax_t)this->idx_grow.nexttagoffset); break; /* We assume it's EOF */ } @@ -847,7 +847,7 @@ static avi_t *AVI_init(demux_avi_t *this) { } } if (next_chunk != this->input->seek(this->input, next_chunk, SEEK_SET)) { - xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: failed to seek to the next chunk (pos %" PRIiMAX ")\n"), (intmax_t)next_chunk); + xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: failed to seek to the next chunk (pos %" PRIdMAX ")\n"), (intmax_t)next_chunk); break; /* probably slow seek */ } } @@ -1692,7 +1692,7 @@ static int get_chunk_header(demux_avi_t *this, uint32_t *len, int *audio_stream) return AVI_HEADER_AUDIO; } } - xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIiMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)this->input->get_current_pos(this->input)); + xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIdMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)this->input->get_current_pos(this->input)); return AVI_HEADER_UNKNOWN; } /* unreachable code */ @@ -2084,7 +2084,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) { */ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "start pos is %" PRIiMAX ", start time is %d\n", (intmax_t)start_pos, + "start pos is %" PRIdMAX ", start time is %d\n", (intmax_t)start_pos, start_time); /* Seek video. We do a single idx_grow at the beginning rather than diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index d7a1b8205..428604c71 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.77 2004/09/17 19:21:34 valtri Exp $ + * $Id: demux_film.c,v 1.78 2005/02/03 07:19:05 valtri Exp $ */ #ifdef HAVE_CONFIG_H @@ -311,7 +311,7 @@ static int open_film_file(demux_film_t *film) { if (film->sample_table[j].pts > largest_pts) largest_pts = film->sample_table[j].pts; - llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIXMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n", + llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIxMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n", j, (intmax_t)film->sample_table[j].sample_offset, film->sample_table[j].sample_size, diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 3f09d2b73..09a621212 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -24,7 +24,7 @@ * For more information on the FLV file format, visit: * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf * - * $Id: demux_flv.c,v 1.4 2004/09/17 19:21:34 valtri Exp $ + * $Id: demux_flv.c,v 1.5 2005/02/03 07:19:05 valtri Exp $ */ #ifdef HAVE_CONFIG_H @@ -99,7 +99,7 @@ static int open_flv_file(demux_flv_t *this) { first_offset = BE_32(buffer); this->input->seek(this->input, first_offset, SEEK_SET); - lprintf(" qualified FLV file, repositioned @ offset 0x%" PRIXMAX "\n", + lprintf(" qualified FLV file, repositioned @ offset 0x%" PRIxMAX "\n", (intmax_t)first_offset); return 1; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 3da2eac17..5e567b194 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_matroska.c,v 1.32 2004/12/13 16:07:43 miguelfreitas Exp $ + * $Id: demux_matroska.c,v 1.33 2005/02/03 07:19:05 valtri Exp $ * * demultiplexer for matroska streams * @@ -1453,7 +1453,7 @@ static int parse_ebml_uint(demux_matroska_t *this, uint8_t *data, uint64_t *num) if (size > 8) { off_t pos = this->input->get_current_pos(this->input); xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "demux_matroska: Invalid Track Number at position %" PRIiMAX "\n", + "demux_matroska: Invalid Track Number at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } @@ -1507,7 +1507,7 @@ static int read_block_data (demux_matroska_t *this, int len) { if (this->input->read(this->input, this->block_data, len) != len) { off_t pos = this->input->get_current_pos(this->input); xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "demux_matroska: read error at position %" PRIiMAX "\n", + "demux_matroska: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } @@ -1877,7 +1877,7 @@ static int parse_seek_entry(demux_matroska_t *this) { this->ebml->level = 1; if (this->input->seek(this->input, seek_pos, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)seek_pos); return 0; } @@ -1888,13 +1888,13 @@ static int parse_seek_entry(demux_matroska_t *this) { memcpy(this->ebml, &ebml_bak, sizeof(ebml_parser_t)); /* FIXME */ if (this->input->seek(this->input, current_pos, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)current_pos); return 0; } } else { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: out of stream seek pos: %" PRIiMAX "\n", + "demux_matroska: out of stream seek pos: %" PRIdMAX "\n", (intmax_t)seek_pos); } return 1; @@ -2182,7 +2182,7 @@ static void demux_matroska_send_headers (demux_plugin_t *this_gen) { next_level = 1; if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)this->segment.start); this->status = DEMUX_FINISHED; return; @@ -2202,7 +2202,7 @@ static void demux_matroska_send_headers (demux_plugin_t *this_gen) { next_level = 1; if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)this->segment.start); this->status = DEMUX_FINISHED; } diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 1fda69b38..933185400 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -20,7 +20,7 @@ * EBML parser * a lot of ideas from the gstreamer parser * - * $Id: ebml.c,v 1.2 2004/09/17 19:21:45 valtri Exp $ + * $Id: ebml.c,v 1.3 2005/02/03 07:19:06 valtri Exp $ * */ #ifdef HAVE_CONFIG_H @@ -107,7 +107,7 @@ static int ebml_read_elem_id(ebml_parser_t *ebml, uint32_t *id) { if (size > 4) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: invalid EBML ID size (0x%x) at position %" PRIiMAX "\n", + "ebml: invalid EBML ID size (0x%x) at position %" PRIdMAX "\n", data[0], (intmax_t)pos); return 0; } @@ -116,7 +116,7 @@ static int ebml_read_elem_id(ebml_parser_t *ebml, uint32_t *id) { if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } for(i = 1; i < size; i++) { @@ -139,7 +139,7 @@ static int ebml_read_elem_len(ebml_parser_t *ebml, uint64_t *len) { if (ebml->input->read(ebml->input, data, 1) != 1) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } value = data[0]; @@ -152,7 +152,7 @@ static int ebml_read_elem_len(ebml_parser_t *ebml, uint64_t *len) { if (size > 8) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: Invalid EBML length size (0x%x) at position %" PRIiMAX "\n", + "ebml: Invalid EBML length size (0x%x) at position %" PRIdMAX "\n", data[0], (intmax_t)pos); return 0; } @@ -170,7 +170,7 @@ static int ebml_read_elem_len(ebml_parser_t *ebml, uint64_t *len) { if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } for (i = 1; i < size; i++) { @@ -193,7 +193,7 @@ static int ebml_read_elem_data(ebml_parser_t *ebml, int8_t *buf, int64_t len) { if (ebml->input->read(ebml->input, buf, len) != len) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } diff --git a/src/input/input_http.c b/src/input/input_http.c index 77967a774..e82c01d49 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.106 2005/01/17 19:27:51 tmattern Exp $ + * $Id: input_http.c,v 1.107 2005/02/03 07:19:06 valtri Exp $ */ #ifdef HAVE_CONFIG_H @@ -544,7 +544,7 @@ static off_t http_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin this->curpos = offset; else xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "http: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n", + "http: cannot seek back! (%" PRIdMAX " > %" PRIdMAX ")\n", (intmax_t)this->curpos, (intmax_t)offset); } else { @@ -829,7 +829,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { if (sscanf(this->buf, "Content-Length: %" SCNdMAX , &contentlength) == 1) { xine_log (this->stream->xine, XINE_LOG_MSG, - _("input_http: content length = %" PRIiMAX " bytes\n"), + _("input_http: content length = %" PRIdMAX " bytes\n"), contentlength); this->contentlength = (off_t)contentlength; } diff --git a/src/input/input_net.c b/src/input/input_net.c index 947a71177..d1d500e11 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -20,7 +20,7 @@ * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the * other end and you can watch tv anywhere in the house ..) * - * $Id: input_net.c,v 1.61 2005/01/05 21:48:05 dsalt Exp $ + * $Id: input_net.c,v 1.62 2005/02/03 07:19:06 valtri Exp $ * * how to set up mp1e for use with this plugin: * @@ -271,7 +271,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen, if( (len-total) > 0 ) { n = _x_read_abort (this->stream, this->fh, &buf[total], len-total); - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIiMAX " bytes (%" PRIiMAX "/%" PRIiMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len); + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len); if (n < 0) { _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL); @@ -348,7 +348,7 @@ static off_t net_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin this->curpos = offset; else xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "input_net: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n", + "input_net: cannot seek back! (%" PRIdMAX " > %" PRIdMAX ")\n", (intmax_t)this->curpos, (intmax_t)offset); } else { diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index 52c8ea997..8e411240d 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -121,7 +121,7 @@ static off_t pnm_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen; xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "input_pnm: seek %" PRIiMAX " bytes, origin %d\n", (intmax_t)offset, + "input_pnm: seek %" PRIdMAX " bytes, origin %d\n", (intmax_t)offset, origin); /* only realtive forward-seeking is implemented */ diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 5c427d9f4..f98ea89bd 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_stdin_fifo.c,v 1.60 2004/09/17 19:21:46 valtri Exp $ + * $Id: input_stdin_fifo.c,v 1.61 2005/02/03 07:19:06 valtri Exp $ */ #ifdef HAVE_CONFIG_H @@ -158,7 +158,7 @@ static off_t stdin_plugin_seek (input_plugin_t *this_gen, off_t offset, int orig this->curpos = offset; else xprintf (this->xine, XINE_VERBOSITY_LOG, - _("stdin: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n"), + _("stdin: cannot seek back! (%" PRIdMAX " > %" PRIdMAX ")\n"), (intmax_t)this->curpos, (intmax_t)offset); } else { diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am index ab0a76366..dfbb33a43 100644 --- a/src/libmusepack/Makefile.am +++ b/src/libmusepack/Makefile.am @@ -2,6 +2,8 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = musepack +EXTRA_DIST = diff_against_svn.patch + libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mpc.la diff --git a/src/libmusepack/diff_against_svn.patch b/src/libmusepack/diff_against_svn.patch new file mode 100644 index 000000000..0375b89c1 --- /dev/null +++ b/src/libmusepack/diff_against_svn.patch @@ -0,0 +1,19 @@ +Use xine's inttypes. +The file config_types.h is generated from config_types.h.in in musepack SVN. + +Index: src/libmusepack/musepack/config_types.h +=================================================================== +RCS file: /home/valtri/CVS/xine-lib/src/libmusepack/musepack/config_types.h,v +retrieving revision 1.1.1.2 +diff -u -p -u -p -r1.1.1.2 config_types.h +--- src/libmusepack/musepack/config_types.h 3 Feb 2005 00:19:24 -0000 1.1.1.2 ++++ src/libmusepack/musepack/config_types.h 3 Feb 2005 00:21:06 -0000 +@@ -1,7 +1,7 @@ + #ifndef __CONFIG_TYPES_H__ + #define __CONFIG_TYPES_H__ + +-#include <stdint.h> ++#include "os_types.h" + + #ifdef WORDS_BIGENDIAN + #undef MPC_LITTLE_ENDIAN diff --git a/src/libmusepack/musepack/config_types.h b/src/libmusepack/musepack/config_types.h index 164e73ebc..f501f5a38 100644 --- a/src/libmusepack/musepack/config_types.h +++ b/src/libmusepack/musepack/config_types.h @@ -1,7 +1,7 @@ #ifndef __CONFIG_TYPES_H__ #define __CONFIG_TYPES_H__ -#include <stdint.h> +#include "os_types.h" #ifdef WORDS_BIGENDIAN #undef MPC_LITTLE_ENDIAN diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index c177def3d..510861d7b 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -29,7 +29,7 @@ * - it's possible speeder saving streams in the xine without playing: * xine stream_mrl#save:file.raw\;noaudio\;novideo * - * $Id: input_rip.c,v 1.27 2004/12/12 22:01:31 mroi Exp $ + * $Id: input_rip.c,v 1.28 2005/02/03 07:19:07 valtri Exp $ */ /* TODO: @@ -157,7 +157,7 @@ static off_t rip_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) { if (retlen > nread_orig) { nwrite = retlen - nread_orig; if (fwrite(buf + this->savepos - this->curpos, nwrite, 1, this->file) != 1) { - xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: error writing to file %" PRIiMAX " bytes: %s\n"), (intmax_t)(retlen - nread_orig), strerror(errno)); + xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: error writing to file %" PRIdMAX " bytes: %s\n"), (intmax_t)(retlen - nread_orig), strerror(errno)); return -1; } this->savepos += nwrite; @@ -286,7 +286,7 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe nwrite = retlen - nread_orig; if (fwrite(buf->content + this->savepos - this->curpos, nwrite, 1, this->file) != 1) { xine_log(this->stream->xine, XINE_LOG_MSG, - _("input_rip: error writing to file %" PRIiMAX " bytes: %s\n"), + _("input_rip: error writing to file %" PRIdMAX " bytes: %s\n"), (intmax_t)(retlen - nread_orig), strerror(errno)); return NULL; } @@ -392,7 +392,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin) if ((pos = rip_seek_original(this, this->savepos)) == -1) return -1; if (pos > this->savepos) xine_log(this->stream->xine, XINE_LOG_MSG, - _("input_rip: %" PRIiMAX " bytes dropped\n"), + _("input_rip: %" PRIdMAX " bytes dropped\n"), (intmax_t)(pos - this->savepos)); } } @@ -638,7 +638,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *f if (this->preview && this->preview_size) { if (fwrite(this->preview, this->preview_size, 1, this->file) != 1) { xine_log(this->stream->xine, XINE_LOG_MSG, - _("input_rip: error writing to file %" PRIiMAX " bytes: %s\n"), + _("input_rip: error writing to file %" PRIdMAX " bytes: %s\n"), (intmax_t)(this->preview_size), strerror(errno)); fclose(this->file); free(this); |