From 820e1f36e84e6135c53efdbadd6b6eff1c920ab1 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 30 Jan 2010 12:27:25 +0000 Subject: Fix dvdnav map file closure. --- src/input/libdvdnav/remap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input') 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; -- cgit v1.2.3 From 3dc6735f00368c1ace2f63cb35c58f98d22586ba Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 3 Feb 2010 14:55:46 +0000 Subject: Remove pointless output from stats logging; make the const variables static. --- src/input/net_buf_ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/input') diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index bd0e5ce13..1d01911fd 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -118,10 +118,9 @@ void nbc_check_buffers (nbc_t *this) { } static void display_stats (nbc_t *this) { - const char buffering[2][4] = {" ", "buf"}; - const char enabled[2][4] = {"off", "on "}; + 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", this->video_fifo_fill, -- cgit v1.2.3 From fd6d1cc6ccda5ff8319ae0eb8417c5db5700938a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 6 Feb 2010 01:29:55 +0000 Subject: libv4l check shouldn't fail & abort unless --enable-libv4l is given. --- src/input/net_buf_ctrl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/input') diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 1d01911fd..1ac0cb066 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -122,7 +122,7 @@ static void display_stats (nbc_t *this) { static const char enabled[2][4] = {"off", "on "}; 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, @@ -132,7 +132,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); } -- cgit v1.2.3