summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2010-02-06 01:50:55 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2010-02-06 01:50:55 +0000
commit66f60ab3969928227bd0fa57df451e7bc58f2ff7 (patch)
tree7ca844a04f03d4f73f24202d7d92aa7aca018931 /src/input
parentb261d83b69692cfa13aada3266f3c832861a48a8 (diff)
parentfd6d1cc6ccda5ff8319ae0eb8417c5db5700938a (diff)
downloadxine-lib-66f60ab3969928227bd0fa57df451e7bc58f2ff7.tar.gz
xine-lib-66f60ab3969928227bd0fa57df451e7bc58f2ff7.tar.bz2
Merge from 1.1.
--HG-- rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/input')
-rw-r--r--src/input/libdvdnav/remap.c2
-rw-r--r--src/input/net_buf_ctrl.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/input/libdvdnav/remap.c b/src/input/libdvdnav/remap.c
index df0be29ce..42bb8b3dd 100644
--- a/src/input/libdvdnav/remap.c
+++ b/src/input/libdvdnav/remap.c
@@ -216,7 +216,7 @@ remap_t* remap_loadmap( char *title) {
remap_add_node( map, tmp);
}
}
- close (fp); /* ignoring errors... */
+ fclose (fp); /* ignoring errors... */
if (map->nblocks == 0 && map->debug == 0) return NULL;
return map;
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index e14897699..b7a52eb2b 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -117,9 +117,8 @@ static void display_stats (nbc_t *this) {
static const char buffering[2][4] = {" ", "buf"};
static const char enabled[2][4] = {"off", "on "};
- printf("bufing: %d, enb: %d\n", this->buffering, this->enabled);
printf("net_buf_ctrl: vid %3d%% %4.1fs %4" PRId64 "kbps %1d, "\
- "aud %3d%% %4.1fs %4" PRId64 "kbps %1d, %s %s\r",
+ "aud %3d%% %4.1fs %4" PRId64 "kbps %1d, %s %s%c",
this->video_fifo_fill,
(float)(this->video_fifo_length / 1000),
this->video_br / 1000,
@@ -129,7 +128,8 @@ static void display_stats (nbc_t *this) {
this->audio_br / 1000,
this->audio_in_disc,
buffering[this->buffering],
- enabled[this->enabled]
+ enabled[this->enabled],
+ isatty (stdout) ? '\r' : '\n'
);
fflush(stdout);
}