[ros-diffs] [greatlrd] 22466: fixing audio setting so they are working again

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Wed Jun 21 19:41:15 2006
New Revision: 22466

URL: http://svn.reactos.ru/svn/reactos?rev=22466&view=rev
Log:
fixing audio setting so they are working again

Modified:
    trunk/tools/Qemu GUI/QEmu.cs
    trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe

Modified: trunk/tools/Qemu GUI/QEmu.cs
URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22466&r1=22465&r2=22466&view=diff
==============================================================================
--- trunk/tools/Qemu GUI/QEmu.cs (original)
+++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 19:41:15 2006
@@ -344,19 +344,49 @@
         {
             bool audio_on = (this.ES1370 | this.OPL2 | this.Soundblaster | this.Speaker);
 
+            bool audio_check = false;
             if (!audio_on)
                 return "";
 
             string buffer = "-soundhw ";
 
             if (this.Speaker)
-                buffer += "pcspk,";
+            {
+                buffer += "pcspk";
+                audio_check = true;
+            }
+
             if (this.Soundblaster)
+            {
+                if (audio_check == true)
+                    buffer += ",";
+                else
+                    audio_check = true;
+ 
                 buffer += "sb16,";
+            }
+
             if (this.OPL2)
-                buffer += "adlib,";
+            {
+                if (audio_check == true)
+                    buffer += ",";
+                else
+                    audio_check = true;
+
+                buffer += "adlib";
+            }
+
             if (this.ES1370)
-                buffer += "es1370,";
+            {
+                if (audio_check == true)
+                    buffer += ",";
+                else
+                    audio_check = true;
+
+                buffer += "es1370";
+            }
+            
+            buffer += " ";
 
             return buffer.Substring(0, buffer.Length - 1) + " "; 
         }
@@ -379,14 +409,14 @@
             if (this.SerialPort.Redirect)
             {
                 if (this.SerialPort.FileName.Length > 0)
-                    buffer = "-serial file:" + (char) 34 + this.SerialPort.FileName + (char) 34 + " ";
+                    buffer = "-serial file: \"" + this.SerialPort.FileName + "\" ";
             }
 
             /* Parallel port */
             if (this.ParallelPort.Redirect)
             {
                 if (this.ParallelPort.FileName.Length > 0)
-                    buffer += "-parallel  file:" + (char) 34 + this.ParallelPort.FileName + (char) 34 + " ";
+                    buffer += "-parallel  file: \"" + this.ParallelPort.FileName + "\" ";
             }
 
             /*  Standard VGA */

Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe
URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%20GUI.exe?rev=22466&r1=22465&r2=22466&view=diff
==============================================================================
Binary files - no diff available.