=Youtube Fixes
This commit is contained in:
@@ -20,7 +20,6 @@ public class AudioUtils
|
|||||||
public AudioManager am;
|
public AudioManager am;
|
||||||
public final AudioPlayer player;
|
public final AudioPlayer player;
|
||||||
public final AudioPlayerManager playerManager;
|
public final AudioPlayerManager playerManager;
|
||||||
// private boolean isPlaying = false;
|
|
||||||
private ArrayList <AudioTrack> playlist = new ArrayList<AudioTrack>();
|
private ArrayList <AudioTrack> playlist = new ArrayList<AudioTrack>();
|
||||||
|
|
||||||
|
|
||||||
@@ -86,11 +85,8 @@ public class AudioUtils
|
|||||||
|
|
||||||
public class SmallAudio implements AudioLoadResultHandler
|
public class SmallAudio implements AudioLoadResultHandler
|
||||||
{
|
{
|
||||||
// private AudioPlayer player;
|
|
||||||
|
|
||||||
private SmallAudio(AudioPlayer player)
|
private SmallAudio(AudioPlayer player)
|
||||||
{
|
{
|
||||||
// this.player = player;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public void loadFailed(FriendlyException arg0) { }
|
@Override public void loadFailed(FriendlyException arg0) { }
|
||||||
@@ -117,37 +113,15 @@ public class AudioUtils
|
|||||||
} catch (InterruptedException e) {}
|
} catch (InterruptedException e) {}
|
||||||
if(player.getPlayingTrack() == null)
|
if(player.getPlayingTrack() == null)
|
||||||
{
|
{
|
||||||
System.out.println("HERE");
|
MusicController control = new MusicController(player, playlist);
|
||||||
startPlay(player);
|
control.start();
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startPlay(AudioPlayer player)
|
|
||||||
{
|
|
||||||
do
|
|
||||||
{
|
|
||||||
if(!playlist.isEmpty())
|
|
||||||
{
|
|
||||||
player.startTrack(playlist.get(0), false);
|
|
||||||
playlist.remove(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
while(!playlist.isEmpty());
|
|
||||||
}
|
|
||||||
|
|
||||||
public String skipVideo(AudioPlayer player)
|
public String skipVideo(AudioPlayer player)
|
||||||
{
|
{
|
||||||
player.stopTrack();
|
player.stopTrack();
|
||||||
try
|
|
||||||
{
|
|
||||||
playlist.remove(0);
|
|
||||||
player.getPlayingTrack();
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
return "Stopped";
|
|
||||||
}
|
|
||||||
return "Skipped";
|
return "Skipped";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,3 +137,39 @@ public class AudioUtils
|
|||||||
return playlist;
|
return playlist;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class MusicController extends Thread
|
||||||
|
{
|
||||||
|
AudioPlayer player;
|
||||||
|
private ArrayList <AudioTrack> playlist;
|
||||||
|
|
||||||
|
public MusicController(AudioPlayer player, ArrayList <AudioTrack> playlist)
|
||||||
|
{
|
||||||
|
this.player = player;
|
||||||
|
this.playlist = playlist;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
AudioTrack nowPlaying = null;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if(!playlist.isEmpty() || nowPlaying != null)
|
||||||
|
{
|
||||||
|
if(player.getPlayingTrack() == null)
|
||||||
|
{
|
||||||
|
if(playlist.isEmpty())
|
||||||
|
nowPlaying = null;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nowPlaying = playlist.get(0);
|
||||||
|
playlist.remove(0);
|
||||||
|
}
|
||||||
|
player.startTrack(nowPlaying, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while(!playlist.isEmpty() || player.getPlayingTrack() != null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user