Revert "Add prints to gpgx_swap_disc" and "Add prints to cdStreamOpen"
This reverts commit9e0cfb117b
and5c3ae64014
.
This commit is contained in:
parent
c644ed19ef
commit
6c2661fdac
Binary file not shown.
|
@ -61,14 +61,12 @@ cdStream* cdStreamOpen(const char* fname)
|
||||||
if (load_archive("PRIMARY_CD", (unsigned char*)&pending_toc, sizeof(toc_t), NULL))
|
if (load_archive("PRIMARY_CD", (unsigned char*)&pending_toc, sizeof(toc_t), NULL))
|
||||||
{
|
{
|
||||||
cd_index = 0;
|
cd_index = 0;
|
||||||
fprintf(stderr, "Initing primary CD\n");
|
|
||||||
cdStreamInit(&cd_streams[0], &pending_toc, 0);
|
cdStreamInit(&cd_streams[0], &pending_toc, 0);
|
||||||
return &cd_streams[0];
|
return &cd_streams[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!strcmp(fname, "HOTSWAP_CD"))
|
else if (!strcmp(fname, "HOTSWAP_CD"))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Initing hotswap CD\n");
|
|
||||||
cdStreamInit(&cd_streams[cd_index], &pending_toc, 0);
|
cdStreamInit(&cd_streams[cd_index], &pending_toc, 0);
|
||||||
return &cd_streams[cd_index];
|
return &cd_streams[cd_index];
|
||||||
}
|
}
|
||||||
|
@ -79,7 +77,6 @@ cdStream* cdStreamOpen(const char* fname)
|
||||||
if (load_archive("SECONDARY_CD", (unsigned char*)&pending_toc, sizeof(toc_t), NULL))
|
if (load_archive("SECONDARY_CD", (unsigned char*)&pending_toc, sizeof(toc_t), NULL))
|
||||||
{
|
{
|
||||||
cd_index = 0;
|
cd_index = 0;
|
||||||
fprintf(stderr, "Initing secondary CD\n");
|
|
||||||
cdStreamInit(&cd_streams[0], &pending_toc, 0);
|
cdStreamInit(&cd_streams[0], &pending_toc, 0);
|
||||||
return &cd_streams[0];
|
return &cd_streams[0];
|
||||||
}
|
}
|
||||||
|
@ -89,14 +86,12 @@ cdStream* cdStreamOpen(const char* fname)
|
||||||
// .cue file will attempt to be loaded for parsing
|
// .cue file will attempt to be loaded for parsing
|
||||||
// we use this to know when to load in the TOC
|
// we use this to know when to load in the TOC
|
||||||
// (can't do it when PRIMARY_CD/HOTSWAP_CD/SECONDARY_CD is opened, due to GPGX assuming those are a single track)
|
// (can't do it when PRIMARY_CD/HOTSWAP_CD/SECONDARY_CD is opened, due to GPGX assuming those are a single track)
|
||||||
fprintf(stderr, "Copying TOC, TOC CRC32: %08lX\n", crc32(0, (unsigned char*)&pending_toc, sizeof(toc_t)));
|
|
||||||
memcpy(&cdd.toc, &pending_toc, sizeof(toc_t));
|
memcpy(&cdd.toc, &pending_toc, sizeof(toc_t));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
else if (!strcmp(fext, ".sub"))
|
else if (!strcmp(fext, ".sub"))
|
||||||
{
|
{
|
||||||
// separate stream for subcode
|
// separate stream for subcode
|
||||||
fprintf(stderr, "Initing subcode CD stream\n");
|
|
||||||
cdStreamInit(&subcode_streams[cd_index], &cdd.toc, 1);
|
cdStreamInit(&subcode_streams[cd_index], &cdd.toc, 1);
|
||||||
return &subcode_streams[cd_index];
|
return &subcode_streams[cd_index];
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,7 +204,6 @@ GPGX_EX void gpgx_swap_disc(const toc_t* toc, int8 index)
|
||||||
{
|
{
|
||||||
if (toc)
|
if (toc)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Hotswapping CD index %d, TOC CRC32: %08lX\n", index, crc32(0, (const unsigned char*)toc, sizeof(toc_t)));
|
|
||||||
char header[0x210];
|
char header[0x210];
|
||||||
cd_index = index;
|
cd_index = index;
|
||||||
memcpy(&pending_toc, toc, sizeof(toc_t));
|
memcpy(&pending_toc, toc, sizeof(toc_t));
|
||||||
|
@ -212,7 +211,6 @@ GPGX_EX void gpgx_swap_disc(const toc_t* toc, int8 index)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Removing CD with index %d (NULL TOC), setting index to -1\n", index);
|
|
||||||
cd_index = -1;
|
cd_index = -1;
|
||||||
cdd_unload();
|
cdd_unload();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue