From 0a7860dcef42b43b419a2d3ed46ff7fe5e668c58 Mon Sep 17 00:00:00 2001 From: "syd%netscape.com" Date: Sat, 27 May 2000 10:56:23 +0000 Subject: [PATCH] Fix nsSound to work on Linux again. Needed for IM prefs work. r=pavlov, a=amusil --- widget/src/gtk/nsSound.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/widget/src/gtk/nsSound.cpp b/widget/src/gtk/nsSound.cpp index d5d2046268f..c687dc3d06c 100644 --- a/widget/src/gtk/nsSound.cpp +++ b/widget/src/gtk/nsSound.cpp @@ -117,6 +117,9 @@ nsresult nsSound::Init() EsdOpenSoundType EsdOpenSound; + if ( elib && alib ) + return NS_OK; + elib = PR_LoadLibrary("libesd.so"); if (!elib) @@ -192,6 +195,7 @@ NS_METHOD nsSound::Play(nsIURI *aURI) nsCOMPtr fl; + Init(); if ( !mInited && NS_FAILED((rv=AllocateBuffers())) ) return rv; @@ -282,7 +286,7 @@ NS_METHOD nsSound::Play(nsIURI *aURI) else mask |= ESD_STEREO; - fd = (*EsdPlayStreamFallback)(mask, (int) rate, "localhost", "mozillansSound"); + fd = (*EsdPlayStreamFallback)(mask, (int) rate, NULL, "mozillansSound"); if (fd < 0) { return NS_ERROR_FAILURE; }