audlegacy: Plugins/Input/adplug/core/rix.cpp comparison

comparison Plugins/Input/adplug/core/rix.cpp @ 1590:fd943ec96935 trunk

[svn] Sync with upstream. ADL is now dual licensed, and RIX has had a pitch fixup. Free warning fix included.

author	chainsaw
date	Thu, 24 Aug 2006 11:11:30 -0700
parents	705d4c089fce
children

comparison

equal deleted inserted replaced

-:ebc170f08767
+:fd943ec96935
 	  flag_mkf=1;
 	  f->seek(0);
 	  int offset=f->readInt(4);
 	  f->seek(offset);
 }
-if(f->readInt(4)!=0x55aa){ fp.close(f);return false; }
+if(f->readInt(2)!=0x55aa){ fp.close(f);return false; }
 file_buffer = new unsigned char [fp.filesize(f) + 1];
 f->seek(0);
 while(!f->eof())
 	file_buffer[i++]=f->readInt(1);
 length=i;
 }
 bool CrixPlayer::update()
 {
 	int_08h_entry();
-	return !dro_end;
+	return !play_end;
 }
 void CrixPlayer::rewind(int subsong)
 {
 I = 0; T = 0;
 mus_block = 0;
 ins_block = 0;
 rhythm = 0;
-mutex = 0;
 music_on = 0;
 pause_flag = 0;
 band = 0;
 band_low = 0;
 e0_reg_flag = 0;
 bd_modify = 0;
 sustain = 0;
-dro_end = 0;
+play_end = 0;
 pos = index = 0;
-memset(buffer, 0, sizeof(unsigned short) * 300);
+memset(f_buffer, 0, sizeof(unsigned short) * 300);
 memset(a0b0_data2, 0, sizeof(unsigned short) * 11);
 memset(a0b0_data3, 0, 18);
 memset(a0b0_data4, 0, 18);
 memset(a0b0_data5, 0, 96);
 memset(addrs_head, 0, 96);
 /*------------------Implemention----------------------------*/
 inline void CrixPlayer::set_new_int()
 {
 if(!ad_initial()) exit(1);
-prep_int();
 }
 /*----------------------------------------------------------*/
 inline void CrixPlayer::Pause()
 {
 register unsigned short i;
 }
 /*----------------------------------------------------------*/
 inline unsigned short CrixPlayer::ad_initial()
 {
 register unsigned short i,j,k = 0;
-for(i=0;i<25;i++) crc_trans(i,i*4);
+for(i=0;i<25;i++)
+{
+	f_buffer[i*12]=(unsigned int)((i*24+10000)*0.27461678223+4)>>3;
+	for(int t=1;t<12;t++)
+		f_buffer[i*12+t]=(unsigned int)((double)f_buffer[i*12+t-1]*1.06);
+}
 for(i=0;i<8;i++)
 for(j=0;j<12;j++)
 {
 	a0b0_data5[k] = i;
 	addrs_head[k] = j;
 //for(i=0;i<18;i++) ad_bop(0xE0+reg_data[i],0);
 //ad_bop(1,e0_reg_flag);
 return 1;//ad_test();
 }
 /*----------------------------------------------------------*/
-inline void CrixPlayer::crc_trans(unsigned short index,unsigned short v)
-{
-register unsigned short i;
-unsigned int res; unsigned short low;
-res = strm_and_fr(v);
-low = res;
-buffer[index*12] = (low+4)>>3;
-for(i=1;i<=11;i++)
-{
-res = (unsigned int)((double)res * 1.06);
-buffer[index*12+i] = res>>3;
-}
-}
-/*----------------------------------------------------------*/
-inline void CrixPlayer::prep_int()
-{
-mutex = 0;
-}
-/*----------------------------------------------------------*/
 inline void CrixPlayer::ad_bop(unsigned short reg,unsigned short value)
 {
 if(reg == 2 || reg == 3)
 AdPlug_LogWrite("switch OPL2/3 mode!\n");
 opl->write(reg & 0xff, value & 0xff);
-}
-/*------------------------------------------------------*/
-inline unsigned short CrixPlayer::ad_test()   /* Test the SoundCard */
-{
-ad_bop(0x04,0x60);
-ad_bop(0x04,0x80);
-ad_bop(0x02,0xFF);
-ad_bop(0x04,0x21);
-ad_bop(0x04,0x60);
-ad_bop(0x04,0x80);
-return 1;
 }
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::int_08h_entry()
 {
 unsigned short band_sus = 1;
 while(band_sus)
 {
-if(sustain <= 0 && mutex == 0)
+if(sustain <= 0)
 	{
-	  mutex++;
 	  band_sus = rix_proc();
 	  if(band_sus) sustain += band_sus;
-	  mutex--;
+else
-	  if(band_sus == 0)
 	    {
-	      dro_end=1;
+play_end=1;
 	      break;
 	    }
 	}
 else
 	{
 int		i;
 unsigned char	*baddr = (&buf_addr[ins_block])+(band_low<<6);
 for(i = 0; i < 28; i++)
 insbuf[i] = (baddr[i * 2 + 1] << 8) + baddr[i * 2];
-//   memcpy(insbuf,(&buf_addr[ins_block])+(band_low<<6),56);
 }
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::rix_90_pro(unsigned short ctrl_l)
 {
 if(rhythm == 0 || ctrl_l < 6)
 {
 ins_to_reg(modify[ctrl_l*2],insbuf,insbuf[26]);
 ins_to_reg(modify[ctrl_l*2+1],insbuf+13,insbuf[27]);
 return;
 }
-else
+else if(ctrl_l > 6)
-{
-if(ctrl_l > 6)
 	{
 	  ins_to_reg(modify[ctrl_l*2+6],insbuf,insbuf[26]);
 	  return;
 	}
 else
 	{
 	  ins_to_reg(12,insbuf,insbuf[26]);
 	  ins_to_reg(15,insbuf+13,insbuf[27]);
 	  return;
 	}
-}
 }
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::rix_A0_pro(unsigned short ctrl_l,unsigned short index)
 {
 if(rhythm == 0 || ctrl_l <= 6)
 }
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::prepare_a0b0(unsigned short index,unsigned short v)  /* important !*/
 {
 short high = 0,low = 0; unsigned int res;
-low = ((unsigned short)(v-0x2000))*0x19;
+int res1 = (v-0x2000)*0x19;
-high = ((short)v)<0x2000?0xFFFF:0;
+if(res1 == (int)0xff) return;
-if(low == 0xFF && high == 0) return;
+low = res1/0x2000;
-res = ((((unsigned int)high)<<16)|low)/0x2000;
-low = res&0xFFFF;
 if(low < 0)
 {
 low = 0x18-low; high = (signed short)low<0?0xFFFF:0;
 res = high; res<<=16; res+=low;
 low = ((signed short)res)/(signed short)0xFFE7;
 unsigned short data; unsigned short i = p2+a0b0_data2[index];
 a0b0_data4[index] = p3;
 a0b0_data3[index] = p2;
 i = ((signed short)i<=0x5F?i:0x5F);
 i = ((signed short)i>=0?i:0);
-data = buffer[addrs_head[i]+displace[index]/2];
+data = f_buffer[addrs_head[i]+displace[index]/2];
 ad_bop(0xA0+index,data);
 data = a0b0_data5[i]*4+(p3<1?0:0x20)+((data>>8)&3);
 ad_bop(0xB0+index,data);
 }
 /*--------------------------------------------------------------*/
 }
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::music_ctrl()
 {
 register int i;
-music_on = 0;
 for(i=0;i<11;i++)
 switch_ad_bd(i);
 }
-/*----------------------------------------------------------------------*/
-inline unsigned int CrixPlayer::strm_and_fr(unsigned short parm)
-{
-return (int)(((unsigned int)parm*6+10000)*0.27461678223);
-}

Mercurial > audlegacy

comparison Plugins/Input/adplug/core/rix.cpp @ 1590:fd943ec96935 trunk