From: Latif Khalifa <latifer@streamgrid.net>
Date: Wed, 13 Jul 2011 10:50:32 +0000 (+0000)
Subject: Made sound initialization on Linux more resiliant
X-Git-Tag: 2.8~384
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8c85ae88f7b91b32536d57589b0b09534259e39;p=radegast%2Fradegast.git

Made sound initialization on Linux more resiliant

git-svn-id: https://radegast.googlecode.com/svn/trunk@987 f7a694da-4d33-11de-9ad6-1127a62b9fcd
---

diff --git a/Radegast/Core/Media/MediaManager.cs b/Radegast/Core/Media/MediaManager.cs
index f4c7d7e..463216f 100644
--- a/Radegast/Core/Media/MediaManager.cs
+++ b/Radegast/Core/Media/MediaManager.cs
@@ -188,17 +188,19 @@ namespace Radegast.Media
                 FMOD.CAPS caps = FMOD.CAPS.NONE;
                 FMOD.SPEAKERMODE speakermode = FMOD.SPEAKERMODE._5POINT1;
 
-                // Get the capabilities of the driver.
-                int minfrequency = 0, maxfrequency = 0;
-                StringBuilder name = new StringBuilder(128);
-                FMODExec(system.getDriverCaps(0, ref caps,
-                    ref minfrequency,
-                    ref maxfrequency,
-                    ref speakermode)
-                );
-
-                // Set FMOD speaker mode to what the driver supports.
-                FMODExec(system.setSpeakerMode(speakermode));
+                // Fancy param checking on Linux can cause init to fail
+                try
+                {
+                    // Get the capabilities of the driver.
+                    int minfrequency = 0, maxfrequency = 0;
+                    FMODExec(system.getDriverCaps(0, ref caps,
+                        ref minfrequency,
+                        ref maxfrequency,
+                        ref speakermode));
+                    // Set FMOD speaker mode to what the driver supports.
+                   FMODExec(system.setSpeakerMode(speakermode));
+                }
+                catch {}
 
                 // Forcing the ALSA sound system on Linux seems to avoid a CPU loop
                 if (System.Environment.OSVersion.Platform == PlatformID.Unix)
@@ -212,22 +214,27 @@ namespace Radegast.Media
                     FMODExec(system.setDSPBufferSize(1024, 10));
                 }
 
-                // Get driver information so we can check for a wierd one.
-                FMOD.GUID guid = new FMOD.GUID();
-                FMODExec(system.getDriverInfo(0, name, 128, ref guid));
-
-                // Sigmatel sound devices crackle for some reason if the format is pcm 16bit.
-                // pcm floating point output seems to solve it.
-                if (name.ToString().IndexOf("SigmaTel") != -1)
+                try
                 {
-                    FMODExec(system.setSoftwareFormat(
-                        48000,
-                        FMOD.SOUND_FORMAT.PCMFLOAT,
-                        0, 0,
-                        FMOD.DSP_RESAMPLER.LINEAR)
-                    );
+                    StringBuilder name = new StringBuilder(128);   
+                    // Get driver information so we can check for a wierd one.
+                    FMOD.GUID guid = new FMOD.GUID();
+                    FMODExec(system.getDriverInfo(0, name, 128, ref guid));
+    
+                    // Sigmatel sound devices crackle for some reason if the format is pcm 16bit.
+                    // pcm floating point output seems to solve it.
+                    if (name.ToString().IndexOf("SigmaTel") != -1)
+                    {
+                        FMODExec(system.setSoftwareFormat(
+                            48000,
+                            FMOD.SOUND_FORMAT.PCMFLOAT,
+                            0, 0,
+                            FMOD.DSP_RESAMPLER.LINEAR)
+                        );
+                    }
                 }
-
+                catch {}
+                
                 // Try to initialize with all those settings, and Max 32 channels.
                 FMOD.RESULT result = system.init(32, FMOD.INITFLAG.NORMAL, (IntPtr)null);
                 if (result == FMOD.RESULT.ERR_OUTPUT_CREATEBUFFER)
@@ -373,10 +380,10 @@ namespace Radegast.Media
                 {
                     FMODExec(system.set3DListenerAttributes(
                         0,
-                        ref listenerpos,	// Position
-                        ref ZeroVector,		// Velocity
-                        ref forward,		// Facing direction
-                        ref UpVector));	// Top of head
+                        ref listenerpos,    // Position
+                        ref ZeroVector,        // Velocity
+                        ref forward,        // Facing direction
+                        ref UpVector));    // Top of head
 
                     FMODExec(system.update());
                 }));