[musikcube] r371 committed - Added precaching of next track when playing track is almost finished.
codesite...@google.com
Author: onnerby
Date: Sun Aug 9 13:57:19 2009
Log: Added precaching of next track when playing track is almost finished.
http://code.google.com/p/musikcube/source/detail?r=371
Modified:
/trunk/src/android/res/layout/main.xml
/trunk/src/android/res/menu/default_menu.xml
/trunk/src/android/res/values/strings.xml
/trunk/src/android/src/org/musikcube/CategoryList.java
/trunk/src/android/src/org/musikcube/PlayerControl.java
/trunk/src/android/src/org/musikcube/core/Player.java
/trunk/src/android/src/org/musikcube/core/TrackPlayer.java
/trunk/src/android/src/org/musikcube/main.java
=======================================
--- /trunk/src/android/res/layout/main.xml Wed Aug 5 16:16:30 2009
+++ /trunk/src/android/res/layout/main.xml Sun Aug 9 13:57:19 2009
@@ -13,6 +13,7 @@
<TextView android:id="@+id/TextView01"
android:layout_height="wrap_content" android:text="Browse by:"
android:layout_width="fill_parent"
android:background="@color/headlineColor" android:textSize="16sp"
android:padding="4sp"></TextView>
<Button android:layout_height="wrap_content"
android:layout_width="fill_parent" android:textSize="22sp"
android:text="Genre" android:id="@+id/GenresButton"></Button>
<Button android:layout_height="wrap_content"
android:layout_width="fill_parent" android:textSize="22sp"
android:id="@+id/ArtistsButton" android:text="Artist"></Button>
+
</LinearLayout>
<TextView android:id="@+id/StatusView" android:text="Status: -"
android:layout_width="fill_parent"
android:background="@color/headlineColor" android:textSize="16sp"
android:padding="4sp" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_weight="0.1"></TextView>
=======================================
--- /trunk/src/android/res/menu/default_menu.xml Wed Jul 29 15:56:39 2009
+++ /trunk/src/android/res/menu/default_menu.xml Sun Aug 9 13:57:19 2009
@@ -1,2 +1,5 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"><item
android:title="@string/menu_settings" android:id="@+id/context_settings"
android:enabled="true" android:visible="true"></item>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:title="@string/menu_browse" android:id="@+id/context_browse"
android:enabled="true" android:visible="true"></item>
+<item android:title="@string/menu_controls"
android:id="@+id/context_controls" android:enabled="true"
android:visible="true"></item>
+<item android:title="@string/menu_settings"
android:id="@+id/context_settings" android:enabled="true"
android:visible="true"></item>
</menu>
=======================================
--- /trunk/src/android/res/values/strings.xml Wed Aug 5 16:16:30 2009
+++ /trunk/src/android/res/values/strings.xml Sun Aug 9 13:57:19 2009
@@ -16,4 +16,6 @@
<string name="queryport">10543</string>
<string name="httpport">10544</string>
<color name="headlineColor">#333333</color>
+<string name="menu_controls">Player controls</string>
+<string name="menu_browse">Browse</string>
</resources>
=======================================
--- /trunk/src/android/src/org/musikcube/CategoryList.java Wed Aug 5
16:16:30 2009
+++ /trunk/src/android/src/org/musikcube/CategoryList.java Sun Aug 9
13:57:19 2009
@@ -14,6 +14,9 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
@@ -219,4 +222,26 @@
startService(new Intent(this, org.musikcube.Service.class));
}
-}
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.default_menu, menu);
+ return true;
+ }
+
+ public boolean onOptionsItemSelected(MenuItem item) {
+
//Log.i("MC2.onContextItemSelected","item "+item.getItemId()+" "+R.id.context_settings);
+ switch (item.getItemId()) {
+ case R.id.context_settings:
+ startActivity(new Intent(this, org.musikcube.Preferences.class));
+ return true;
+ case R.id.context_browse:
+ startActivity(new Intent(this, org.musikcube.main.class));
+ return true;
+ case R.id.context_controls:
+ startActivity(new Intent(this, org.musikcube.PlayerControl.class));
+ return true;
+ default:
+ return super.onContextItemSelected(item);
+ }
+ }
+}
=======================================
--- /trunk/src/android/src/org/musikcube/PlayerControl.java Thu Aug 6
15:57:23 2009
+++ /trunk/src/android/src/org/musikcube/PlayerControl.java Sun Aug 9
13:57:19 2009
@@ -15,6 +15,9 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
@@ -219,4 +222,29 @@
seconds+=0.1; updatecount();
} }, 100, 100);
*/
-}
+
+
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.default_menu, menu);
+ return true;
+ }
+
+ public boolean onOptionsItemSelected(MenuItem item) {
+
//Log.i("MC2.onContextItemSelected","item "+item.getItemId()+" "+R.id.context_settings);
+ switch (item.getItemId()) {
+ case R.id.context_settings:
+ startActivity(new Intent(this, org.musikcube.Preferences.class));
+ return true;
+ case R.id.context_browse:
+ startActivity(new Intent(this, org.musikcube.main.class));
+ return true;
+ case R.id.context_controls:
+ startActivity(new Intent(this, org.musikcube.PlayerControl.class));
+ return true;
+ default:
+ return super.onContextItemSelected(item);
+ }
+ }
+
+}
=======================================
--- /trunk/src/android/src/org/musikcube/core/Player.java Thu Aug 6
15:57:23 2009
+++ /trunk/src/android/src/org/musikcube/core/Player.java Sun Aug 9
13:57:19 2009
@@ -16,6 +16,7 @@
private ArrayList<TrackPlayer> playingTracks = new
ArrayList<TrackPlayer>();
private TrackPlayer currentPlayer;
+ private TrackPlayer nextPlayer;
public android.app.Service service;
@@ -51,29 +52,57 @@
this.Play();
}
+
+ private TrackPlayer PrepareTrack(int position){
+ synchronized(this.lock){
+ if(this.nowPlaying.size()>position && position>=0){
+ int trackId = this.nowPlaying.get(position);
+ String url
= "http://"+this.library.host+":"+this.library.httpPort+"/track/?track_id="+trackId+"&auth_key="+this.library.authorization;
+ TrackPlayer player = new TrackPlayer(url,trackId);
+ return player;
+ }
+ }
+ return null;
+ }
public void Play(){
this.Startup();
this.StopAllTracks();
-
+
+ TrackPlayer newPlayer = null;
synchronized(this.lock){
- String url
= "http://"+this.library.host+":"+this.library.httpPort+"/track/?track_id="+this.nowPlaying.get(this.position)+"&auth_key="+this.library.authorization;
- TrackPlayer player = new TrackPlayer(url,true);
- player.listener = this;
- this.playingTracks.add(player);
- this.currentPlayer = player;
-
- if(this.listener!=null){
- this.listener.OnTrackUpdate();
- this.listener.OnTrackBufferUpdate(0);
- this.listener.OnTrackPositionUpdate(0);
+ if(this.nowPlaying.size()>position && position>=0){
+ int trackId = this.nowPlaying.get(position);
+ if(this.nextPlayer!=null){
+ if(this.nextPlayer.trackId==trackId){
+ newPlayer = this.nextPlayer;
+ this.nextPlayer = null;
+ }else{
+ // Something wrong here, not the prepared track
+ this.nextPlayer.Stop();
+ this.nextPlayer = null;
+ }
+ }
+ if(newPlayer==null){
+ newPlayer = this.PrepareTrack(this.position);
+ }
+ this.playingTracks.add(newPlayer);
+ this.currentPlayer = newPlayer;
+ newPlayer.listener = this;
+ newPlayer.Play();
+
+ if(this.listener!=null){
+ this.listener.OnTrackUpdate();
+ this.listener.OnTrackBufferUpdate(0);
+ this.listener.OnTrackPositionUpdate(0);
+ }
}
}
}
///////////////////////////////
- // Inteface for updated track
+ // Interface for updated track
public interface OnTrackUpdateListener{
public void OnTrackUpdate();
public void OnTrackBufferUpdate(int percent);
@@ -147,10 +176,12 @@
}
public void OnTrackStatusUpdate(TrackPlayer trackPlayer,int status) {
-// this.Next();
- Intent intent = new Intent(this.service, org.musikcube.Service.class);
+ if(status==TrackPlayer.STATUS_EXIT){
+ this.Next();
+ }
+/* Intent intent = new Intent(this.service, org.musikcube.Service.class);
intent.putExtra("org.musikcube.Service.action", "next");
- this.service.startService(intent);
+ this.service.startService(intent);*/
}
public int GetCurrentTrackId(){
@@ -182,5 +213,13 @@
}
return 0;
}
+
+ public void OnTrackAlmostDone(TrackPlayer trackPlayer) {
+ synchronized(this.lock){
+ if(this.nextPlayer==null){
+ this.nextPlayer = this.PrepareTrack(this.position+1);
+ }
+ }
+ }
}
=======================================
--- /trunk/src/android/src/org/musikcube/core/TrackPlayer.java Thu Aug 6
15:57:23 2009
+++ /trunk/src/android/src/org/musikcube/core/TrackPlayer.java Sun Aug 9
13:57:19 2009
@@ -4,18 +4,20 @@
public class TrackPlayer implements Runnable,
MediaPlayer.OnCompletionListener,
MediaPlayer.OnErrorListener,MediaPlayer.OnBufferingUpdateListener {
+ public int trackId = 0;
private Thread thread;
private String url;
private java.lang.Object lock = new java.lang.Object();
private MediaPlayer mediaPlayer;
private int buffer = 0;
+ private boolean almostDoneSend = false;
private int status = 1;
- private static final int STATUS_PREPARED = 1;
- private static final int STATUS_PLAYING = 2;
- private static final int STATUS_PAUSE = 3;
- private static final int STATUS_EXIT = 10;
+ public static final int STATUS_PREPARED = 1;
+ public static final int STATUS_PLAYING = 2;
+ public static final int STATUS_PAUSE = 3;
+ public static final int STATUS_EXIT = 10;
public void run() {
synchronized(this.lock){
@@ -44,37 +46,50 @@
this.mediaPlayer.start();
synchronized(this.lock){
- while(this.status==STATUS_PLAYING)
- this.lock.wait();
+ while(this.status==STATUS_PLAYING){
+ if(!this.almostDoneSend){
+ int duration = this.mediaPlayer.getDuration();
+ int position = this.mediaPlayer.getCurrentPosition();
+ if(duration>0 && position+10000>duration){
+ // The track is almost done
+ this.almostDoneSend = true;
+ if(this.listener!=null){
+ this.listener.OnTrackAlmostDone(this);
+ }
+ }
+ }
+ this.lock.wait(3000);
+
+ }
}
this.mediaPlayer.stop();
} catch (Exception e) {
- // TODO Auto-generated catch block
- synchronized(this.lock){
- this.status = STATUS_EXIT;
- }
+ }
+ synchronized(this.lock){
+ this.status = STATUS_EXIT;
}
this.CallListener();
}
- public TrackPlayer(String url){
+ public TrackPlayer(String url,int trackId){
+ this.trackId = trackId;
this.url = url;
this.thread = new Thread(this);
this.thread.start();
}
- public TrackPlayer(String url,boolean start){
+/* public TrackPlayer(String url,boolean start){
this.url = url;
if(start==true){
this.status = STATUS_PLAYING;
}
this.thread = new Thread(this);
this.thread.start();
- }
+ }*/
private void Exit(){
synchronized(this.lock){
@@ -101,15 +116,13 @@
}
}
- public boolean Play(){
+ public void Play(){
synchronized(this.lock){
if(this.status==STATUS_PLAYING || this.status==STATUS_PREPARED){
this.status = STATUS_PLAYING;
- this.lock.notifyAll();
- return true;
- }
- }
- return false;
+ }
+ this.lock.notifyAll();
+ }
}
private void CallListener(){
@@ -126,6 +139,7 @@
public interface OnTrackStatusListener{
public void OnTrackStatusUpdate(TrackPlayer trackPlayer,int status);
+ public void OnTrackAlmostDone(TrackPlayer trackPlayer);
}
public OnTrackStatusListener listener = null;
=======================================
--- /trunk/src/android/src/org/musikcube/main.java Wed Aug 5 16:16:30 2009
+++ /trunk/src/android/src/org/musikcube/main.java Sun Aug 9 13:57:19 2009
@@ -68,10 +68,15 @@
public boolean onOptionsItemSelected(MenuItem item) {
//Log.i("MC2.onContextItemSelected","item "+item.getItemId()+" "+R.id.context_settings);
switch (item.getItemId()) {
- case R.id.context_settings:
- Intent intent = new Intent(main.this, Preferences.class);
- startActivity(intent);
- return true;
+ case R.id.context_settings:
+ startActivity(new Intent(this, org.musikcube.Preferences.class));
+ return true;
+ case R.id.context_browse:
+ startActivity(new Intent(this, org.musikcube.main.class));
+ return true;
+ case R.id.context_controls:
+ startActivity(new Intent(this, org.musikcube.PlayerControl.class));
+ return true;
default:
return super.onContextItemSelected(item);
}