Add in @Overrides across the board, clean up the comments around them some, and remove
unneeded imports. I've got partially completed patches for narya & vilya, too, but nenya was the only one that wound up in a decent state after a friday evening puttering at it, killing time waiting on other things to finish. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@572 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -43,7 +43,7 @@ import static com.threerings.media.Log.log;
|
||||
*/
|
||||
public class Mp3Player extends MusicPlayer
|
||||
{
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public void init ()
|
||||
{
|
||||
// TODO: some stuff needs to move here, like setting up the line
|
||||
@@ -51,18 +51,19 @@ public class Mp3Player extends MusicPlayer
|
||||
// out (the format might always be known..).
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public void shutdown ()
|
||||
{
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public void start (final InputStream stream)
|
||||
throws Exception
|
||||
{
|
||||
// TODO: some stuff needs to come out of here and into init/shutdown
|
||||
// but we'll deal with all that later, d00d.
|
||||
_player = new Thread("narya mp3 relay") {
|
||||
@Override
|
||||
public void run () {
|
||||
AudioInputStream inStream = null;
|
||||
try {
|
||||
@@ -119,13 +120,13 @@ public class Mp3Player extends MusicPlayer
|
||||
_player.start();
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public void stop ()
|
||||
{
|
||||
_player = null;
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public void setVolume (float volume)
|
||||
{
|
||||
// TODO : line won't be null when we initialize it in the right place
|
||||
|
||||
@@ -92,7 +92,7 @@ public class SoundManager
|
||||
_strname = strname;
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return _strname;
|
||||
@@ -343,6 +343,7 @@ public class SoundManager
|
||||
final SoundKey skey = new SoundKey(PLAY, pkgPath, key, delay, _clipVol, pan);
|
||||
if (delay > 0) {
|
||||
new Interval() {
|
||||
@Override
|
||||
public void expired () {
|
||||
addToPlayQueue(skey);
|
||||
}
|
||||
@@ -420,6 +421,7 @@ public class SoundManager
|
||||
// and if we need a new thread, add it
|
||||
if (add) {
|
||||
Thread spooler = new Thread("narya SoundManager line spooler") {
|
||||
@Override
|
||||
public void run () {
|
||||
spoolerRun();
|
||||
}
|
||||
@@ -993,19 +995,19 @@ public class SoundManager
|
||||
return (stamp + MAX_SOUND_DELAY < System.currentTimeMillis());
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "SoundKey{cmd=" + cmd + ", pkgPath=" + pkgPath + ", key=" + key + "}";
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public int hashCode ()
|
||||
{
|
||||
return pkgPath.hashCode() ^ key.hashCode();
|
||||
}
|
||||
|
||||
@Override // documentation inherited
|
||||
@Override
|
||||
public boolean equals (Object o)
|
||||
{
|
||||
if (o instanceof SoundKey) {
|
||||
|
||||
Reference in New Issue
Block a user