Changeset 21841 for branches/gcc-kmk/src/winmm/mixer.cpp

Timestamp:

Dec 1, 2011, 10:19:11 PM (14 years ago)

Author:

dmik

Message:

Port WINMM, MCICDA and MCIWAVE DLLs to GCC/kBuild.

File:

• branches/gcc-kmk/src/winmm/mixer.cpp (modified) (5 diffs)

branches/gcc-kmk/src/winmm/mixer.cpp

@@ -34 +34 @@
 #include "waveoutdart.h"
 #include "winmm.h"
-#include "initwinmm.h"
+#include "initterm.h"
 #include "mixer.h"
 #include "mixeros2.h"
@@ -749 +749 @@
         //find line associated with this control
         lpMlc->dwLineID = -1;
-        for(int i=0;i<nrLines;i++) {
+        int i;
+        for(i=0;i<nrLines;i++) {
             for(int j=0;j<pmixerLines[i]->cControls;j++) {
                 if(pmixerLines[i]->Controls[j] == lpMlc->u.dwControlID) {
@@ -1086 +1087 @@
 #endif
         //search all lines (src & dest) for one with specified type
-        for(int i=0;i<nrLines;i++) {
+        int i;
+        for(i=0;i<nrLines;i++) {
             if(pmixerLines[i]->line.dwComponentType == lpMl->dwComponentType) {
                 break;
@@ -1130 +1132 @@
         //TODO: Should we compare mid, pid & pddname too? (must be initialized according to MSDN)
         //      (see below; unicode version doesn't copy pddname; change if these checks are required)
+        int i;
         for(int i=0;i<nrLines;i++) {
             if(pmixerLines[i]->line.Target.dwType == lpMl->Target.dwType) {
@@ -1371 +1374 @@
 
     memset(mixerDest, 0, sizeof(mixerDest));
-    for(int i=0;i<MIXER_DEST_MAX;i++) {
+    int i;
+    for(i=0;i<MIXER_DEST_MAX;i++) {
         memset(mixerDest[i].Connections, -1, sizeof(mixerDest[i].Connections));
         memset(mixerDest[i].Controls, -1, sizeof(mixerDest[i].Controls));