Skip to content

Report pan value '---' for samples with no default panning. #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sezero merged 1 commit into from
Nov 18, 2025
Merged

Report pan value '---' for samples with no default panning. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Stable versions
---------------

4.2.1 (?):
Changes by Alice Rowan
- Report pan value "---" for instruments/samples without
a default panning value (sub->pan < 0).

4.2.0 (20230615):
Changes by Özkan Sezer:
- Fix OS/2 and Amiga builds. OS-specific tweaks.
Expand Down
21 changes: 17 additions & 4 deletions src/info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,20 @@ void info_frame(const struct xmp_module_info *mi, const struct xmp_frame_info *f
fflush(stdout);
}

static void get_sample_pan_string(char pan[4], const struct xmp_subinstrument *sub)
{
if (sub->pan >= 0) {
snprintf(pan, 4, "P%02x", sub->pan & 0xff);
} else {
strcpy(pan, "---");
}
}

void info_ins_smp(const struct xmp_module_info *mi)
{
int i, j;
const struct xmp_module *mod = mi->mod;
char pan_string[4];

report("Instruments and samples:\n");
report(" Instrument name Smp Size Loop End Vol Fine Xpo Pan\n");
Expand Down Expand Up @@ -260,9 +270,10 @@ void info_ins_smp(const struct xmp_module_info *mi)
}
report("%36.36s", " ");
}
get_sample_pan_string(pan_string, sub);

has_sub = 1;
report("[%02x] %05x%c%05x %05x%c V%02x %+04d %+03d P%02x\n",
report("[%02x] %05x%c%05x %05x%c V%02x %+04d %+03d %-3.3s\n",
sub->sid + 1,
smp->len,
smp->flg & XMP_SAMPLE_16BIT ? '+' : ' ',
Expand All @@ -274,7 +285,7 @@ void info_ins_smp(const struct xmp_module_info *mi)
sub->vol,
sub->fin,
sub->xpo,
sub->pan & 0xff);
pan_string);
}

if (has_sub == 0) {
Expand All @@ -287,6 +298,7 @@ void info_instruments(const struct xmp_module_info *mi)
{
int i, j;
const struct xmp_module *mod = mi->mod;
char pan_string[4];

report("Instruments:\n");
report(" Instrument name Vl Fade Env Ns Sub Gv Vl Fine Xpo Pan Sm\n");
Expand Down Expand Up @@ -323,15 +335,16 @@ void info_instruments(const struct xmp_module_info *mi)
}
report("%51.51s", " ");
}
get_sample_pan_string(pan_string, sub);

has_sub = 1;
report("[%02x] %02x %02x %+04d %+03d P%02x %02x\n",
report("[%02x] %02x %02x %+04d %+03d %-3.3s %02x\n",
j + 1,
sub->gvl,
sub->vol,
sub->fin,
sub->xpo,
sub->pan & 0xff,
pan_string,
sub->sid);
}

Expand Down