sndio backend for mozilla 1.8 branch; get rid of esound
This commit is contained in:
martynas
parent
951ab7d4a1
commit
1f17f363d7
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2009/04/11 13:47:37 martynas Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2009/05/03 15:47:27 martynas Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
|
||||
@ -7,7 +7,7 @@ COMMENT= integrated mozilla application suite
|
||||
|
||||
VER= 1.1.16
|
||||
DISTNAME= seamonkey-${VER}.source
|
||||
PKGNAME= seamonkey-${VER}
|
||||
PKGNAME= seamonkey-${VER}p0
|
||||
|
||||
SO_VERSION= 10.0
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
@ -81,8 +81,7 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
|
||||
nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \
|
||||
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
|
||||
|
||||
RUN_DEPENDS= :esound-*:audio/esound \
|
||||
:desktop-file-utils-*:devel/desktop-file-utils
|
||||
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
|
||||
WANTLIB= c glib-2.0 m pthread stdc++ \
|
||||
X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
|
||||
Xext Xfixes Xft Xi Xinerama Xrandr Xrender Xt atk-1.0 \
|
||||
@ -146,6 +145,7 @@ DATADIRS= chrome components defaults dictionaries greprefs \
|
||||
init.d plugins res searchplugins
|
||||
|
||||
post-extract:
|
||||
@cp -f ${FILESDIR}/nsSound.cpp ${WRKSRC}/widget/src/gtk2/
|
||||
.for i in ${BINLANGS} # normalize
|
||||
@mv -f ${WRKDIR}/$i/bin/* ${WRKDIR}/$i/
|
||||
@rmdir ${WRKDIR}/$i/bin
|
||||
|
||||
402
www/seamonkey/files/nsSound.cpp
Normal file
402
www/seamonkey/files/nsSound.cpp
Normal file
@ -0,0 +1,402 @@
|
||||
/* $OpenBSD: nsSound.cpp,v 1.1 2009/05/03 15:47:27 martynas Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2000
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Stuart Parmenter <pavlov@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "nscore.h"
|
||||
#include "plstr.h"
|
||||
#include "prlink.h"
|
||||
|
||||
#include "nsSound.h"
|
||||
|
||||
#include "nsIURL.h"
|
||||
#include "nsIFileURL.h"
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
#include <prthread.h>
|
||||
#include <sndio.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#define WAV_MIN_LENGTH 44
|
||||
|
||||
typedef struct sio_hdl * (PR_CALLBACK *SioOpenType)(char *,
|
||||
unsigned, int);
|
||||
typedef void (PR_CALLBACK *SioCloseType)(struct sio_hdl *);
|
||||
typedef int (PR_CALLBACK *SioSetparType)(struct sio_hdl *,
|
||||
struct sio_par *);
|
||||
typedef int (PR_CALLBACK *SioGetparType)(struct sio_hdl *,
|
||||
struct sio_par *);
|
||||
typedef int (PR_CALLBACK *SioStartType)(struct sio_hdl *);
|
||||
typedef size_t (PR_CALLBACK *SioWriteType)(struct sio_hdl *,
|
||||
void *, size_t);
|
||||
typedef int (PR_CALLBACK *SioEofType)(struct sio_hdl *);
|
||||
typedef void (PR_CALLBACK *SioInitparType)(struct sio_par *);
|
||||
|
||||
typedef struct {
|
||||
struct sio_hdl *sndio_hdl;
|
||||
void *audio;
|
||||
size_t audio_len;
|
||||
} SioThreadData;
|
||||
|
||||
static PRLibrary *sndio_lib = nsnull;
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
static void
|
||||
RunSioThread(void *arg)
|
||||
{
|
||||
SioThreadData *td;
|
||||
|
||||
td = (SioThreadData *)arg;
|
||||
|
||||
/* Close the stream if fail. */
|
||||
SioCloseType SioClose =
|
||||
(SioCloseType) PR_FindSymbol(sndio_lib, "sio_close");
|
||||
|
||||
/* Write stream. */
|
||||
SioWriteType SioWrite =
|
||||
(SioWriteType) PR_FindSymbol(sndio_lib, "sio_write");
|
||||
SioEofType SioEof =
|
||||
(SioEofType) PR_FindSymbol(sndio_lib, "sio_eof");
|
||||
if (!SioWrite || !SioEof) {
|
||||
if (SioClose)
|
||||
(*SioClose)(td->sndio_hdl);
|
||||
free(td->audio);
|
||||
free(td);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((*SioWrite)(td->sndio_hdl, (void *)td->audio,
|
||||
td->audio_len) == 0 && (*SioEof)(td->sndio_hdl)) {
|
||||
NS_WARNING("sio_write: couldn't write the stream");
|
||||
}
|
||||
|
||||
if (SioClose)
|
||||
(*SioClose)(td->sndio_hdl);
|
||||
|
||||
free(td->audio);
|
||||
free(td);
|
||||
}
|
||||
|
||||
nsSound::nsSound()
|
||||
{
|
||||
mInited = PR_FALSE;
|
||||
}
|
||||
|
||||
nsSound::~nsSound()
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSound::Init()
|
||||
{
|
||||
if (mInited)
|
||||
return NS_OK;
|
||||
if (sndio_lib)
|
||||
return NS_OK;
|
||||
|
||||
sndio_lib = PR_LoadLibrary("libsndio.so");
|
||||
if (!sndio_lib)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
mInited = PR_TRUE;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
#define GET_WORD(s, i) (s[i+1] << 8) | s[i]
|
||||
#define GET_DWORD(s, i) (s[i+3] << 24) | (s[i+2] << 16) | (s[i+1] << 8) | s[i]
|
||||
|
||||
NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
|
||||
nsISupports *context,
|
||||
nsresult aStatus,
|
||||
PRUint32 dataLen,
|
||||
const PRUint8 *data)
|
||||
{
|
||||
struct sio_hdl *sndio_hdl;
|
||||
struct sio_par sndio_par;
|
||||
SioThreadData *td;
|
||||
PRUint32 samples_per_sec = 0, avg_bytes_per_sec = 0, chunk_len = 0;
|
||||
PRUint16 format, channels = 1, bits_per_sample = 0;
|
||||
const PRUint8 *audio = nsnull;
|
||||
size_t audio_len = 0;
|
||||
|
||||
/* Print a load error on bad status, and return. */
|
||||
if (NS_FAILED(aStatus)) {
|
||||
return aStatus;
|
||||
}
|
||||
|
||||
if (dataLen < 4) {
|
||||
NS_WARNING("Sound stream too short to determine its type");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if (memcmp(data, "RIFF", 4)) {
|
||||
#ifdef DEBUG
|
||||
printf("We only support WAV files currently.\n");
|
||||
#endif
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if (dataLen <= WAV_MIN_LENGTH) {
|
||||
NS_WARNING("WAV files should be longer than 44 bytes.");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
PRUint32 i = 12;
|
||||
while (i + 7 < dataLen) {
|
||||
if (!memcmp(data + i, "fmt ", 4) && !chunk_len) {
|
||||
i += 4;
|
||||
|
||||
/* length of the rest of this subblock (should be 16 for PCM data */
|
||||
chunk_len = GET_DWORD(data, i);
|
||||
i += 4;
|
||||
|
||||
if (chunk_len < 16 || i + chunk_len >= dataLen) {
|
||||
NS_WARNING("Invalid WAV file: bad fmt chunk.");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
format = GET_WORD(data, i);
|
||||
i += 2;
|
||||
|
||||
channels = GET_WORD(data, i);
|
||||
i += 2;
|
||||
|
||||
samples_per_sec = GET_DWORD(data, i);
|
||||
i += 4;
|
||||
|
||||
avg_bytes_per_sec = GET_DWORD(data, i);
|
||||
i += 4;
|
||||
|
||||
/* block align */
|
||||
i += 2;
|
||||
|
||||
bits_per_sample = GET_WORD(data, i);
|
||||
i += 2;
|
||||
|
||||
/* we don't support WAVs with odd compression codes */
|
||||
if (chunk_len != 16)
|
||||
NS_WARNING("Extra format bits found in WAV. Ignoring");
|
||||
|
||||
i += chunk_len - 16;
|
||||
} else if (!memcmp(data + i, "data", 4)) {
|
||||
i += 4;
|
||||
if (!chunk_len) {
|
||||
NS_WARNING("Invalid WAV file: no fmt chunk found");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
audio_len = GET_DWORD(data, i);
|
||||
i += 4;
|
||||
|
||||
/* try to play truncated WAVs */
|
||||
if (i + audio_len > dataLen)
|
||||
audio_len = dataLen - i;
|
||||
|
||||
audio = data + i;
|
||||
break;
|
||||
} else {
|
||||
i += 4;
|
||||
i += GET_DWORD(data, i);
|
||||
i += 4;
|
||||
}
|
||||
}
|
||||
|
||||
if (!audio) {
|
||||
NS_WARNING("Invalid WAV file: no data chunk found");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
/* No audio data? well, at least the WAV was valid. */
|
||||
if (!audio_len)
|
||||
return NS_OK;
|
||||
|
||||
/* Open up connection to sndio. */
|
||||
SioOpenType SioOpen =
|
||||
(SioOpenType) PR_FindSymbol(sndio_lib, "sio_open");
|
||||
if (!SioOpen)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
sndio_hdl = SioOpen(NULL, SIO_PLAY, 0);
|
||||
if (sndio_hdl == NULL) {
|
||||
NS_WARNING("sio_open: couldn't open the stream");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
/* Close the stream if fail. */
|
||||
SioCloseType SioClose =
|
||||
(SioCloseType) PR_FindSymbol(sndio_lib, "sio_close");
|
||||
|
||||
/* Initialize parameters structure. */
|
||||
SioInitparType SioInitpar =
|
||||
(SioInitparType) PR_FindSymbol(sndio_lib, "sio_initpar");
|
||||
if (!SioInitpar) {
|
||||
if (SioClose)
|
||||
(*SioClose)(sndio_hdl);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
(*SioInitpar)(&sndio_par);
|
||||
sndio_par.bits = bits_per_sample;
|
||||
sndio_par.le = SIO_LE_NATIVE;
|
||||
sndio_par.pchan = channels;
|
||||
sndio_par.rate = samples_per_sec;
|
||||
sndio_par.sig = (bits_per_sample == 8) ? 0 : 1;
|
||||
|
||||
/* Set and get configuration set.
|
||||
Put the stream into writing state. */
|
||||
SioSetparType SioSetpar =
|
||||
(SioSetparType) PR_FindSymbol(sndio_lib, "sio_setpar");
|
||||
SioGetparType SioGetpar =
|
||||
(SioGetparType) PR_FindSymbol(sndio_lib, "sio_getpar");
|
||||
SioStartType SioStart =
|
||||
(SioStartType) PR_FindSymbol(sndio_lib, "sio_start");
|
||||
if (!SioSetpar || !SioGetpar || !SioStart) {
|
||||
if (SioClose)
|
||||
(*SioClose)(sndio_hdl);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if (!(*SioSetpar)(sndio_hdl, &sndio_par) ||
|
||||
!(*SioGetpar)(sndio_hdl, &sndio_par) || !(*SioStart)(sndio_hdl)) {
|
||||
NS_WARNING("sio_setpar: couldn't set configuration");
|
||||
if (SioClose)
|
||||
(*SioClose)(sndio_hdl);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
/* Check configuration. */
|
||||
if (sndio_par.bits != bits_per_sample || sndio_par.pchan != channels ||
|
||||
sndio_par.rate != samples_per_sec) {
|
||||
NS_WARNING("configuration is not available");
|
||||
if (SioClose)
|
||||
(*SioClose)(sndio_hdl);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if ((td = (SioThreadData *) malloc(sizeof(SioThreadData))) == NULL ||
|
||||
(td->audio = malloc(audio_len * sizeof(*audio))) == NULL) {
|
||||
if (SioClose)
|
||||
(*SioClose)(sndio_hdl);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
td->sndio_hdl = sndio_hdl;
|
||||
td->audio_len = audio_len;
|
||||
memcpy(td->audio, audio, audio_len);
|
||||
|
||||
PR_CreateThread(PR_SYSTEM_THREAD, RunSioThread, td, PR_PRIORITY_NORMAL,
|
||||
PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_METHOD nsSound::Beep()
|
||||
{
|
||||
::gdk_beep();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_METHOD nsSound::Play(nsIURL *aURL)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
if (!mInited)
|
||||
Init();
|
||||
|
||||
if (!sndio_lib)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsCOMPtr<nsIStreamLoader> loader;
|
||||
rv = NS_NewStreamLoader(getter_AddRefs(loader), aURL, this);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsSound::PlaySystemSound(const char *aSoundAlias)
|
||||
{
|
||||
if (!aSoundAlias)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
if (strcmp(aSoundAlias, "_moz_mailbeep") == 0) {
|
||||
return Beep();
|
||||
}
|
||||
|
||||
nsresult rv;
|
||||
nsCOMPtr <nsIURI> fileURI;
|
||||
|
||||
/* create a nsILocalFile and then a nsIFileURL from that */
|
||||
nsCOMPtr <nsILocalFile> soundFile;
|
||||
rv = NS_NewNativeLocalFile(nsDependentCString(aSoundAlias), PR_TRUE,
|
||||
getter_AddRefs(soundFile));
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
||||
rv = NS_NewFileURI(getter_AddRefs(fileURI), soundFile);
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
||||
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(fileURI,&rv);
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
||||
rv = Play(fileURL);
|
||||
|
||||
return rv;
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
|
||||
--- widget/src/gtk2/nsSound.cpp.orig Thu Aug 17 04:41:52 2006
|
||||
+++ widget/src/gtk2/nsSound.cpp Fri Sep 15 07:41:32 2006
|
||||
@@ -114,7 +114,7 @@ nsSound::Init()
|
||||
|
||||
EsdOpenSoundType EsdOpenSound;
|
||||
|
||||
- elib = PR_LoadLibrary("libesd.so.0");
|
||||
+ elib = PR_LoadLibrary("libesd.so");
|
||||
if (!elib) return NS_ERROR_FAILURE;
|
||||
|
||||
EsdOpenSound = (EsdOpenSoundType) PR_FindSymbol(elib, "esd_open_sound");
|
||||
Loading…
Reference in New Issue
Block a user