Changed sound player, code will work on java 7

This commit is contained in:
jancoow
2015-06-05 20:45:39 +02:00
parent f9e6a90160
commit ab5fd4007d
6 changed files with 47 additions and 86 deletions
+2 -12
View File
@@ -35,7 +35,7 @@ public class SongHandler {
if(Window.ON_RASP)
dir = new File(System.getProperty( "user.home" ) + "/ColorStrike/Songs/");
else
dir = new File(System.getProperty( "user.home" ) + "/Documents/songs/");
dir = new File(System.getProperty( "user.home" ) + "/Documenten/songs/");
songs = DirScanner.scanDirectories(dir);
System.out.println(songs.size());
@@ -76,7 +76,7 @@ public class SongHandler {
currentSong = songs.get(currentIndex);
currentSongInstance = currentSong.getSongs().get(0);
p.stop();
p.close();
p.setClip(currentSong);
}
@@ -119,14 +119,4 @@ public class SongHandler {
p.play((int)currentSong.getSampleStart()*10);
}
}
public void pause()
{
p.pause();
}
public void stop()
{
p.stop();
}
}
-1
View File
@@ -51,7 +51,6 @@ public class PlayState extends GameState {
@Override
public void init() {
sh.stop();
sh.play();
for(int i=1; i<ButtonHandler.getButtons().size(); i++)