mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

More workout mode fixes.

Browse Source
This commit is contained in:
Daniel Önnerby 2009-08-31 15:24:18 +00:00
parent a6c39bc407
commit e2c1bb0195
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.musikcube" 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"> <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="App" android:debuggable="false">
<activity android:name=".main" <activity android:name=".main"
android:label="@string/app_name" android:launchMode="singleTask" android:screenOrientation="portrait"> android:label="@string/app_name" android:launchMode="singleTask" android:screenOrientation="portrait">

19
src/android/src/org/musikcube/core/Workout.java
View File

@ -111,6 +111,7 @@ public class Workout implements OnBPMListener, Runnable, OnQueryResultListener {
public void SetBPM(float bpm){ public void SetBPM(float bpm){
synchronized(lock){ synchronized(lock){
if(this.paceDetector==null){ if(this.paceDetector==null){
this.reportBPM = bpm;
this.bpm = bpm; this.bpm = bpm;
if(this.active){ if(this.active){
this.QueryTracks(true); this.QueryTracks(true);
@ -180,14 +181,16 @@ public class Workout implements OnBPMListener, Runnable, OnQueryResultListener {
public void OnQueryResults(IQuery query) { public void OnQueryResults(IQuery query) {
synchronized(this.lock){ synchronized(this.lock){
this.lastQueryTime = android.os.SystemClock.elapsedRealtime(); if(this.active){
BPMQuery bpmQuery = (BPMQuery)query; this.lastQueryTime = android.os.SystemClock.elapsedRealtime();
if(!bpmQuery.trackList.isEmpty() && this.context!=null){ BPMQuery bpmQuery = (BPMQuery)query;
Intent intent = new Intent(this.context, org.musikcube.Service.class); if(!bpmQuery.trackList.isEmpty() && this.context!=null){
intent.putExtra("org.musikcube.Service.tracklist", bpmQuery.trackList); Intent intent = new Intent(this.context, org.musikcube.Service.class);
intent.putExtra("org.musikcube.Service.position", 0); intent.putExtra("org.musikcube.Service.tracklist", bpmQuery.trackList);
intent.putExtra("org.musikcube.Service.action", "playlist_prepare"); intent.putExtra("org.musikcube.Service.position", 0);
this.context.startService(intent); intent.putExtra("org.musikcube.Service.action", "playlist_prepare");
this.context.startService(intent);
}
} }
} }
} }