neviyn/musicplayer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed some gst threading behaviour to prevent unescaped thread interruptions.

Browse Source
This commit is contained in:
neviyn 2016-08-27 19:43:32 +01:00
parent 337ed9c076
commit 53e4f47029
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/musicplayer/player/GStreamerPlayer.java
View File

@ -22,7 +22,7 @@ public class GStreamerPlayer implements IPlayer{
private final PlayBin2 playBin;
private InternalThread internalThread;
private final InternalThread internalThread = new InternalThread();
private Thread thread;
private Song currentSong;
private final PlayerCallbackInterface callbackInterface;
@ -62,9 +62,9 @@ public class GStreamerPlayer implements IPlayer{
playSong(currentSong);
else
playSong(playlist.getNext(currentSong));
} catch (InterruptedException | StartPlayingException e) {
} catch (StartPlayingException e) {
e.printStackTrace();
}
} catch (InterruptedException ignored){}
});
callbackThing.start();
});
@ -108,8 +108,10 @@ public class GStreamerPlayer implements IPlayer{
* @throws StartPlayingException
*/
private void playSong(Song inputSong) throws StartPlayingException {
if (playBin.getState() == State.PLAYING)
if (playBin.getState() == State.PLAYING) {
internalThread.stop();
stop();
}
if(playBin.getState() == State.PAUSED && inputSong == currentSong) {
resume();
return;
@ -125,11 +127,10 @@ public class GStreamerPlayer implements IPlayer{
return;
}
playBin.setURI(songFile.toURI());
internalThread = new InternalThread();
thread = new Thread(internalThread, "GSTThread");
setVolume(currentVolume);
playBin.play();
if(playBin.getState() == State.PLAYING) {
thread = new Thread(internalThread, "GSTThread");
thread.start();
while (true) {
if (playBin.queryDuration().getSeconds() > 0 || playBin.queryDuration().getNanoSeconds() > 0) break;