summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/audio_decoder.c4
-rw-r--r--src/xine-engine/input_cache.c8
-rw-r--r--src/xine-engine/input_rip.c50
-rw-r--r--src/xine-engine/metronom.c6
-rw-r--r--src/xine-engine/osd.c4
-rw-r--r--src/xine-engine/video_decoder.c4
6 files changed, 38 insertions, 38 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index d504d9511..549c19b02 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.138 2006/09/08 21:11:29 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.139 2007/02/20 00:34:57 dgp85 Exp $
*
*
* functions that implement audio decoding
@@ -67,7 +67,7 @@ static void *audio_decoder_loop (void *stream_gen) {
if( !replaying_headers )
buf = stream->audio_fifo->get (stream->audio_fifo);
- lprintf ("audio_loop: got package pts = %lld, type = %08x\n", buf->pts, buf->type);
+ lprintf ("audio_loop: got package pts = %"PRId64", type = %08x\n", buf->pts, buf->type);
_x_extra_info_merge( stream->audio_decoder_extra_info, buf->extra_info );
stream->audio_decoder_extra_info->seek_count = stream->video_seek_count;
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index be5b005ec..a566e1f84 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -22,7 +22,7 @@
* The goal of this input plugin is to reduce
* the number of calls to the real input plugin.
*
- * $Id: input_cache.c,v 1.13 2007/01/19 01:05:25 dgp85 Exp $
+ * $Id: input_cache.c,v 1.14 2007/02/20 00:34:57 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -67,7 +67,7 @@ static off_t cache_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
off_t read_len = 0;
off_t main_read;
- lprintf("cache_plugin_read: len=%lld\n", len);
+ lprintf("cache_plugin_read: len=%"PRId64"\n", len);
this->read_call++;
/* optimized for common cases */
@@ -205,7 +205,7 @@ static off_t cache_plugin_seek(input_plugin_t *this_gen, off_t offset, int origi
off_t rel_offset;
off_t new_buf_pos;
- lprintf("offset: %lld, origin: %d\n", offset, origin);
+ lprintf("offset: %"PRId64", origin: %d\n", offset, origin);
this->seek_call++;
if( !this->buf_len ) {
@@ -236,7 +236,7 @@ static off_t cache_plugin_seek(input_plugin_t *this_gen, off_t offset, int origi
}
new_buf_pos = (off_t)this->buf_pos + rel_offset;
- lprintf("buf_len: %d, rel_offset=%lld, new_buf_pos=%lld\n",
+ lprintf("buf_len: %d, rel_offset=%"PRId64", new_buf_pos=%"PRId64"\n",
this->buf_len, rel_offset, new_buf_pos);
if ((new_buf_pos < 0) || (new_buf_pos >= this->buf_len)) {
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index d7a0c46ca..d8715fb85 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.33 2007/01/19 01:05:25 dgp85 Exp $
+ * $Id: input_rip.c,v 1.34 2007/02/20 00:34:57 dgp85 Exp $
*/
/* TODO:
@@ -103,7 +103,7 @@ static off_t rip_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
rip_input_plugin_t *this = (rip_input_plugin_t *)this_gen;
off_t retlen, npreview, nread, nwrite, nread_orig, nread_file;
- lprintf("reading %lld bytes (curpos = %lld, savepos = %lld)\n", len, this->curpos, this->savepos);
+ lprintf("reading %"PRId64" bytes (curpos = %"PRId64", savepos = %"PRId64")\n", len, this->curpos, this->savepos);
if (len < 0) return -1;
@@ -117,7 +117,7 @@ static off_t rip_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
nread = min_off(this->savepos - this->preview_size, len - npreview);
}
- lprintf(" => get %lld bytes from preview (%lld bytes)\n", npreview, this->preview_size);
+ lprintf(" => get %"PRId64" bytes from preview (%"PRId64" bytes)\n", npreview, this->preview_size);
memcpy(buf, &this->preview[this->curpos], npreview);
} else {
@@ -134,7 +134,7 @@ static off_t rip_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
/* re-reading from file */
if (nread_file) {
- lprintf(" => read %lld bytes from file\n", nread_file);
+ lprintf(" => read %"PRId64" bytes from file\n", nread_file);
if (fread(&buf[npreview], nread_file, 1, this->file) != 1) {
xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: reading of saved data failed: %s\n"), strerror(errno));
return -1;
@@ -143,11 +143,11 @@ static off_t rip_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
/* really to read/catch */
if (nread_orig + nwrite) {
- lprintf(" => read %lld bytes from input plugin\n", nread_orig + nwrite);
+ lprintf(" => read %"PRId64" bytes from input plugin\n", nread_orig + nwrite);
/* read from main input plugin */
retlen = this->main_input_plugin->read(this->main_input_plugin, &buf[npreview + nread_file], nread_orig + nwrite);
- lprintf("%s => returned %lld" CLR_RST "\n", retlen == nread_orig + nwrite ? "" : CLR_FAIL, retlen);
+ lprintf("%s => returned %"PRId64"" CLR_RST "\n", retlen == nread_orig + nwrite ? "" : CLR_FAIL, retlen);
if (retlen < 0) {
xine_log(this->stream->xine, XINE_LOG_MSG,
@@ -163,7 +163,7 @@ static off_t rip_plugin_read(input_plugin_t *this_gen, char *buf, off_t len) {
return -1;
}
this->savepos += nwrite;
- lprintf(" => saved %lld bytes\n", nwrite);
+ lprintf(" => saved %"PRId64" bytes\n", nwrite);
} else
nwrite = 0;
}
@@ -212,7 +212,7 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
buf_element_t *buf = NULL;
off_t retlen, npreview, nread, nwrite, nread_orig, nread_file;
- lprintf("reading %lld bytes (curpos = %lld, savepos = %lld) (block)\n", todo, this->curpos, this->savepos);
+ lprintf("reading %"PRId64" bytes (curpos = %"PRId64", savepos = %"PRId64") (block)\n", todo, this->curpos, this->savepos);
if (todo <= 0) return NULL;
@@ -226,7 +226,7 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
nread = min_off(this->savepos - this->preview_size, todo - npreview);
}
- lprintf(" => get %lld bytes from preview (%lld bytes) (block)\n", npreview, this->preview_size);
+ lprintf(" => get %"PRId64" bytes from preview (%"PRId64" bytes) (block)\n", npreview, this->preview_size);
} else {
npreview = 0;
nread = min_off(this->savepos - this->curpos, todo);
@@ -247,13 +247,13 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
/* get data from preview */
if (npreview) {
- lprintf(" => get %lld bytes from the preview (block)\n", npreview);
+ lprintf(" => get %"PRId64" bytes from the preview (block)\n", npreview);
memcpy(buf->content, &this->preview[this->curpos], npreview);
}
/* re-reading from the file */
if (nread_file) {
- lprintf(" => read %lld bytes from the file (block)\n", nread_file);
+ lprintf(" => read %"PRId64" bytes from the file (block)\n", nread_file);
if (fread(&buf->content[npreview], nread_file, 1, this->file) != 1) {
xine_log(this->stream->xine, XINE_LOG_MSG,
_("input_rip: reading of saved data failed: %s\n"),
@@ -267,10 +267,10 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
if (nread_orig + nwrite) {
/* read from main input plugin */
if (buf) {
- lprintf(" => read %lld bytes from input plugin (block)\n", nread_orig + nwrite);
+ lprintf(" => read %"PRId64" bytes from input plugin (block)\n", nread_orig + nwrite);
retlen = this->main_input_plugin->read(this->main_input_plugin, &buf->content[npreview + nread_file], nread_orig + nwrite);
} else {
- lprintf(" => read block of %lld bytes from input plugin (block)\n", nread_orig + nwrite);
+ lprintf(" => read block of %"PRId64" bytes from input plugin (block)\n", nread_orig + nwrite);
buf = this->main_input_plugin->read_block(this->main_input_plugin, fifo, nread_orig + nwrite);
if (buf) retlen = buf->size;
else {
@@ -279,7 +279,7 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
}
}
if (retlen != nread_orig + nwrite) {
- lprintf(CLR_FAIL " => returned %lld" CLR_RST "\n", retlen);
+ lprintf(CLR_FAIL " => returned %"PRId64"" CLR_RST "\n", retlen);
return NULL;
}
@@ -293,7 +293,7 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
return NULL;
}
this->savepos += nwrite;
- lprintf(" => saved %lld bytes\n", nwrite);
+ lprintf(" => saved %"PRId64" bytes\n", nwrite);
} else
nwrite = 0;
}
@@ -307,7 +307,7 @@ static buf_element_t *rip_plugin_read_block(input_plugin_t *this_gen, fifo_buffe
static off_t rip_seek_original(rip_input_plugin_t *this, off_t reqpos) {
off_t pos;
- lprintf(" => seeking original input plugin to %lld\n", reqpos);
+ lprintf(" => seeking original input plugin to %"PRId64"\n", reqpos);
pos = this->main_input_plugin->seek(this->main_input_plugin, reqpos, SEEK_SET);
if (pos == -1) {
@@ -316,7 +316,7 @@ static off_t rip_seek_original(rip_input_plugin_t *this, off_t reqpos) {
}
#ifdef LOG
if (pos != reqpos) {
- lprintf(CLR_FAIL " => reqested position %lld differs from result position %lld" CLR_RST "\n", reqpos, pos);
+ lprintf(CLR_FAIL " => reqested position %"PRId64" differs from result position %"PRId64"" CLR_RST "\n", reqpos, pos);
}
#endif
@@ -339,7 +339,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
struct timeval time1, time2;
double interval = 0;
- lprintf("seek, offset %lld, origin %d (curpos %lld, savepos %lld)\n", offset, origin, this->curpos, this->savepos);
+ lprintf("seek, offset %"PRId64", origin %d (curpos %"PRId64", savepos %"PRId64")\n", offset, origin, this->curpos, this->savepos);
switch (origin) {
case SEEK_SET: newpos = offset; break;
@@ -355,7 +355,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
blocksize = 0;
if (newpos < this->savepos) {
- lprintf(" => virtual seeking from %lld to %lld\n", this->curpos, newpos);
+ lprintf(" => virtual seeking from %"PRId64" to %"PRId64"\n", this->curpos, newpos);
/* don't seek into preview area */
if (this->preview && newpos < this->preview_size) {
@@ -366,7 +366,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
if (this->regular) {
if (reqpos != this->savepos) {
- lprintf(" => seeking file to %lld\n", reqpos);
+ lprintf(" => seeking file to %"PRId64"\n", reqpos);
if (fseeko(this->file, reqpos, SEEK_SET) != 0) {
xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: seeking failed: %s\n"), strerror(errno));
return -1;
@@ -382,9 +382,9 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
}
if (this->curpos < this->savepos) {
- lprintf(" => seeking to end: %lld\n", this->savepos);
+ lprintf(" => seeking to end: %"PRId64"\n", this->savepos);
if (this->regular) {
- lprintf(" => seeking file to end: %lld\n", this->savepos);
+ lprintf(" => seeking file to end: %"PRId64"\n", this->savepos);
if (fseeko(this->file, this->savepos, SEEK_SET) != 0) {
xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: seeking failed: %s\n"), strerror(errno));
return -1;
@@ -425,7 +425,7 @@ static off_t rip_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
+ (double)(time2.tv_usec - time1.tv_usec) / 1000000;
}
- lprintf(" => new position %lld\n", this->curpos);
+ lprintf(" => new position %"PRId64"\n", this->curpos);
return this->curpos;
}
@@ -449,7 +449,7 @@ static off_t rip_plugin_get_current_pos(input_plugin_t *this_gen) {
pos = this->main_input_plugin->get_current_pos(this->main_input_plugin);
if (pos != this->curpos) {
- lprintf(CLR_FAIL "position: computed = %lld, input plugin = %lld" CLR_RST "\n", this->curpos, pos);
+ lprintf(CLR_FAIL "position: computed = %"PRId64", input plugin = %"PRId64"" CLR_RST "\n", this->curpos, pos);
}
#endif
@@ -660,7 +660,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *f
free(this);
return NULL;
}
- lprintf(" => saved %lld bytes (preview)\n", this->preview_size);
+ lprintf(" => saved %"PRId64" bytes (preview)\n", this->preview_size);
this->savepos = this->preview_size;
}
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index 809204af9..fa33da9e1 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.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: metronom.c,v 1.143 2006/01/27 22:35:07 dsalt Exp $
+ * $Id: metronom.c,v 1.144 2007/02/20 00:34:57 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -524,7 +524,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) {
img->vpts = this->video_vpts + this->av_offset;
if (this->video_mode == VIDEO_PREDICTION_MODE) {
- lprintf("video vpts for %10lld : %10lld (duration:%d drift:%" PRId64 " step:%" PRId64 ")\n",
+ lprintf("video vpts for %10"PRId64" : %10"PRId64" (duration:%d drift:%" PRId64 " step:%" PRId64 ")\n",
pts, this->video_vpts, img->duration, this->video_drift, this->video_drift_step );
if (this->video_drift * this->video_drift_step > 0) {
@@ -681,7 +681,7 @@ static int64_t metronom_got_audio_samples (metronom_t *this, int64_t pts,
this->audio_samples += nsamples;
this->vpts_offset += nsamples * this->audio_drift_step / AUDIO_SAMPLE_NUM;
- lprintf("audio vpts for %10lld : %10lld\n", pts, vpts);
+ lprintf("audio vpts for %10"PRId64" : %10"PRId64"\n", pts, vpts);
pthread_mutex_unlock (&this->lock);
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 210bcf26e..229a9ad37 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -200,7 +200,7 @@ static int _osd_show (osd_object_t *osd, int64_t vpts, int unscaled ) {
int x, y, required;
uint8_t *c;
- lprintf("osd=%p vpts=%lld\n", osd, vpts);
+ lprintf("osd=%p vpts=%"PRId64"\n", osd, vpts);
this->stream->xine->port_ticket->acquire(this->stream->xine->port_ticket, 1);
@@ -347,7 +347,7 @@ static int _osd_hide (osd_object_t *osd, int64_t vpts) {
osd_renderer_t *this = osd->renderer;
video_overlay_manager_t *ovl_manager;
- lprintf("osd=%p vpts=%lld\n",osd, vpts);
+ lprintf("osd=%p vpts=%"PRId64"\n",osd, vpts);
if( osd->handle < 0 )
return 0;
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 8f6b82faa..fee75ec76 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.162 2006/12/03 19:23:16 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.163 2007/02/20 00:34:58 dgp85 Exp $
*
*/
@@ -308,7 +308,7 @@ static void *video_decoder_loop (void *stream_gen) {
break;
case BUF_CONTROL_NEWPTS:
- lprintf ("new pts %lld\n", buf->disc_off);
+ lprintf ("new pts %"PRId64"\n", buf->disc_off);
if (stream->video_decoder_plugin) {
running_ticket->acquire(running_ticket, 0);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 08:20:01 +0000