Commit Graph

37 Commits

Author SHA1 Message Date
Michael Bayne 8e69ff612e Some import cleanups from Dave.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@662 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-25 22:16:10 +00:00
Charlie Groves 4b038fb8e1 Keep updating the tick time even if the sound manager is null
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@659 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-23 20:09:36 +00:00
Michael Bayne e284b6cfc1 Unused import patrol.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@654 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-11 17:54:45 +00:00
Andrzej Kapolka 89f1f1938e Some changes to bring OpenAL code in line with OpenGL code: use a
Java object to represent each OpenAL object (listener, sources, 
and buffers) and delete the OpenAL object if the Java object is 
garbage-collected.  Added the full range of listener and source 
settings.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@653 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-10 23:55:25 +00:00
Andrzej Kapolka 5df6f85014 I don't think anything is using this. I'm moving it so that I
can extend it with Clyde-specific bits.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@652 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-10 00:50:46 +00:00
Charlie Groves 60d2febeda Allow streams and sounds to have their gain controlled individually as well as from the overall control
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@649 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-26 22:17:11 +00:00
Charlie Groves e4cdad7741 Start up streams on the sound queue thread and handle OpenAL barfing on startup
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@648 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-26 20:23:02 +00:00
Charlie Groves fff73d94cc Expose the SoundLoader
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@647 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-23 21:07:47 +00:00
Charlie Groves 135b25516e Hey, let's not just completely break locking and unlocking sounds
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@645 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-22 02:38:57 +00:00
Charlie Groves 329bedd523 Choose a random sound from multi-option sounds in the SoundLoader when told to
play a particular key.
Set the gain on streams before returning them in addition to during each update.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@644 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-22 02:02:54 +00:00
Charlie Groves c06de7d51f Add ogg streaming to OpenALSoundPlayer
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@642 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-21 05:33:19 +00:00
Charlie Groves 99fc1ddbf7 Uhh, probably makes sense to actually hook the volume setting up to the sound manager
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@640 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-21 01:43:08 +00:00
Charlie Groves 0abacd42d3 Give OpenALSoundPlayer its own thread and queue to keep it from sharing with the EDT and possibly blocking
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@639 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-20 23:31:21 +00:00
Andrzej Kapolka e399b4dd15 Avoid pesky stack overflows.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@635 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-19 21:11:32 +00:00
Dave Hoover 754566d011 Pedanticism police.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@632 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-15 23:19:44 +00:00
Charlie Groves 8a3c6c8614 There's no way to genericize the Comparable while using the static
ClipBuffer.makeKey to create them, and non-genericized Comparables make the
Baby Jesus(Nate) cry, so just drop the pretense and use String.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@631 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-15 22:38:46 +00:00
Charlie Groves fc32634412 Rename all the media.SoundManager stuff to variants on SoundPlayer to conflict
less with openal.SoundManager.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@625 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-14 00:50:17 +00:00
Michael Bayne 5c234af875 This needs to live in the openal package because all the OpenAL must not be
visible to things that don't want or care about OpenAL. Also, the openal
package is conditionally compiled, so this would have broken a Narya build that
didn't use the OpenAL libraries.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@624 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-13 22:49:34 +00:00
Charlie Groves e678d36262 Look at the big smart programmer using the library code instead of rolling his own, hacked-up shit
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@623 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-13 22:12:25 +00:00
Charlie Groves e4801b954f Pull the generic sound playing api from SoundManager up into
AbstractSoundManager and implement the actual sound playing with Java sound in
SoundManager and with OpenAL in OpenALSoundManager.  I left the SoundManager
name alone so nothing using it will need to change, but if nothing besides
yohoho is using it, I can refactor it to a more sane naming scheme.

Rip out all the music and alternative format stuff since it didn't work anyway.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@622 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-13 21:47:42 +00:00
Charlie Groves 7266e22085 Widening, modernization
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@620 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-11 04:34:50 +00:00
Charlie Groves 1949014c76 Exploratory house cleaning
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@611 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-07 18:11:31 +00:00
Michael Bayne e00b4ddd6b Switch to new logging API.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@510 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-05-27 22:55:10 +00:00
Eric Woroshow 81c5760863 Added an AL context. Provide a method in the sound manager to preload sound data.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@459 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-04-07 18:57:41 +00:00
Andrzej Kapolka 10b2587fba I don't remember putting that there!
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@455 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-03-21 02:02:09 +00:00
Andrzej Kapolka fcb5fa200c Removed dependency on JME for OggStreamDecoder (use JOrbis
directly).


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@454 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-03-21 02:00:20 +00:00
Dave Hoover 717dc79c02 Tabs -> spaces
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@268 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-06-26 00:07:47 +00:00
Michael Bayne b6f5317ad2 More header patrol.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@158 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-02-24 00:38:17 +00:00
Andrzej Kapolka 1af5a69266 Moved the code for registering extensions and creating instances to
StreamDecoder.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@154 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-02-09 23:18:40 +00:00
Andrzej Kapolka fc5459fb7d Fixed mp3 playing, refactored to avoid duplicating code.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@153 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-02-09 02:10:32 +00:00
Michael Bayne ea9f4d481e Non-functional MP3 playing support.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@152 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-02-08 19:04:59 +00:00
Dave Hoover 120e9c0db9 Actually substitute keywords (these files are chock full of stale $Id$ tags)
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@119 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-01-24 00:22:12 +00:00
Michael Bayne 9dadf30d2e Widened, demoted logging to debug.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@108 ed5b42cb-e716-0410-a449-f6a68f950b19
2006-12-30 01:25:57 +00:00
Mark Johnson c3f4992328 Set the holders to null after we've reclaimed the sounds.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@107 ed5b42cb-e716-0410-a449-f6a68f950b19
2006-12-22 02:16:34 +00:00
Mark Johnson d2aabbcfae Added the ability to stop and reclaim all the sources without fully
disposing the sound group.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@94 ed5b42cb-e716-0410-a449-f6a68f950b19
2006-12-14 23:00:21 +00:00
Mark Johnson 61b8e6792a Added the ability to check if a sound is currently playing.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@66 ed5b42cb-e716-0410-a449-f6a68f950b19
2006-10-27 18:33:24 +00:00
Michael Bayne c2117ee86d Behold, Nenya, Ring of Water and repository for our media and animation related
goodies, both Java 2D and LWJGL/JME 3D.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1 ed5b42cb-e716-0410-a449-f6a68f950b19
2006-06-23 18:07:28 +00:00