diff options
author | František Dvořák <valtri@users.sourceforge.net> | 2005-02-03 07:19:03 +0000 |
---|---|---|
committer | František Dvořák <valtri@users.sourceforge.net> | 2005-02-03 07:19:03 +0000 |
commit | 89c1c59fb83bc1d4598543b1bcaee5b69776b421 (patch) | |
tree | 8f8f88de29b540e4f21ed63a243c12288571fbef /src/xine-engine/input_rip.c | |
parent | 00f8f557ae278bb0aa4dee3cb664e154d32a7ba3 (diff) | |
download | xine-lib-89c1c59fb83bc1d4598543b1bcaee5b69776b421.tar.gz xine-lib-89c1c59fb83bc1d4598543b1bcaee5b69776b421.tar.bz2 |
**BUGFIX**
Fixed build on solaris:
- use libresolv in hstrerror check
- replace PRIiMAX and PRIXMAX by PRIdMAX and PRIxMAX
Removed timezone struct for MinGW from public os_types.h, update header comment.
Fixed build musepack library on some platforms using xine types.
Thanks to Niki W. Waibel for reporting and testing.
CVS patchset: 7378
CVS date: 2005/02/03 07:19:03
Diffstat (limited to 'src/xine-engine/input_rip.c')
-rw-r--r-- | src/xine-engine/input_rip.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |