[musikcube] r392 committed - More workout mode fixes.

[codesite...@google.com]

Revision: 392
Author: onnerby
Date: Mon Aug 31 08:24:18 2009
Log: More workout mode fixes.
http://code.google.com/p/musikcube/source/detail?r=392

Modified:
/trunk/src/android/AndroidManifest.xml
/trunk/src/android/src/org/musikcube/core/Workout.java

=======================================
--- /trunk/src/android/AndroidManifest.xml Mon Aug 31 07:01:12 2009
+++ /trunk/src/android/AndroidManifest.xml Mon Aug 31 08:24:18 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.musikcube"
- android:versionName="1.0.3" android:versionCode="3">
+ android:versionName="1.0.5" android:versionCode="5">
<application android:icon="@drawable/icon"
android:label="@string/app_name" android:name="App"
android:debuggable="false">
<activity android:name=".main"
android:label="@string/app_name"
android:launchMode="singleTask" android:screenOrientation="portrait">
=======================================
--- /trunk/src/android/src/org/musikcube/core/Workout.java Mon Aug 31
07:01:12 2009
+++ /trunk/src/android/src/org/musikcube/core/Workout.java Mon Aug 31
08:24:18 2009
@@ -111,6 +111,7 @@
public void SetBPM(float bpm){
synchronized(lock){
if(this.paceDetector==null){
+ this.reportBPM = bpm;
this.bpm = bpm;
if(this.active){
this.QueryTracks(true);
@@ -180,14 +181,16 @@

public void OnQueryResults(IQuery query) {
synchronized(this.lock){
- this.lastQueryTime = android.os.SystemClock.elapsedRealtime();
- BPMQuery bpmQuery = (BPMQuery)query;
- if(!bpmQuery.trackList.isEmpty() && this.context!=null){
- Intent intent = new Intent(this.context, org.musikcube.Service.class);
- intent.putExtra("org.musikcube.Service.tracklist", bpmQuery.trackList);
- intent.putExtra("org.musikcube.Service.position", 0);
- intent.putExtra("org.musikcube.Service.action", "playlist_prepare");
- this.context.startService(intent);
+ if(this.active){
+ this.lastQueryTime = android.os.SystemClock.elapsedRealtime();
+ BPMQuery bpmQuery = (BPMQuery)query;
+ if(!bpmQuery.trackList.isEmpty() && this.context!=null){
+ Intent intent = new Intent(this.context, org.musikcube.Service.class);
+ intent.putExtra("org.musikcube.Service.tracklist",
bpmQuery.trackList);
+ intent.putExtra("org.musikcube.Service.position", 0);
+ intent.putExtra("org.musikcube.Service.action", "playlist_prepare");
+ this.context.startService(intent);
+ }
}
}
}