зеркало из https://github.com/mozilla/pjs.git
Fix nsSound to work on Linux again. Needed for IM prefs work. r=pavlov, a=amusil
This commit is contained in:
Родитель
8c0c7ea965
Коммит
0a7860dcef
|
@ -117,6 +117,9 @@ nsresult nsSound::Init()
|
||||||
|
|
||||||
EsdOpenSoundType EsdOpenSound;
|
EsdOpenSoundType EsdOpenSound;
|
||||||
|
|
||||||
|
if ( elib && alib )
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
elib = PR_LoadLibrary("libesd.so");
|
elib = PR_LoadLibrary("libesd.so");
|
||||||
|
|
||||||
if (!elib)
|
if (!elib)
|
||||||
|
@ -192,6 +195,7 @@ NS_METHOD nsSound::Play(nsIURI *aURI)
|
||||||
|
|
||||||
nsCOMPtr<nsIFileLocator> fl;
|
nsCOMPtr<nsIFileLocator> fl;
|
||||||
|
|
||||||
|
Init();
|
||||||
if ( !mInited && NS_FAILED((rv=AllocateBuffers())) )
|
if ( !mInited && NS_FAILED((rv=AllocateBuffers())) )
|
||||||
return rv;
|
return rv;
|
||||||
|
|
||||||
|
@ -282,7 +286,7 @@ NS_METHOD nsSound::Play(nsIURI *aURI)
|
||||||
else
|
else
|
||||||
mask |= ESD_STEREO;
|
mask |= ESD_STEREO;
|
||||||
|
|
||||||
fd = (*EsdPlayStreamFallback)(mask, (int) rate, "localhost", "mozillansSound");
|
fd = (*EsdPlayStreamFallback)(mask, (int) rate, NULL, "mozillansSound");
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче