Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4023] trunk/plugins/AndroidRemote
|
From: <kro...@us...> - 2010-12-08 18:46:36
|
Revision: 4023
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4023&view=rev
Author: kroko_koenig
Date: 2010-12-08 18:46:29 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
more playlist handling thats for today
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-08 17:25:21 UTC (rev 4022)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-08 18:46:29 UTC (rev 4023)
@@ -42,6 +42,7 @@
public String Track= "";
public String Rating= "";
public String Filename= "";
+ public String Duration= "";
}
private DbItems currentDbItem;
@@ -75,6 +76,7 @@
if (localName == "Track") {currentDbItem.Track =currentValue;}
if (localName == "Rating") {currentDbItem.Rating =currentValue;}
if (localName == "Filename") {currentDbItem.Filename =currentValue;}
+ if (localName == "Duration") {currentDbItem.Duration =currentValue;}
if (localName == "Item")DbList.add(currentDbItem);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-08 17:25:21 UTC (rev 4022)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-08 18:46:29 UTC (rev 4023)
@@ -28,7 +28,6 @@
import android.app.Activity;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.content.res.AssetManager;
import android.os.Bundle;
import android.view.GestureDetector;
@@ -40,8 +39,6 @@
public class Remote_01 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
- private String HttpServer = "";
- private String HttpPort = "";
private GestureDetector gestureScanner;
private static final int SWIPE_MIN_DISTANCE = 120;
@@ -55,13 +52,7 @@
setContentView(R.layout.remote01);
gestureScanner = new GestureDetector(this);
-
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
- MODE_PRIVATE);
- HttpServer = settings.getString("Server", "192.168.0.30");
- HttpPort = settings.getString("Port", "8200");
-
Button can = (Button) findViewById(R.id.btnBack);
can.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
@@ -177,7 +168,7 @@
public void PostCommand(String button) {
- PostWebserver post = new PostWebserver(HttpServer, HttpPort);
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
AssetManager assetManager = getAssets();
String xml = "";
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-08 17:25:21 UTC (rev 4022)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-08 18:46:29 UTC (rev 4023)
@@ -26,7 +26,6 @@
import mediaportal.remote.R;
import android.app.Activity;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.content.res.AssetManager;
import android.os.Bundle;
import android.view.GestureDetector;
@@ -38,8 +37,6 @@
public class Remote_02 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
- private String HttpServer = "";
- private String HttpPort = "";
private GestureDetector gestureScanner;
private static final int SWIPE_MIN_DISTANCE = 120;
@@ -54,12 +51,6 @@
gestureScanner = new GestureDetector(this);
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
- MODE_PRIVATE);
-
- HttpServer = settings.getString("Server", "192.168.0.30");
- HttpPort = settings.getString("Port", "8200");
-
Button btnVolumeUp = (Button) findViewById(R.id.btnVolumeUp);
btnVolumeUp.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
@@ -134,7 +125,7 @@
public void PostCommand(String button) {
- PostWebserver post = new PostWebserver(HttpServer, HttpPort);
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
AssetManager assetManager = getAssets();
String xml = "";
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-08 17:25:21 UTC (rev 4022)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-08 18:46:29 UTC (rev 4023)
@@ -62,8 +62,11 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- MediaPlayerControl mp = MediaPlayerControl.getinstance();
- mp.Play("http://" + Settings.Server + ":" + Settings.Port + "/music/" + "song-marianne-plays-on-piano-sense-and-sensibilit.mp3");
+ ReceiveDbXmlHandler.DbItems item = songList.get(arg2);
+ PostAddItem(item);
+ Toast.makeText(musicSong.this,
+ "Title " + item.Title + " has been added",
+ Toast.LENGTH_SHORT).show();
}
});
}
@@ -98,6 +101,38 @@
l1.invalidateViews();
}
+ public void PostClear() {
+
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
+
+ String xml = "";
+
+ xml += "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+ xml += "<message>";
+ xml += "<command>CLEAR_PLAYLIST</command>";
+ xml += "</message>";
+
+ post.Post(xml);
+ }
+
+ public void PostAddItem(ReceiveDbXmlHandler.DbItems Item) {
+
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
+
+ String xml = "";
+
+ xml += "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+ xml += "<message>";
+ xml += "<command>ADD_MUSIC</command>";
+ xml += "<filename>" + Item.Filename + "</filename>";
+ xml += "<artist>" + Item.Artist + "</artist>";
+ xml += "<title>" + Item.Title + "</title>";
+ xml += "<duration>" + Item.Duration + "</duration>";
+ xml += "</message>";
+
+ post.Post(xml);
+ }
+
private static class EfficientAdapter extends BaseAdapter {
private LayoutInflater mInflater;
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-08 17:25:21 UTC (rev 4022)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-08 18:46:29 UTC (rev 4023)
@@ -1199,9 +1199,6 @@
{
req = req.Replace("?artist=", "");
db.GetSongsByArtist(req, ref list);
-
- MediaPortal.Music.Database.Song song = new MediaPortal.Music.Database.Song();
- db.GetSongByFileName("C:\\MP3\\Charts_von_1985\\1985 - 086 - Alphaville - The Jet Set - CannaPower.mp3", ref song);
}
else if (req.StartsWith("?album="))
{
@@ -1234,6 +1231,7 @@
msg += "<Track>" + HttpUtility.HtmlEncode(song.Track.ToString()) + "</Track>\r\n";
msg += "<Duration>" + HttpUtility.HtmlEncode(song.Duration.ToString()) + "</Duration>\r\n";
msg += "<Rating>" + HttpUtility.HtmlEncode(song.Rating.ToString()) + "</Rating>\r\n";
+ msg += "<Filename>" + HttpUtility.HtmlEncode(song.FileName) + "</Filename>\r\n";
msg += "</Item>\r\n";
}
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
