]> git.alsa-project.org Git - alsa-utils.git/commitdiff
amidi: restore space between bytes
authorJohn Keeping <john@metanate.com>
Wed, 13 Jul 2022 15:04:09 +0000 (16:04 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 4 Nov 2022 21:01:19 +0000 (22:01 +0100)
Commit 9a8fcec ("amidi: add timestamp option for dump") removed the
space between bytes when dumping MIDI, changing the output from:

90 45 40
80 45 00

to:

904540
804500

It seems that this was an unintentional side effect of refactoring the
code to add the new timestamp output but the result is less readable
than it was before.

Restore the space between bytes in the same message.

Fixes: 9a8fcec ("amidi: add timestamp option for dump")
Fixes: https://github.com/alsa-project/alsa-utils/pull/158/
Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
amidi/amidi.c

index 3d7bd0f0960ad8e83a55c9133bcd20b354677225..b7eebdff85e9699f25e3d6fecdc7d5933f198fdb 100644 (file)
@@ -433,14 +433,12 @@ static void print_byte(unsigned char byte, struct timespec *ts)
                        fputs("\n  ", stdout);
        }
 
-       if (newline) {
-               printf("\n");
-
+       putchar(newline ? '\n' : ' ');
+       if (newline && do_print_timestamp) {
                /* Nanoseconds does not make a lot of sense for serial MIDI (the
                 * 31250 bps one) but I'm not sure about MIDI over USB.
                 */
-               if (do_print_timestamp)
-                       printf("%lld.%.9ld) ", (long long)ts->tv_sec, ts->tv_nsec);
+               printf("%lld.%.9ld) ", (long long)ts->tv_sec, ts->tv_nsec);
        }
 
        printf("%02X", byte);