Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#241482

Browse Source 
r=pedemont, sr=blizzard (platform specific)
OS/2 only - don't send WAV files to the WPS unless multimedia is installed
This commit is contained in:
mkaply%us.ibm.com 2004-04-24 11:22:52 +00:00
parent 186b6561f2
commit 94a63b7f6f
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
widget/src/os2/nsSound.cpp
View File

@ -43,6 +43,8 @@
#include "plstr.h"
#include <stdio.h>
#define INCL_DOS
#define INCL_DOSERRORS
#include <os2.h>
#include "nsSound.h"
@ -54,9 +56,29 @@
NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver)
static int gInitialized = 0;
static PRBool gMMPMInstalled = PR_FALSE;
static void
InitGlobals(void)
{
APIRET ulrc;
HMODULE hmod;
char LoadError[CCHMAXPATH];
ulrc = DosLoadModule(LoadError, CCHMAXPATH, "MMPM", &hmod);
if (ulrc == NO_ERROR) {
gMMPMInstalled = PR_TRUE;
}
gInitialized = 1;
}
////////////////////////////////////////////////////////////////////////
nsSound::nsSound()
{
if (!gInitialized) {
InitGlobals();
}
}
nsSound::~nsSound()
@ -92,7 +114,7 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
return NS_ERROR_FAILURE;
}
if (PL_strncmp(string, "RIFF", 4)) {
if (PL_strncmp(string, "RIFF", 4) || (!gMMPMInstalled)) {
#ifdef DEBUG
printf("We only support WAV files currently.\n");
#endif
@ -193,7 +215,8 @@ NS_IMETHODIMP nsSound::Init()
NS_IMETHODIMP nsSound::PlaySystemSound(const char *aSoundAlias)
{
/* We don't have a default mail sound on OS/2, so just beep */
if (strcmp("_moz_mailbeep", aSoundAlias) == 0) {
/* Also just beep if MMPM isn't installed */
if ((strcmp("_moz_mailbeep", aSoundAlias) == 0) || (!gMMPMInstalled)) {
Beep();
}
else {