mirror of
https://github.com/vgmstream/vgmstream.git
synced 2024-11-28 00:20:47 +01:00
Clean NWA meta
To open external files it was using get_realname, which only was actually implemented in Audacious, but Audacious can use get_name to open external files just fine anyway (for any path, encoding, etc)
This commit is contained in:
bnnm
parent
4a8e8a87e8
commit
3d2f7e0de2
543
src/meta/nwa.c
543
src/meta/nwa.c
@ -4,296 +4,88 @@
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DIRSEP '\\'
|
||||
#else
|
||||
#define DIRSEP '/'
|
||||
#endif
|
||||
|
||||
/* NWA - Visual Art's streams */
|
||||
static int get_loops_nwainfo_ini(STREAMFILE *streamFile, int *out_loop_flag, int32_t *out_loop_start);
|
||||
static int get_loops_gameexe_ini(STREAMFILE *streamFile, int *out_loop_flag, int32_t *out_loop_start, int32_t *out_loop_end);
|
||||
static nwa_codec_data *open_nwa_vgmstream(STREAMFILE *streamFile);
|
||||
static void free_nwa_vgmstream(nwa_codec_data *data);
|
||||
|
||||
/* NWA - Visual Art's streams [Air (PC), Clannad (PC)] */
|
||||
VGMSTREAM * init_vgmstream_nwa(STREAMFILE *streamFile) {
|
||||
VGMSTREAM * vgmstream = NULL;
|
||||
char filename[PATH_LIMIT];
|
||||
int i;
|
||||
int channel_count;
|
||||
int loop_flag = 0;
|
||||
int32_t loop_start_sample = 0;
|
||||
int32_t loop_end_sample = 0;
|
||||
int nwainfo_ini_found = 0;
|
||||
int gameexe_ini_found = 0;
|
||||
int just_pcm = 0;
|
||||
int comp_level = -2;
|
||||
nwa_codec_data *data = NULL;
|
||||
off_t start_offset;
|
||||
int channel_count, loop_flag = 0;
|
||||
int32_t loop_start_sample = 0, loop_end_sample = 0;
|
||||
int nwainfo_ini_found = 0, gameexe_ini_found = 0;
|
||||
int compression_level;
|
||||
|
||||
/* check extension, case insensitive */
|
||||
streamFile->get_name(streamFile,filename,sizeof(filename));
|
||||
if (strcasecmp("nwa",filename_extension(filename))) goto fail;
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(streamFile, "nwa"))
|
||||
goto fail;
|
||||
|
||||
channel_count = read_16bitLE(0x00,streamFile);
|
||||
if (channel_count != 1 && channel_count != 2) goto fail;
|
||||
|
||||
/* check if we're using raw pcm */
|
||||
if (
|
||||
read_32bitLE(0x08,streamFile)==-1 || /* compression level */
|
||||
read_32bitLE(0x10,streamFile)==0 || /* block count */
|
||||
read_32bitLE(0x18,streamFile)==0 || /* compressed data size */
|
||||
read_32bitLE(0x20,streamFile)==0 || /* block size */
|
||||
read_32bitLE(0x24,streamFile)==0 /* restsize */
|
||||
)
|
||||
{
|
||||
just_pcm = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
comp_level = read_32bitLE(0x08,streamFile);
|
||||
|
||||
data = malloc(sizeof(nwa_codec_data));
|
||||
if (!data) goto fail;
|
||||
|
||||
data->nwa = open_nwa(streamFile,filename);
|
||||
if (!data->nwa) goto fail;
|
||||
if ( read_32bitLE(0x08,streamFile)==-1 || /* compression level */
|
||||
read_32bitLE(0x10,streamFile)==0 || /* block count */
|
||||
read_32bitLE(0x18,streamFile)==0 || /* compressed data size */
|
||||
read_32bitLE(0x20,streamFile)==0 || /* block size */
|
||||
read_32bitLE(0x24,streamFile)==0 ) { /* restsize */
|
||||
compression_level = -1;
|
||||
} else {
|
||||
compression_level = read_32bitLE(0x08,streamFile);
|
||||
}
|
||||
|
||||
/* try to locate NWAINFO.INI in the same directory */
|
||||
{
|
||||
char ininame[PATH_LIMIT];
|
||||
char * ini_lastslash;
|
||||
char namebase_array[PATH_LIMIT];
|
||||
char *namebase;
|
||||
STREAMFILE *inistreamfile;
|
||||
/* loop points come from external files */
|
||||
nwainfo_ini_found = get_loops_nwainfo_ini(streamFile, &loop_flag, &loop_start_sample);
|
||||
gameexe_ini_found = !nwainfo_ini_found && get_loops_gameexe_ini(streamFile, &loop_flag, &loop_start_sample, &loop_end_sample);
|
||||
|
||||
/* here we assume that the "special encoding" does not affect
|
||||
* the directory separator */
|
||||
strncpy(ininame,filename,sizeof(ininame));
|
||||
ininame[sizeof(ininame)-1]='\0'; /* a pox on the stdlib! */
|
||||
|
||||
streamFile->get_realname(streamFile,namebase_array,sizeof(namebase_array));
|
||||
|
||||
ini_lastslash = strrchr(ininame,DIRSEP);
|
||||
if (!ini_lastslash) {
|
||||
strncpy(ininame,"NWAINFO.INI",sizeof(ininame));
|
||||
namebase = namebase_array;
|
||||
} else {
|
||||
strncpy(ini_lastslash+1,"NWAINFO.INI",
|
||||
sizeof(ininame)-(ini_lastslash+1-ininame));
|
||||
namebase = strrchr(namebase_array,DIRSEP)+1;
|
||||
}
|
||||
ininame[sizeof(ininame)-1]='\0'; /* curse you, strncpy! */
|
||||
|
||||
inistreamfile = streamFile->open(streamFile,ininame,4096);
|
||||
|
||||
if (inistreamfile) {
|
||||
/* ini found, try to find our name */
|
||||
const char * ext;
|
||||
int length;
|
||||
int found;
|
||||
off_t offset;
|
||||
off_t file_size;
|
||||
off_t found_off = -1;
|
||||
|
||||
nwainfo_ini_found = 1;
|
||||
|
||||
ext = filename_extension(namebase);
|
||||
length = ext-1-namebase;
|
||||
file_size = get_streamfile_size(inistreamfile);
|
||||
|
||||
for (found = 0, offset = 0; !found && offset<file_size; offset++) {
|
||||
off_t suboffset;
|
||||
/* Go for an n*m search 'cause it's easier than building an
|
||||
* FSA for the search string. Just wanted to make the point that
|
||||
* I'm not ignorant, just lazy. */
|
||||
for (suboffset = offset;
|
||||
suboffset<file_size &&
|
||||
suboffset-offset<length &&
|
||||
read_8bit(suboffset,inistreamfile)==
|
||||
namebase[suboffset-offset];
|
||||
suboffset++) {}
|
||||
|
||||
if (suboffset-offset==length &&
|
||||
read_8bit(suboffset,inistreamfile)==0x09) { /* tab */
|
||||
found=1;
|
||||
found_off = suboffset+1;
|
||||
}
|
||||
}
|
||||
|
||||
if (found) {
|
||||
char loopstring[9]={0};
|
||||
|
||||
if (read_streamfile((uint8_t*)loopstring,found_off,8,
|
||||
inistreamfile)==8)
|
||||
{
|
||||
loop_start_sample = atol(loopstring);
|
||||
if (loop_start_sample > 0) loop_flag = 1;
|
||||
}
|
||||
} /* if found file name in INI */
|
||||
|
||||
close_streamfile(inistreamfile);
|
||||
} /* if opened INI ok */
|
||||
} /* INI block */
|
||||
|
||||
/* try to locate Gameexe.ini in the same directory */
|
||||
{
|
||||
char ininame[PATH_LIMIT];
|
||||
char * ini_lastslash;
|
||||
char namebase_array[PATH_LIMIT];
|
||||
char * namebase;
|
||||
STREAMFILE *inistreamfile;
|
||||
|
||||
strncpy(ininame,filename,sizeof(ininame));
|
||||
ininame[sizeof(ininame)-1]='\0'; /* a pox on the stdlib! */
|
||||
|
||||
streamFile->get_realname(streamFile,namebase_array,sizeof(namebase_array));
|
||||
|
||||
ini_lastslash = strrchr(ininame,DIRSEP);
|
||||
if (!ini_lastslash) {
|
||||
strncpy(ininame,"Gameexe.ini",sizeof(ininame));
|
||||
namebase = namebase_array;
|
||||
} else {
|
||||
strncpy(ini_lastslash+1,"Gameexe.ini",
|
||||
sizeof(ininame)-(ini_lastslash+1-ininame));
|
||||
namebase = strrchr(namebase_array,DIRSEP)+1;
|
||||
}
|
||||
ininame[sizeof(ininame)-1]='\0'; /* curse you, strncpy! */
|
||||
|
||||
inistreamfile = streamFile->open(streamFile,ininame,4096);
|
||||
|
||||
if (inistreamfile) {
|
||||
/* ini found, try to find our name */
|
||||
const char * ext;
|
||||
int length;
|
||||
int found;
|
||||
off_t offset;
|
||||
off_t file_size;
|
||||
off_t found_off = -1;
|
||||
|
||||
gameexe_ini_found = 1;
|
||||
|
||||
ext = filename_extension(namebase);
|
||||
length = ext-1-namebase;
|
||||
file_size = get_streamfile_size(inistreamfile);
|
||||
|
||||
/* format of line is:
|
||||
* #DSTRACK = 00000000 - eeeeeeee - ssssssss = "name" = "name2?"
|
||||
* ^22 ^33 ^45 ^57
|
||||
*/
|
||||
|
||||
for (found = 0, offset = 0; !found && offset<file_size; offset++) {
|
||||
off_t suboffset;
|
||||
uint8_t buf[10];
|
||||
|
||||
if (read_8bit(offset,inistreamfile)!='#') continue;
|
||||
if (read_streamfile(buf,offset+1,10,inistreamfile)!=10) break;
|
||||
if (memcmp("DSTRACK = ",buf,10)) continue;
|
||||
if (read_8bit(offset+44,inistreamfile)!='\"') continue;
|
||||
|
||||
for (suboffset = offset+45;
|
||||
suboffset<file_size &&
|
||||
suboffset-offset-45<length &&
|
||||
tolower(read_8bit(suboffset,inistreamfile))==
|
||||
tolower(namebase[suboffset-offset-45]);
|
||||
suboffset++) {}
|
||||
|
||||
if (suboffset-offset-45==length &&
|
||||
read_8bit(suboffset,inistreamfile)=='\"') { /* tab */
|
||||
found=1;
|
||||
found_off = offset+22; /* loop end */
|
||||
}
|
||||
}
|
||||
|
||||
if (found) {
|
||||
char loopstring[9]={0};
|
||||
int start_ok = 0, end_ok = 0;
|
||||
int32_t total_samples =
|
||||
read_32bitLE(0x1c,streamFile)/channel_count;
|
||||
|
||||
if (read_streamfile((uint8_t*)loopstring,found_off,8,
|
||||
inistreamfile)==8)
|
||||
{
|
||||
if (!memcmp("99999999",loopstring,8))
|
||||
{
|
||||
loop_end_sample = total_samples;
|
||||
}
|
||||
else
|
||||
{
|
||||
loop_end_sample = atol(loopstring);
|
||||
}
|
||||
end_ok = 1;
|
||||
}
|
||||
if (read_streamfile((uint8_t*)loopstring,found_off+11,8,
|
||||
inistreamfile)==8)
|
||||
{
|
||||
if (!memcmp("99999999",loopstring,8))
|
||||
{
|
||||
/* not ok to start at last sample,
|
||||
* don't set start_ok flag */
|
||||
}
|
||||
else if (!memcmp("00000000",loopstring,8))
|
||||
{
|
||||
/* loops from the start aren't really loops */
|
||||
}
|
||||
else
|
||||
{
|
||||
loop_start_sample = atol(loopstring);
|
||||
start_ok = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (start_ok && end_ok) loop_flag = 1;
|
||||
} /* if found file name in INI */
|
||||
|
||||
close_streamfile(inistreamfile);
|
||||
} /* if opened INI ok */
|
||||
} /* INI block */
|
||||
start_offset = 0x2c;
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channel_count,loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
/* fill in the vital statistics */
|
||||
vgmstream->channels = channel_count;
|
||||
vgmstream->sample_rate = read_32bitLE(0x04,streamFile);
|
||||
vgmstream->num_samples = read_32bitLE(0x1c,streamFile) / channel_count;
|
||||
|
||||
vgmstream->num_samples = read_32bitLE(0x1c,streamFile)/channel_count;
|
||||
|
||||
if (just_pcm) {
|
||||
switch (read_16bitLE(0x02,streamFile)) {
|
||||
case 8:
|
||||
vgmstream->coding_type = coding_PCM8;
|
||||
vgmstream->interleave_block_size = 1;
|
||||
break;
|
||||
case 16:
|
||||
vgmstream->coding_type = coding_PCM16LE;
|
||||
vgmstream->interleave_block_size = 2;
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
if (channel_count > 1) {
|
||||
switch(compression_level) {
|
||||
case -1:
|
||||
switch (read_16bitLE(0x02,streamFile)) {
|
||||
case 8:
|
||||
vgmstream->coding_type = coding_PCM8;
|
||||
vgmstream->interleave_block_size = 0x01;
|
||||
break;
|
||||
case 16:
|
||||
vgmstream->coding_type = coding_PCM16LE;
|
||||
vgmstream->interleave_block_size = 0x02;
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
vgmstream->layout_type = layout_interleave;
|
||||
} else {
|
||||
break;
|
||||
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
vgmstream->coding_type = coding_NWA;
|
||||
vgmstream->layout_type = layout_none;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (comp_level)
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
vgmstream->coding_type = coding_NWA;
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
break;
|
||||
}
|
||||
vgmstream->layout_type = layout_none;
|
||||
vgmstream->codec_data = open_nwa_vgmstream(streamFile);
|
||||
if (!vgmstream->codec_data) goto fail;
|
||||
break;
|
||||
|
||||
default:
|
||||
goto fail;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if (nwainfo_ini_found) {
|
||||
vgmstream->meta_type = meta_NWA_NWAINFOINI;
|
||||
if (loop_flag) {
|
||||
@ -311,38 +103,205 @@ VGMSTREAM * init_vgmstream_nwa(STREAMFILE *streamFile) {
|
||||
}
|
||||
|
||||
|
||||
if (just_pcm) {
|
||||
/* open the file for reading by each channel */
|
||||
STREAMFILE *chstreamfile;
|
||||
|
||||
/* have both channels use the same buffer, as interleave is so small */
|
||||
chstreamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
|
||||
|
||||
if (!chstreamfile) goto fail;
|
||||
|
||||
for (i=0;i<channel_count;i++) {
|
||||
vgmstream->ch[i].streamfile = chstreamfile;
|
||||
|
||||
vgmstream->ch[i].channel_start_offset=
|
||||
vgmstream->ch[i].offset=0x2c+(off_t)(i*vgmstream->interleave_block_size);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
vgmstream->codec_data = data;
|
||||
}
|
||||
|
||||
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
|
||||
goto fail;
|
||||
return vgmstream;
|
||||
|
||||
/* clean up anything we may have opened */
|
||||
fail:
|
||||
if (vgmstream) close_vgmstream(vgmstream);
|
||||
if (data) {
|
||||
if (data->nwa)
|
||||
close_vgmstream(vgmstream);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/* try to locate NWAINFO.INI in the same directory */
|
||||
static int get_loops_nwainfo_ini(STREAMFILE *streamFile, int *out_loop_flag, int32_t *out_loop_start) {
|
||||
STREAMFILE *streamLoops;
|
||||
char namebase[PATH_LIMIT];
|
||||
const char * ext;
|
||||
int length;
|
||||
int found;
|
||||
off_t offset;
|
||||
size_t file_size;
|
||||
off_t found_off = -1;
|
||||
int loop_flag = 0;
|
||||
int32_t loop_start_sample = 0;
|
||||
|
||||
|
||||
streamLoops = open_streamfile_by_filename(streamFile, "NWAINFO.INI");
|
||||
if (!streamLoops) goto fail;
|
||||
|
||||
get_streamfile_filename(streamFile,namebase,PATH_LIMIT);
|
||||
|
||||
/* ini found, try to find our name */
|
||||
ext = filename_extension(namebase);
|
||||
length = ext - 1 - namebase;
|
||||
file_size = get_streamfile_size(streamLoops);
|
||||
|
||||
for (found = 0, offset = 0; !found && offset < file_size; offset++) {
|
||||
off_t suboffset;
|
||||
/* Go for an n*m search 'cause it's easier than building an
|
||||
* FSA for the search string. Just wanted to make the point that
|
||||
* I'm not ignorant, just lazy. */
|
||||
for (suboffset = offset;
|
||||
suboffset < file_size &&
|
||||
suboffset-offset < length &&
|
||||
read_8bit(suboffset,streamLoops) == namebase[suboffset-offset];
|
||||
suboffset++) {
|
||||
/* skip */
|
||||
}
|
||||
|
||||
if (suboffset-offset==length && read_8bit(suboffset,streamLoops)==0x09) { /* tab */
|
||||
found = 1;
|
||||
found_off = suboffset+1;
|
||||
}
|
||||
}
|
||||
|
||||
/* if found file name in INI */
|
||||
if (found) {
|
||||
char loopstring[9] = {0};
|
||||
|
||||
if (read_streamfile((uint8_t*)loopstring,found_off,8,streamLoops) == 8) {
|
||||
loop_start_sample = atol(loopstring);
|
||||
if (loop_start_sample > 0)
|
||||
loop_flag = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
*out_loop_flag = loop_flag;
|
||||
*out_loop_start = loop_start_sample;
|
||||
|
||||
close_streamfile(streamLoops);
|
||||
return 1;
|
||||
|
||||
fail:
|
||||
close_streamfile(streamLoops);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* try to locate Gameexe.ini in the same directory */
|
||||
static int get_loops_gameexe_ini(STREAMFILE *streamFile, int *out_loop_flag, int32_t *out_loop_start, int32_t *out_loop_end) {
|
||||
STREAMFILE *streamLoops;
|
||||
char namebase[PATH_LIMIT];
|
||||
const char * ext;
|
||||
int length;
|
||||
int found;
|
||||
off_t offset;
|
||||
off_t file_size;
|
||||
off_t found_off = -1;
|
||||
int loop_flag = 0;
|
||||
int32_t loop_start_sample = 0, loop_end_sample = 0;
|
||||
|
||||
|
||||
streamLoops = open_streamfile_by_filename(streamFile, "Gameexe.ini");
|
||||
if (!streamLoops) goto fail;
|
||||
|
||||
get_streamfile_filename(streamFile,namebase,PATH_LIMIT);
|
||||
|
||||
/* ini found, try to find our name */
|
||||
ext = filename_extension(namebase);
|
||||
length = ext-1-namebase;
|
||||
file_size = get_streamfile_size(streamLoops);
|
||||
|
||||
/* format of line is:
|
||||
* #DSTRACK = 00000000 - eeeeeeee - ssssssss = "name" = "name2?"
|
||||
* ^22 ^33 ^45 ^57
|
||||
*/
|
||||
|
||||
for (found = 0, offset = 0; !found && offset<file_size; offset++) {
|
||||
off_t suboffset;
|
||||
uint8_t buf[10];
|
||||
|
||||
if (read_8bit(offset,streamLoops)!='#') continue;
|
||||
if (read_streamfile(buf,offset+1,10,streamLoops)!=10) break;
|
||||
if (memcmp("DSTRACK = ",buf,10)) continue;
|
||||
if (read_8bit(offset+44,streamLoops)!='\"') continue;
|
||||
|
||||
for (suboffset = offset+45;
|
||||
suboffset < file_size &&
|
||||
suboffset-offset-45 < length &&
|
||||
tolower(read_8bit(suboffset,streamLoops)) == tolower(namebase[suboffset-offset-45]);
|
||||
suboffset++) {
|
||||
/* skip */
|
||||
}
|
||||
|
||||
if (suboffset-offset-45==length && read_8bit(suboffset,streamLoops)=='\"') { /* tab */
|
||||
found = 1;
|
||||
found_off = offset+22; /* loop end */
|
||||
}
|
||||
}
|
||||
|
||||
if (found) {
|
||||
char loopstring[9] = {0};
|
||||
int start_ok = 0, end_ok = 0;
|
||||
int32_t total_samples = read_32bitLE(0x1c,streamFile) / read_16bitLE(0x00,streamFile);
|
||||
|
||||
if (read_streamfile((uint8_t*)loopstring,found_off,8,streamLoops)==8)
|
||||
{
|
||||
if (!memcmp("99999999",loopstring,8)) {
|
||||
loop_end_sample = total_samples;
|
||||
}
|
||||
else {
|
||||
loop_end_sample = atol(loopstring);
|
||||
}
|
||||
end_ok = 1;
|
||||
}
|
||||
if (read_streamfile((uint8_t*)loopstring,found_off+11,8,streamLoops)==8)
|
||||
{
|
||||
if (!memcmp("99999999",loopstring,8)) {
|
||||
/* not ok to start at last sample,
|
||||
* don't set start_ok flag */
|
||||
}
|
||||
else if (!memcmp("00000000",loopstring,8)) {
|
||||
/* loops from the start aren't really loops */
|
||||
}
|
||||
else {
|
||||
loop_start_sample = atol(loopstring);
|
||||
start_ok = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (start_ok && end_ok) loop_flag = 1;
|
||||
} /* if found file name in INI */
|
||||
|
||||
|
||||
*out_loop_flag = loop_flag;
|
||||
*out_loop_start = loop_start_sample;
|
||||
*out_loop_end = loop_end_sample;
|
||||
|
||||
close_streamfile(streamLoops);
|
||||
return 1;
|
||||
|
||||
fail:
|
||||
close_streamfile(streamLoops);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static nwa_codec_data *open_nwa_vgmstream(STREAMFILE *streamFile) {
|
||||
nwa_codec_data *data = NULL;
|
||||
char filename[PATH_LIMIT];
|
||||
|
||||
streamFile->get_name(streamFile,filename,sizeof(filename));
|
||||
|
||||
data = malloc(sizeof(nwa_codec_data));
|
||||
if (!data) goto fail;
|
||||
|
||||
data->nwa = open_nwa(streamFile,filename);
|
||||
if (!data->nwa) goto fail;
|
||||
|
||||
return data;
|
||||
|
||||
fail:
|
||||
free_nwa_vgmstream(data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void free_nwa_vgmstream(nwa_codec_data *data) {
|
||||
if (data) {
|
||||
if (data->nwa) {
|
||||
close_nwa(data->nwa);
|
||||
}
|
||||
free(data);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -768,10 +768,13 @@ void close_vgmstream(VGMSTREAM * vgmstream) {
|
||||
}
|
||||
|
||||
if (vgmstream->coding_type == coding_NWA) {
|
||||
nwa_codec_data *data = (nwa_codec_data *) vgmstream->codec_data;
|
||||
close_nwa(data->nwa);
|
||||
free(data);
|
||||
vgmstream->codec_data = NULL;
|
||||
if (vgmstream->codec_data) {
|
||||
nwa_codec_data *data = (nwa_codec_data *) vgmstream->codec_data;
|
||||
if (data->nwa)
|
||||
close_nwa(data->nwa);
|
||||
free(data);
|
||||
vgmstream->codec_data = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2516,7 +2519,7 @@ int get_vgmstream_average_bitrate(VGMSTREAM * vgmstream) {
|
||||
|
||||
|
||||
/**
|
||||
* Inits vgmstreams' channels doing two things:
|
||||
* Inits vgmstream, doing two things:
|
||||
* - sets the starting offset per channel (depending on the layout)
|
||||
* - opens its own streamfile from on a base one. One streamfile per channel may be open (to improve read/seeks).
|
||||
* Should be called in metas before returning the VGMSTREAM.
|
||||
@ -2529,14 +2532,18 @@ int vgmstream_open_stream(VGMSTREAM * vgmstream, STREAMFILE *streamFile, off_t s
|
||||
int use_same_offset_per_channel = 0;
|
||||
|
||||
|
||||
/* stream/offsets not needed, manage themselves */
|
||||
/* stream/offsets not needed, managed by layout */
|
||||
if (vgmstream->layout_type == layout_aix ||
|
||||
vgmstream->layout_type == layout_segmented ||
|
||||
vgmstream->layout_type == layout_layered)
|
||||
return 1;
|
||||
|
||||
/* stream/offsets not needed, managed by decoder */
|
||||
if (vgmstream->coding_type == coding_NWA)
|
||||
return 1;
|
||||
|
||||
#ifdef VGM_USE_FFMPEG
|
||||
/* stream/offsets not needed, FFmpeg manages itself */
|
||||
/* stream/offsets not needed, managed by decoder */
|
||||
if (vgmstream->coding_type == coding_FFmpeg)
|
||||
return 1;
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user