2007-1-3 Keishi Suenaga <skeishi@yahoo.co.jp>

    Fix -iW and timiditydrv.dll sound problem.
	* timidity/portaudio_a.c: remove broken acntl()s.

diff --git a/ChangeLog b/ChangeLog
index 1e2c59a..af484c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-1-3  Keishi Suenaga <skeishi@yahoo.co.jp>
+
+    Fix -iW and timiditydrv.dll sound problem.
+       * timidity/portaudio_a.c: remove broken acntl()s.
+
 2007-1-1  Keishi Suenaga <skeishi@yahoo.co.jp>
 
        * timidity/timidity.c

diff --git a/timidity/portaudio_a.c b/timidity/portaudio_a.c
index 95bbbc6..81c1966 100644 (file)
--- a/timidity/portaudio_a.c
+++ b/timidity/portaudio_a.c
@@ -603,7 +603,7 @@ static int acntl(int request, void *arg)
 {
     switch(request)
     {
-
+/*     // NOT WORK
       case PM_REQ_GETQSIZ:
                 *(int *)arg = bytesPerInBuffer*2;
        return 0;
@@ -616,20 +616,18 @@ static int acntl(int request, void *arg)
                 *(int *)arg = pa_data.samplesToGo;
        return 0;
                //break;
-      case PM_REQ_DISCARD:
+*/
+       case PM_REQ_DISCARD:
       case PM_REQ_FLUSH:
-       pa_data.samplesToGo=0;
-       pa_data.bufpoint=pa_data.bufepoint;
-       err = Pa_AbortStream( stream );
-       if( (err!=paStreamIsStopped) && (err!=paNoError) ) goto error;
-               return 0;
-               //break;
-//      case PM_REQ_FLUSH:
-//     err = Pa_StopStream( stream );
+//     pa_data.samplesToGo=0;
+//     pa_data.bufpoint=pa_data.bufepoint;
+//     err = Pa_AbortStream( stream );
 //     if( (err!=paStreamIsStopped) && (err!=paNoError) ) goto error;
-//             return -1;
+               return 0;
+
                //break;
-      case PM_REQ_RATE:  //* NOT WORK *
+/*
+    case PM_REQ_RATE:  //* NOT WORK *
        {
                int i;
                double sampleRateBack;
@@ -646,7 +644,7 @@ static int acntl(int request, void *arg)
                }
        }
        //break;
-
+ */
       case PM_REQ_PLAY_START: //* Called just before playing *
       case PM_REQ_PLAY_END: //* Called just after playing *
         return 0;