[musikcube] r367 commited - Started on a player control.

[codesite...@google.com]

Revision: 367
Author: onnerby
Date: Wed Jul 29 17:06:47 2009
Log: Started on a player control.
http://code.google.com/p/musikcube/source/detail?r=367

Added:
/trunk/src/android/res/drawable/album.png
/trunk/src/android/src/org/musikcube/PlayerControl.java
Modified:
/trunk/src/android/AndroidManifest.xml
/trunk/src/android/res/layout/play_control.xml
/trunk/src/android/src/org/musikcube/Service.java
/trunk/src/android/src/org/musikcube/TrackList.java
/trunk/src/android/src/org/musikcube/core/Player.java

=======================================
--- /dev/null
+++ /trunk/src/android/res/drawable/album.png Wed Jul 29 17:06:47 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/src/android/src/org/musikcube/PlayerControl.java Wed Jul 29
17:06:47 2009
@@ -0,0 +1,41 @@
+package org.musikcube;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageButton;
+
+public class PlayerControl extends Activity {
+
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.play_control);
+
+ ImageButton nextButton = (ImageButton)findViewById(R.id.MediaNext);
+ nextButton.setOnClickListener(this.onNextClick);
+ ImageButton pauseButton =
(ImageButton)findViewById(R.id.MediaPause);
+ pauseButton.setOnClickListener(this.onPauseClick);
+
+ }
+
+ private OnClickListener onNextClick = new OnClickListener() {
+ public void onClick(View v){
+ Intent intent = new Intent(PlayerControl.this,
org.musikcube.Service.class);
+ intent.putExtra("org.musikcube.Service.action", "next");
+ startService(intent);
+ }
+ };
+ private OnClickListener onPauseClick = new OnClickListener() {
+ public void onClick(View v){
+ Intent intent = new Intent(PlayerControl.this,
org.musikcube.Service.class);
+ intent.putExtra("org.musikcube.Service.action", "stop");
+ startService(intent);
+ }
+ };
+
+
+}
=======================================
--- /trunk/src/android/AndroidManifest.xml Wed Jul 29 15:56:39 2009
+++ /trunk/src/android/AndroidManifest.xml Wed Jul 29 17:06:47 2009
@@ -15,6 +15,7 @@
<activity android:name="CategoryList"></activity>
<activity android:name="TrackList"></activity>
<activity android:name="Preferences"></activity>
+<activity android:name="PlayerControl"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />

=======================================
--- /trunk/src/android/res/layout/play_control.xml Wed Jul 29 15:56:39 2009
+++ /trunk/src/android/res/layout/play_control.xml Wed Jul 29 17:06:47 2009
@@ -4,11 +4,22 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="8dp"
- android:paddingRight="8dp" android:gravity="center">
-<LinearLayout android:id="@+id/LinearLayout01"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal">
+ android:paddingRight="8dp" android:gravity="center_vertical|
center_horizontal">
+
+<LinearLayout android:id="@+id/LinearLayout01" android:layout_weight="0.5"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:gravity="left">
+<ImageView android:id="@+id/ImageView01"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/album" android:layout_marginTop="5sp"
android:layout_marginBottom="5sp"></ImageView>
+<TextView android:id="@+id/TextView04" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="Track"
android:textSize="24sp"></TextView>
+<TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="Genre:"></TextView>
+<TextView android:id="@+id/TextView02" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="Album:"></TextView>
+<TextView android:id="@+id/TextView03" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="Artists:"></TextView>
+</LinearLayout>
+<LinearLayout android:id="@+id/LinearLayout02"
android:layout_weight="0.5" android:layout_width="wrap_content"
android:layout_height="wrap_content"></LinearLayout><LinearLayout
android:id="@+id/LinearLayout01" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal">
<ImageButton android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/MediaPrev"
android:clickable="true" android:src="@drawable/ic_media_previous"
android:adjustViewBounds="true"></ImageButton>
<ImageButton android:layout_width="wrap_content"
android:layout_height="wrap_content" android:adjustViewBounds="true"
android:id="@+id/MediaPause"
android:src="@drawable/ic_media_pause"></ImageButton>
<ImageButton android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/MediaNext"
android:adjustViewBounds="true"
android:src="@drawable/ic_media_next"></ImageButton>
</LinearLayout>

+
+
+
</LinearLayout>
=======================================
--- /trunk/src/android/src/org/musikcube/Service.java Wed Jul 29 15:56:39
2009
+++ /trunk/src/android/src/org/musikcube/Service.java Wed Jul 29 17:06:47
2009
@@ -61,6 +61,14 @@
Player player = Player.GetInstance();
player.Next();
}
+ if(action.equals("stop")){
+ Player player = Player.GetInstance();
+ player.Stop();
+ }
+ if(action.equals("play")){
+ Player player = Player.GetInstance();
+ player.Play();
+ }
if(action.equals("player ended")){
this.stopSelf();
}
=======================================
--- /trunk/src/android/src/org/musikcube/TrackList.java Wed Jul 29 15:56:39
2009
+++ /trunk/src/android/src/org/musikcube/TrackList.java Wed Jul 29 17:06:47
2009
@@ -161,6 +161,9 @@
intent.putExtra("org.musikcube.Service.position", position);
intent.putExtra("org.musikcube.Service.action", "playlist");
startService(intent);
+
+ Intent intent2 = new Intent(this, PlayerControl.class);
+ startActivity(intent2);

}

=======================================
--- /trunk/src/android/src/org/musikcube/core/Player.java Wed Jul 29
15:56:39 2009
+++ /trunk/src/android/src/org/musikcube/core/Player.java Wed Jul 29
17:06:47 2009
@@ -73,6 +73,13 @@
}
}
}
+
+ public void Stop(){
+ synchronized(this.lock){
+ this.StopAllTracks();
+ this.End();
+ }
+ }

private void StopAllTracks(){
synchronized(this.lock){