When music is stopped because the volume is turned to 0, don't
remove it from the playing music stack. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1996 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// $Id: SoundManager.java,v 1.30 2002/11/26 02:46:52 ray Exp $
|
// $Id: SoundManager.java,v 1.31 2002/11/26 18:54:39 ray Exp $
|
||||||
|
|
||||||
package com.threerings.media;
|
package com.threerings.media;
|
||||||
|
|
||||||
@@ -550,7 +550,7 @@ public class SoundManager
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case STOP:
|
case STOP:
|
||||||
shutdownMusic();
|
stopMusicPlayer();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -568,6 +568,14 @@ public class SoundManager
|
|||||||
protected void shutdownMusic ()
|
protected void shutdownMusic ()
|
||||||
{
|
{
|
||||||
_musicStack.clear();
|
_musicStack.clear();
|
||||||
|
stopMusicPlayer();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop the current music player.
|
||||||
|
*/
|
||||||
|
protected void stopMusicPlayer ()
|
||||||
|
{
|
||||||
if (_musicPlayer != null) {
|
if (_musicPlayer != null) {
|
||||||
_musicPlayer.stop();
|
_musicPlayer.stop();
|
||||||
_musicPlayer.shutdown();
|
_musicPlayer.shutdown();
|
||||||
|
|||||||
Reference in New Issue
Block a user