From d2cf2f88c5080cac2d3258b6cb3dc316a96bee19 Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Fri, 8 Jun 2012 17:13:32 -0300 Subject: [PATCH 1/3] [xmp] Adjust verbosity levels Display instrument and sample info also if -vv is specified in the command line. Signed-off-by: Claudio Matsuoka --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index f80f201..7a84114 100644 --- a/src/main.c +++ b/src/main.c @@ -295,7 +295,7 @@ int main(int argc, char **argv) if (options.verbose > 0) { info_mod(&mi); } - if (options.verbose == 2) { + if (options.verbose > 1) { info_instruments(&mi); } From 1951c7fb9757b59e043f924ae8b0f598c29f3f0a Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Fri, 8 Jun 2012 18:10:50 -0300 Subject: [PATCH 2/3] [xmp] Fix install target Fix player installation target in Makefile (by Douglas Carmichael). Signed-off-by: Claudio Matsuoka --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 00d7fd6..fdbbd66 100644 --- a/src/Makefile +++ b/src/Makefile @@ -29,5 +29,5 @@ $(SRC_PATH)/sound_beos.o: src/sound_beos.c install-xmp: $(SRC_PATH)/xmp @echo Installing xmp in $(DESTDIR)$(BINDIR) @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) - @$(INSTALL_PROGRAM) $+ $(DESTDIR)$(BINDIR) + @$(INSTALL) $+ $(DESTDIR)$(BINDIR) From 63776ab78272e6a31c2b2050c6283e34eaad6001 Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Sat, 9 Jun 2012 18:58:23 -0300 Subject: [PATCH 3/3] [xmp] Don't show pause message if running quiet Signed-off-by: Claudio Matsuoka --- src/main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 7a84114..4aa0313 100644 --- a/src/main.c +++ b/src/main.c @@ -119,17 +119,21 @@ static void shuffle(int argc, char **argv) } static void check_pause(xmp_context handle, struct control *ctl, - struct xmp_module_info *mi) + struct xmp_module_info *mi, int verbose) { if (ctl->pause) { sound->pause(); - info_frame(mi, ctl, 1); + if (verbose) { + info_frame(mi, ctl, 1); + } while (ctl->pause) { usleep(100000); read_command(handle, ctl); if (ctl->display) { show_info(ctl->display, mi); - info_frame(mi, ctl, 1); + if (verbose) { + info_frame(mi, ctl, 1); + } ctl->display = 0; } } @@ -335,7 +339,8 @@ int main(int argc, char **argv) break; } - check_pause(handle, &control, &mi); + check_pause(handle, &control, &mi, + options.verbose); options.start = 0; }