Merge branch 'master' of https://github.com/tildearrow/furnace into ymz280b
This commit is contained in:
commit
581f6d5d05
136 changed files with 82785 additions and 502 deletions
|
|
@ -118,12 +118,6 @@ bool DivSample::initInternal(unsigned char d, int count) {
|
|||
dataB=new unsigned char[(lengthB+255)&(~0xff)];
|
||||
memset(dataB,0,(lengthB+255)&(~0xff));
|
||||
break;
|
||||
case 7: // X68000 ADPCM
|
||||
if (dataX68!=NULL) delete[] dataX68;
|
||||
lengthX68=(count+1)/2;
|
||||
dataX68=new unsigned char[lengthX68];
|
||||
memset(dataX68,0,lengthX68);
|
||||
break;
|
||||
case 8: // 8-bit
|
||||
if (data8!=NULL) delete[] data8;
|
||||
length8=count;
|
||||
|
|
@ -676,9 +670,6 @@ void DivSample::render() {
|
|||
case 6: // ADPCM-B
|
||||
ymb_decode(dataB,data16,samples);
|
||||
break;
|
||||
case 7: // X6800 ADPCM
|
||||
oki6258_decode(dataX68,data16,samples);
|
||||
break;
|
||||
case 8: // 8-bit PCM
|
||||
for (unsigned int i=0; i<samples; i++) {
|
||||
data16[i]=data8[i]<<8;
|
||||
|
|
@ -736,10 +727,6 @@ void DivSample::render() {
|
|||
if (!initInternal(6,samples)) return;
|
||||
ymb_encode(data16,dataB,(samples+511)&(~0x1ff));
|
||||
}
|
||||
if (depth!=7) { // X68000 ADPCM
|
||||
if (!initInternal(7,samples)) return;
|
||||
oki6258_encode(data16,dataX68,samples);
|
||||
}
|
||||
if (depth!=8) { // 8-bit PCM
|
||||
if (!initInternal(8,samples)) return;
|
||||
for (unsigned int i=0; i<samples; i++) {
|
||||
|
|
@ -767,8 +754,6 @@ void* DivSample::getCurBuf() {
|
|||
return dataA;
|
||||
case 6:
|
||||
return dataB;
|
||||
case 7:
|
||||
return dataX68;
|
||||
case 8:
|
||||
return data8;
|
||||
case 9:
|
||||
|
|
@ -795,8 +780,6 @@ unsigned int DivSample::getCurBufLen() {
|
|||
return lengthA;
|
||||
case 6:
|
||||
return lengthB;
|
||||
case 7:
|
||||
return lengthX68;
|
||||
case 8:
|
||||
return length8;
|
||||
case 9:
|
||||
|
|
@ -903,7 +886,6 @@ DivSample::~DivSample() {
|
|||
if (dataQSoundA) delete[] dataQSoundA;
|
||||
if (dataA) delete[] dataA;
|
||||
if (dataB) delete[] dataB;
|
||||
if (dataX68) delete[] dataX68;
|
||||
if (dataBRR) delete[] dataBRR;
|
||||
if (dataVOX) delete[] dataVOX;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue