Fix iOS compilation & rix play code

adplug/dosbox_opl.h

@@ -31,7 +31,7 @@
  define Bits, Bitu, Bit32s, Bit32u, Bit16s, Bit16u, Bit8s, Bit8u here
  */
 
-#if _MSC_VER <= 1600
+#if defined(_MSC_VER) && _MSC_VER <= 1600
 #include <windows.h>
 #define uintptr_t ULONG
 #define intptr_t LONG

resampler.c

@@ -855,9 +855,11 @@ static void resampler_fill(resampler * r)
             if ( write_extra > SINC_WIDTH * 2 - 1 )
                 write_extra = SINC_WIDTH * 2 - 1;
             memcpy( r->buffer_out + resampler_buffer_size, r->buffer_out, write_extra * sizeof(r->buffer_out[0]) );
+#ifdef RESAMPLER_SSE
             if ( resampler_has_sse )
                 used = resampler_run_blep_sse( r, &out, out + write_size + write_extra );
             else
+#endif
                 used = resampler_run_blep( r, &out, out + write_size + write_extra );
             memcpy( r->buffer_out, r->buffer_out + resampler_buffer_size, write_extra * sizeof(r->buffer_out[0]) );
             if (!used)

rixplay.cpp

@@ -56,7 +56,7 @@ typedef struct tagRIXPLAYER
    enum { FADE_IN, FADE_OUT } FadeType; // fade in or fade out ?
    BOOL                       fLoop;
    BOOL                       fNextLoop;
-   BYTE                       buf[OPL_SAMPLERATE / 70 * sizeof(short) * PAL_CHANNELS];
+   BYTE                       buf[PAL_SAMPLE_RATE / 70 * sizeof(short) * PAL_CHANNELS];
    LPBYTE                     pos;
 } RIXPLAYER, *LPRIXPLAYER;
 
@@ -201,11 +201,11 @@ RIX_FillBuffer(
                return;
             }
          }
-          int sample_count = OPL_SAMPLERATE / 70;
+          int sample_count = PAL_SAMPLE_RATE / 70;
           if( gpRixPlayer->resampler[0] ) {
               
               unsigned int samples_written = 0;
-			  short *tempBuf = (short*)_alloca(64 * 2 * sizeof(short));
+			  short tempBuf[64 * PAL_CHANNELS]; // hard code on resampler defination
               short *finalBuf = (short*)gpRixPlayer->buf;
               
               while ( sample_count )
@@ -295,49 +295,40 @@ RIX_Init(
    {
       return -1;
    }
-#if PAL_CHANNELS == 2
-#   if USE_SURROUNDOPL
-#       if USE_DEMUOPL
-   gpRixPlayer->opl = new CSurroundopl(new CDemuopl(OPL_SAMPLERATE, true, false),
-                                       new CDemuopl(OPL_SAMPLERATE, true, false), true);
-#       elif USE_KEMUOPL
-   gpRixPlayer->opl = new CSurroundopl(new CKemuopl(OPL_SAMPLERATE, true, false),
-                                       new CKemuopl(OPL_SAMPLERATE, true, false), true);
-#       else
-   gpRixPlayer->opl = new CSurroundopl(new CEmuopl(OPL_SAMPLERATE, true, false),
-                                       new CEmuopl(OPL_SAMPLERATE, true, false), true);
-#       endif
-#   if OPL_SAMPLERATE != PAL_SAMPLE_RATE && USE_SSRC
-    resampler_init();
-    gpRixPlayer->resampler[0] = resampler_create();
-    gpRixPlayer->resampler[1] = resampler_create();
-    
-    resampler_set_quality( gpRixPlayer->resampler[0], RESAMPLER_QUALITY_MAX );
-    resampler_set_quality( gpRixPlayer->resampler[1], RESAMPLER_QUALITY_MAX );
-    
-    resampler_set_rate( gpRixPlayer->resampler[0], OPL_SAMPLERATE / (double)PAL_SAMPLE_RATE );
-    resampler_set_rate( gpRixPlayer->resampler[1], OPL_SAMPLERATE / (double)PAL_SAMPLE_RATE );
-#   else
-    gpRixPlayer->resampler[0] = 0;
-    gpRixPlayer->resampler[1] = 0;
-#   endif
-#   else
-#       if USE_DEMUOPL
-    gpRixPlayer->opl = new CDemuopl(OPL_SAMPLERATE, true, true);
-#       elif USE_KEMUOPL
-    gpRixPlayer->opl = new CKemuopl(OPL_SAMPLERATE, true, true);
-#       else
-    gpRixPlayer->opl = new CEmuopl(OPL_SAMPLERATE, true, true);
-#       endif
-#   endif
+
+#if PAL_CHANNELS == 2 && !USE_SURROUNDOPL
+   const bool opl_stereo = true;
+#else
+   const bool opl_stereo = false;
+#endif
+
+#if USE_DEMUOPL
+   typedef CDemuopl COpl;
+#elif USE_KEMUOPL
+   typedef CKemuopl COpl;
+#else
+   typedef CEmuopl  COpl;
+#endif
+
+#if PAL_CHANNELS == 2 && USE_SURROUNDOPL
+   gpRixPlayer->opl = new CSurroundopl(new COpl(OPL_SAMPLERATE, true, false),
+                                       new COpl(OPL_SAMPLERATE, true, false), true);
+#  if OPL_SAMPLERATE != PAL_SAMPLE_RATE && USE_SSRC
+   resampler_init();
+   gpRixPlayer->resampler[0] = resampler_create();
+   gpRixPlayer->resampler[1] = resampler_create();
+
+   resampler_set_quality( gpRixPlayer->resampler[0], RESAMPLER_QUALITY_MAX );
+   resampler_set_quality( gpRixPlayer->resampler[1], RESAMPLER_QUALITY_MAX );
+
+   resampler_set_rate( gpRixPlayer->resampler[0], OPL_SAMPLERATE / (double)PAL_SAMPLE_RATE );
+   resampler_set_rate( gpRixPlayer->resampler[1], OPL_SAMPLERATE / (double)PAL_SAMPLE_RATE );
+#  else
+   gpRixPlayer->resampler[0] = NULL;
+   gpRixPlayer->resampler[1] = NULL;
+#  endif
 #else
-#	if USE_DEMUOPL
-    gpRixPlayer->opl = new CDemuopl(OPL_SAMPLERATE, true, false);
-#	elif USE_KEMUOPL
-    gpRixPlayer->opl = new CKemuopl(OPL_SAMPLERATE, true, false);
-#	else
-   gpRixPlayer->opl = new CEmuopl(OPL_SAMPLERATE, true, false);
-#	endif
+   gpRixPlayer->opl = new COpl(OPL_SAMPLERATE, true, opl_stereo);
 #endif
 
    if (gpRixPlayer->opl == NULL)