Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-29 00:34:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add TXTP group auto-positions and layer-x macro auto-channels

Browse Source
This commit is contained in:
bnnm 2020-08-08 20:35:19 +02:00
parent df6f63ab66
commit e746c7d462
2 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/meta/txtp.c
View File

@ -112,6 +112,7 @@ typedef struct {
txtp_group* group;
size_t group_count;
size_t group_max;
int group_pos; /* entry counter for groups */
VGMSTREAM** vgmstream;
size_t vgmstream_count;
@ -1277,10 +1278,11 @@ static void parse_params(txtp_entry* entry, char* params) {
nm = get_int(params, &mix.max);
params += nm;
if (nm == 0) continue;
nm = get_mask(params, &mix.mask);
params += nm;
if (nm > 0) { /* max is optional (auto-detects and uses max channels) */
nm = get_mask(params, &mix.mask);
params += nm;
}
mix.mode = command[7]; /* pass letter */
add_mixing(entry, &mix, MACRO_LAYER);
@ -1329,14 +1331,21 @@ static void parse_params(txtp_entry* entry, char* params) {
}
static int add_group(txtp_header* txtp, char* line) {
int n, m;
txtp_group cfg = {0};
int auto_pos = 0;
char c;
/* parse group: (position)(type)(count)(repeat) #(commands) */
//;VGM_LOG("TXTP: parse group '%s'\n", line);
m = sscanf(line, " %c%n", &c, &n);
if (m == 1 && c == '-') {
auto_pos = 1;
line += n;
}
m = sscanf(line, " %d%n", &cfg.position, &n);
if (m == 1) {
cfg.position--; /* externally 1=first but internally 0=first */
@ -1355,13 +1364,36 @@ static int add_group(txtp_header* txtp, char* line) {
m = sscanf(line, " %c%n", &cfg.repeat, &n);
if (m == 1 && cfg.repeat == TXTP_GROUP_REPEAT) {
auto_pos = 0;
line += n;
}
parse_params(&cfg.group_settings, line);
//;VGM_LOG("TXTP: parsed group %i%c%i%c\n",cfg.position+1,cfg.type,cfg.count,cfg.repeat);
/* Groups can use "auto" position of last N files, so we need a counter that changes like this:
* #layer of 2 (pos = 0)
* #sequence of 2
* bgm pos +1 > 1
* bgm pos +1 > 2
* group = -S2 pos -2 +1 > 1 (group is at 1 now since it "collapses" wems but becomes a position)
* #sequence of 3
* bgm pos +1 > 2
* bgm pos +1 > 3
* #sequence of 2
* bgm pos +1 > 4
* bgm pos +1 > 5
* group = -S2 pos -2 +1 > 4 (groups is at 4 now since are uncollapsed wems at 2/3)
* group = -S3 pos -3 +1 > 2
* group = -L2 pos -2 +1 > 1
*/
txtp->group_pos++;
txtp->group_pos -= cfg.count;
if (auto_pos) {
cfg.position = txtp->group_pos - 1; /* internally 1 = first */
}
//;VGM_LOG("TXTP: parsed group %i%c%i%c, auto=%i\n",cfg.position+1,cfg.type,cfg.count,cfg.repeat, auto_pos);
/* add final group */
{
@ -1468,6 +1500,7 @@ static int add_entry(txtp_header* txtp, char* filename, int is_default) {
add_settings(current, &entry, filename);
txtp->entry_count++;
txtp->group_pos++;
}
return 1;

28
src/mixing.c
View File

@ -717,12 +717,40 @@ void mixing_macro_track(VGMSTREAM* vgmstream, uint32_t mask) {
}
}
/* get highest channel count */
static int get_layered_max_channels(VGMSTREAM* vgmstream) {
int i, max;
layered_layout_data* data;
if (vgmstream->layout_type != layout_layered)
return 0;
data = vgmstream->layout_data;
max = 0;
for (i = 0; i < data->layer_count; i++) {
int output_channels = 0;
mixing_info(data->layers[i], NULL, &output_channels);
if (max < output_channels)
max = output_channels;
}
return max;
}
void mixing_macro_layer(VGMSTREAM* vgmstream, int max, uint32_t mask, char mode) {
mixing_data *data = vgmstream->mixing_data;
int current, ch, output_channels, selected_channels;
if (!data)
return;
if (max == 0) /* auto calculate */
max = get_layered_max_channels(vgmstream);
if (max <= 0 || data->output_channels <= max)
return;