Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <kro...@us...> - 2010-12-14 15:07:07
|
Revision: 4032
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4032&view=rev
Author: kroko_koenig
Date: 2010-12-14 15:07:00 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
add media scanner
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaScannerNotifier.java
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaScannerNotifier.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaScannerNotifier.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaScannerNotifier.java 2010-12-14 15:07:00 UTC (rev 4032)
@@ -0,0 +1,41 @@
+package mediaportal.remote;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.MediaScannerConnection;
+import android.media.MediaScannerConnection.MediaScannerConnectionClient;
+import android.net.Uri;
+
+public class MediaScannerNotifier implements MediaScannerConnectionClient {
+ private Context mContext;
+ private MediaScannerConnection mConnection;
+ private String mPath;
+ private String mMimeType;
+
+ public MediaScannerNotifier(Context context, String path, String mimeType) {
+ mContext = context;
+ mPath = path;
+ mMimeType = mimeType;
+ mConnection = new MediaScannerConnection(context, this);
+ mConnection.connect();
+ }
+
+ public void onMediaScannerConnected() {
+ mConnection.scanFile(mPath, mMimeType);
+ }
+
+ public void onScanCompleted(String path, Uri uri) {
+ // OPTIONAL: scan is complete, this will cause the viewer to render it
+ try {
+ if (uri != null) {
+ //Intent intent = new Intent(Intent.ACTION_VIEW);
+ //intent.setData(uri);
+ //mContext.startActivity(intent);
+ }
+ } finally {
+ mConnection.disconnect();
+ mContext = null;
+ }
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-14 13:37:47
|
Revision: 4031
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4031&view=rev
Author: kroko_koenig
Date: 2010-12-14 13:37:39 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
changed post and add progress to music section
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java
trunk/plugins/AndroidRemote/Release/remote3.jpg
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-14 13:37:39 UTC (rev 4031)
@@ -17,6 +17,7 @@
</activity>
<activity android:launchMode="singleInstance" android:name=".Remote_01"></activity>
<activity android:launchMode="singleInstance" android:name=".Remote_02"></activity>
+ <activity android:launchMode="singleInstance" android:name=".Remote_03"></activity>
<activity android:name=".pictures" android:launchMode="singleInstance"></activity>
<activity android:name=".picturesfullscreen" android:launchMode="singleInstance"></activity>
<activity android:launchMode="singleInstance" android:name=".MusicDir"></activity>
@@ -32,6 +33,7 @@
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
</manifest>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -79,9 +79,13 @@
public static final int wake_on_lan=0x7f020041;
}
public static final class id {
+ public static final int Button01=0x7f060060;
public static final int GridView01=0x7f060017;
public static final int ImageView01=0x7f060019;
+ public static final int LinearLayout00=0x7f06004a;
public static final int LinearLayout01=0x7f06001a;
+ public static final int LinearLayout02=0x7f060055;
+ public static final int LinearLayout03=0x7f06005f;
public static final int ListView01=0x7f060028;
public static final int TableLayout01=0x7f060005;
public static final int TableRow01=0x7f060006;
@@ -123,7 +127,26 @@
public static final int btn_main_skp_back=0x7f06000e;
public static final int btn_main_skp_forw=0x7f060010;
public static final int btn_main_video=0x7f060009;
- public static final int clearplaylist=0x7f060050;
+ public static final int btnkey01=0x7f06004b;
+ public static final int btnkey02=0x7f06004c;
+ public static final int btnkey03=0x7f06004d;
+ public static final int btnkey04=0x7f06004e;
+ public static final int btnkey05=0x7f06004f;
+ public static final int btnkey06=0x7f060050;
+ public static final int btnkey07=0x7f060051;
+ public static final int btnkey08=0x7f060052;
+ public static final int btnkey09=0x7f060053;
+ public static final int btnkey10=0x7f060054;
+ public static final int btnkey11=0x7f060056;
+ public static final int btnkey12=0x7f060057;
+ public static final int btnkey13=0x7f060058;
+ public static final int btnkey14=0x7f060059;
+ public static final int btnkey15=0x7f06005a;
+ public static final int btnkey16=0x7f06005b;
+ public static final int btnkey17=0x7f06005c;
+ public static final int btnkey18=0x7f06005d;
+ public static final int btnkey19=0x7f06005e;
+ public static final int clearplaylist=0x7f060067;
public static final int full_text=0x7f060018;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
@@ -147,18 +170,18 @@
public static final int now_progress=0x7f06001e;
public static final int now_stop=0x7f060024;
public static final int now_title=0x7f060021;
- public static final int open=0x7f060053;
- public static final int playlist=0x7f06004f;
- public static final int rslide=0x7f060056;
- public static final int save=0x7f060052;
- public static final int sdcard=0x7f060051;
- public static final int send=0x7f060054;
- public static final int server_ip=0x7f06004a;
- public static final int server_macid=0x7f06004c;
- public static final int server_port=0x7f06004b;
- public static final int slide=0x7f060055;
- public static final int title=0x7f06004e;
- public static final int vibration=0x7f06004d;
+ public static final int open=0x7f06006a;
+ public static final int playlist=0x7f060066;
+ public static final int rslide=0x7f06006d;
+ public static final int save=0x7f060069;
+ public static final int sdcard=0x7f060068;
+ public static final int send=0x7f06006b;
+ public static final int server_ip=0x7f060061;
+ public static final int server_macid=0x7f060063;
+ public static final int server_port=0x7f060062;
+ public static final int slide=0x7f06006c;
+ public static final int title=0x7f060065;
+ public static final int vibration=0x7f060064;
public static final int widget0=0x7f060011;
public static final int widget00=0x7f06002a;
public static final int widget01=0x7f06002e;
@@ -183,9 +206,10 @@
public static final int playnowlist=0x7f03000c;
public static final int remote01=0x7f03000d;
public static final int remote02=0x7f03000e;
- public static final int setup=0x7f03000f;
- public static final int splash=0x7f030010;
- public static final int title=0x7f030011;
+ public static final int remote03=0x7f03000f;
+ public static final int setup=0x7f030010;
+ public static final int splash=0x7f030011;
+ public static final int title=0x7f030012;
}
public static final class menu {
public static final int music_menu=0x7f050000;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-14 13:37:39 UTC (rev 4031)
@@ -37,7 +37,7 @@
Main issues
------------
Vibration feedback (not completed)
-Check if WIFI is on
+switch WIFI on (just msg now)
gesture control for pictures (swipe) / alertdialog
save files from Android to MP
if the MP has no focus the remote doesnt work (normal)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml 2010-12-14 13:37:39 UTC (rev 4031)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <LinearLayout android:id="@+id/LinearLayout00"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:orientation="vertical" android:layout_height="wrap_content" android:background="@drawable/brush">
+
+ <TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Remote 03"
+ android:gravity="center_horizontal" android:background="#FFA9A9A9"
+ android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:padding="5dip">
+ </TextView>
+
+ <LinearLayout android:id="@+id/LinearLayout01"
+ android:layout_height="wrap_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:paddingBottom="5dip" android:paddingTop="5dip">
+
+ <Button android:id="@+id/btnkey01" android:padding="0dip"
+ android:text="Q" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey02" android:padding="0dip"
+ android:text="W" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey03" android:padding="0dip"
+ android:text="E" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey04" android:padding="0dip"
+ android:text="R" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey05" android:padding="0dip"
+ android:text="T" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey06" android:padding="0dip"
+ android:text="Y" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey07" android:padding="0dip"
+ android:text="U" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey08" android:padding="0dip"
+ android:text="I" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey09" android:padding="0dip"
+ android:text="O" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey10" android:padding="0dip"
+ android:text="P" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/LinearLayout02"
+ android:layout_height="wrap_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:paddingBottom="5dip">
+
+ <Button android:id="@+id/btnkey11" android:padding="0dip"
+ android:text="A" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey12" android:padding="0dip"
+ android:text="S" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey13" android:padding="0dip"
+ android:text="D" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey14" android:padding="0dip"
+ android:text="F" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey15" android:padding="0dip"
+ android:text="G" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey16" android:padding="0dip"
+ android:text="H" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey17" android:padding="0dip"
+ android:text="J" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey18" android:padding="0dip"
+ android:text="K" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/btnkey19" android:padding="0dip"
+ android:text="L" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/LinearLayout03"
+ android:layout_height="wrap_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:paddingBottom="5dip">
+
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="Shift" android:layout_width="48dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="Z" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="X" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="C" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="V" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="B" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="N" android:layout_width="32dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="M" android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="DEL" android:layout_width="48dip" android:layout_height="32dip">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/LinearLayout03"
+ android:layout_height="wrap_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:paddingBottom="5dip">
+
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text=".?123" android:layout_width="64dip" android:layout_height="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:layout_height="32dip" android:layout_width="32dip" android:text="/">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="Space" android:layout_height="32dip" android:layout_width="64dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="." android:layout_height="32dip" android:layout_width="32dip">
+ </Button>
+ <Button android:id="@+id/Button01" android:padding="0dip"
+ android:text="www" android:layout_width="64dip" android:layout_height="32dip">
+ </Button>
+
+ </LinearLayout>
+
+</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -21,7 +21,13 @@
package mediaportal.remote;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.InetAddress;
+import java.net.Socket;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
@@ -31,6 +37,8 @@
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.protocol.HTTP;
public class PostWebserver {
@@ -42,11 +50,55 @@
httpPort = Port;
}
- public boolean Post(String Data) {
+ public boolean Post(String data) {
boolean result = false;
+
try {
+ InetAddress addr = InetAddress.getByName(Settings.Server);
+ Socket socket = new Socket(addr, 8200);
+
+ // Send header String
+ String path = "/";
+ BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
+ socket.getOutputStream(), "UTF8"));
+ wr.write("POST " + path + " HTTP/1.0\r\n");
+ wr.write("Content-Length: " + data.length() + "\r\n");
+ wr.write("Content-Type: application/xml\r\n");
+ wr.write("\r\n");
+
+ // Send data
+ wr.write(data);
+ wr.flush();
+
+ // Get response
+ BufferedReader rd = new BufferedReader(new InputStreamReader(
+ socket.getInputStream()));
+ String line;
+ while ((line = rd.readLine()) != null) {
+ // Process line...
+ }
+
+ wr.close();
+ rd.close();
+
+ result = true;
+
+ } catch (Exception e) {
+ }
+
+ return result;
+
+ }
+
+ public boolean oldPost(String Data) {
+
+ boolean result = false;
+ try {
HttpParams httpParameters = new BasicHttpParams();
+ HttpProtocolParams.setContentCharset(httpParameters, HTTP.UTF_8);
+ HttpProtocolParams.setUseExpectContinue(httpParameters, false);
+
HttpConnectionParams.setConnectionTimeout(httpParameters, 5000);
HttpConnectionParams.setSoTimeout(httpParameters, 5000);
@@ -54,8 +106,13 @@
HttpPost httppost = new HttpPost("http://" + httpServer + ":"
+ httpPort);
+ httppost.addHeader("Accept", "text/xml");
+ httppost.addHeader("Content-Type", "application/xml");
+
+ Data = Data.replace("\\", "/");
+
StringEntity se = new StringEntity(Data, "UTF-8");
- se.setContentType("application/atom+xml");
+ se.setContentType("application/xml");
httppost.setEntity(se);
@@ -72,4 +129,5 @@
return result;
}
+
}
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-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -169,8 +169,8 @@
// right to left swipe
if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-
-
+ Intent myIntent = new Intent(this, Remote_03.class);
+ startActivityForResult(myIntent, 0);
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
Intent myIntent = new Intent(this, Remote_01.class);
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+import mediaportal.remote.R;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.AssetManager;
+import android.os.Bundle;
+import android.os.Vibrator;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.GestureDetector.OnGestureListener;
+import android.widget.Button;
+
+public class Remote_03 extends Activity implements OnGestureListener {
+
+ public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+
+ private GestureDetector gestureScanner;
+ private static final int SWIPE_MIN_DISTANCE = 120;
+ private static final int SWIPE_MAX_OFF_PATH = 250;
+ private static final int SWIPE_THRESHOLD_VELOCITY = 200;
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.remote03);
+
+ gestureScanner = new GestureDetector(this);
+
+ }
+
+ public void PostCommand(String button) {
+
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
+
+ AssetManager assetManager = getAssets();
+ String xml = "";
+
+ try {
+ InputStream inputStream = null;
+ inputStream = assetManager.open("cmd_" + button + ".xml");
+
+ int x = inputStream.read();
+
+ while (x != -1) {
+ xml = xml + (char) x;
+ x = inputStream.read();
+ }
+ post.Post(xml);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent me) {
+ return gestureScanner.onTouchEvent(me);
+ }
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+ float velocityY) {
+ try {
+ if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
+ return false;
+ // right to left swipe
+ if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+
+ } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+ Intent myIntent = new Intent(this, Remote_02.class);
+ startActivityForResult(myIntent, 0);
+ }
+ } catch (Exception e) {
+ // nothing
+ }
+ return false;
+ }
+
+ public boolean onDown(MotionEvent arg0) {
+ return true;
+ }
+ public void onLongPress(MotionEvent arg0) {
+ }
+ public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
+ float arg3) {
+ return false;
+ }
+ public void onShowPress(MotionEvent arg0) {
+ }
+ public boolean onSingleTapUp(MotionEvent arg0) {
+ return false;
+ }
+
+ public void DoVibrate() {
+ if (Settings.Vibrate) {
+ // Get instance of Vibrator from current Context
+ Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ v.vibrate(100);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -30,6 +30,7 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.AssetManager;
+import android.net.ConnectivityManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator;
@@ -40,7 +41,7 @@
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -134,6 +135,29 @@
});
}
+ void chkStatus() {
+ final ConnectivityManager connMgr = (ConnectivityManager) this
+ .getSystemService(Context.CONNECTIVITY_SERVICE);
+
+ final android.net.NetworkInfo wifi = connMgr
+ .getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+ final android.net.NetworkInfo mobile = connMgr
+ .getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
+
+ if (!wifi.isAvailable()) {
+ Toast.makeText(this, "Wifi is not available !", Toast.LENGTH_LONG).show();
+ }
+
+ /*
+ else if (mobile.isAvailable()) {
+ Toast.makeText(this, "Mobile 3G ", Toast.LENGTH_LONG).show();
+ } else {
+ Toast.makeText(this, "No Network ", Toast.LENGTH_LONG).show();
+ }
+ */
+ }
+
public void PostCommand(String button) {
PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
@@ -164,13 +188,16 @@
v.vibrate(100);
}
}
-
+
@Override
public void onStart() {
super.onStart();
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 1000);
+
+ chkStatus();
+
}
@Override
@@ -186,7 +213,7 @@
mHandler.postDelayed(mUpdateTimeTask, 1000);
}
};
-
+
private void update() {
SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
MODE_PRIVATE);
@@ -197,13 +224,14 @@
nowplayinghandler handler = nowplayinghandler.getinstance();
handler.setconnection(HttpServer, HttpPort);
handler.fetchdata();
-
+
String display = "nothing playing";
TextView txt0 = (TextView) findViewById(R.id.main_now_playing);
-
- if ((nowplayinghandler.PlayerState != null) &&
- (!nowplayinghandler.PlayerState.equals("no player active"))) {
- display = nowplayinghandler.Artist + " - " + nowplayinghandler.Title;
+
+ if ((nowplayinghandler.PlayerState != null)
+ && (!nowplayinghandler.PlayerState.equals("no player active"))) {
+ display = nowplayinghandler.Artist + " - "
+ + nowplayinghandler.Title;
}
txt0.setText(display);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -22,12 +22,13 @@
package mediaportal.remote;
import java.util.ArrayList;
-
import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
@@ -50,12 +51,13 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.music_album);
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+
ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.setAdapter(new EfficientAdapter(musicAlbum.this));
l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
{
- //@override
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
@@ -74,34 +76,45 @@
l1.setDividerHeight(2);
}
- @Override
- public void onStart() {
- super.onStart();
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
- }
-
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
- update();
+ new update().execute();
}
};
- private void update() {
+ private class update extends AsyncTask<String, Void, Void> {
+ private final ProgressDialog dialog = new ProgressDialog(musicAlbum.this);
- Log.d("update album", "do update");
+ // can use UI thread here
+ protected void onPreExecute() {
+ this.dialog.setMessage("Loading...");
+ this.dialog.show();
+ }
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
- albumList = handler.GetAlbums();
+ // automatically done on worker thread (separate from UI thread)
+ protected Void doInBackground(final String... args) {
+ Log.d("update album", "do update");
- if (albumList.size() == 0) {
- Toast.makeText(musicAlbum.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ albumList = handler.GetAlbums();
+
+ return null;
}
- ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.invalidateViews();
+ // can use UI thread here
+ protected void onPostExecute(final Void unused) {
+ if (this.dialog.isShowing()) {
+ this.dialog.dismiss();
+ }
+
+ if (albumList.size() == 0) {
+ Toast.makeText(musicAlbum.this, "TIME OUT SERVER",
+ Toast.LENGTH_SHORT).show();
+ } else {
+ ListView listview = (ListView) findViewById(R.id.list_album);
+ listview.setAdapter(new EfficientAdapter(musicAlbum.this));
+ }
+ }
}
private static class EfficientAdapter extends BaseAdapter {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -23,10 +23,12 @@
import java.util.ArrayList;
import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
@@ -39,73 +41,85 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicArtist extends Activity{
-
+public class musicArtist extends Activity {
+
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
-
+
private static ArrayList<ReceiveDbXmlHandler.DbItems> artistList;
-
+
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_artist);
-
- ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.setAdapter(new EfficientAdapter(musicArtist.this));
-
- l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
- {
- //@override
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_artist);
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+
+ ListView l1 = (ListView) findViewById(R.id.list_artist);
+
+ l1.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
- long arg3) {
-
+ long arg3) {
+
ReceiveDbXmlHandler.DbItems item = artistList.get(arg2);
-
+
musicResults.Select = item.Artist;
musicResults.Mode = musicResults.SelectMode.Artist;
-
- Intent myIntent = new Intent(arg1.getContext(), musicResults.class);
- startActivityForResult(myIntent, 0);
- }
+
+ Intent myIntent = new Intent(arg1.getContext(),
+ musicResults.class);
+ startActivityForResult(myIntent, 0);
}
- );
-
- ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
- l1.setDivider(divcolor);
- l1.setDividerHeight(2);
- }
-
- @Override
- public void onStart() {
- super.onStart();
+ });
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
+ ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
+ l1.setDivider(divcolor);
+ l1.setDividerHeight(2);
}
+
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
- update();
+ new update().execute();
}
};
- private void update() {
-
- Log.d("update artist", "do update");
-
- ReceiveDbHandler handler = ReceiveDbHandler .getinstance();
- artistList = handler.GetArtist();
-
- if (artistList.size() == 0) {
- Toast.makeText(musicArtist.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
+ private class update extends AsyncTask<String, Void, Void> {
+ private final ProgressDialog dialog = new ProgressDialog(musicArtist.this);
+
+ // can use UI thread here
+ protected void onPreExecute() {
+ this.dialog.setMessage("Loading...");
+ this.dialog.show();
}
-
- ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.invalidateViews();
+
+ // automatically done on worker thread (separate from UI thread)
+ protected Void doInBackground(final String... args) {
+ Log.d("update artist", "do update");
+
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ artistList = handler.GetArtist();
+
+ return null;
+ }
+
+ // can use UI thread here
+ protected void onPostExecute(final Void unused) {
+ if (this.dialog.isShowing()) {
+ this.dialog.dismiss();
+ }
+
+ if (artistList.size() == 0) {
+ Toast.makeText(musicArtist.this, "TIME OUT SERVER",
+ Toast.LENGTH_SHORT).show();
+ } else {
+ ListView listview = (ListView) findViewById(R.id.list_artist);
+ listview.setAdapter(new EfficientAdapter(musicArtist.this));
+ }
+ }
}
-
+
private static class EfficientAdapter extends BaseAdapter {
-
+
private LayoutInflater mInflater;
public EfficientAdapter(Context context) {
@@ -113,8 +127,10 @@
}
public int getCount() {
- if(artistList != null) return artistList.size();
- else return 0;
+ if (artistList != null)
+ return artistList.size();
+ else
+ return 0;
}
public Object getItem(int position) {
@@ -127,7 +143,7 @@
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
-
+
if (convertView == null) {
convertView = mInflater.inflate(R.layout.list_item, null);
holder = new ViewHolder();
@@ -142,8 +158,8 @@
}
ReceiveDbXmlHandler.DbItems item = artistList.get(position);
-
- holder.text.setText(String.valueOf(position +1));
+
+ holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Artist);
convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
@@ -159,4 +175,3 @@
}
}
-
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -24,10 +24,12 @@
import java.util.ArrayList;
import android.app.Activity;
import android.app.AlertDialog;
+import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
@@ -63,15 +65,16 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.music_results);
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+
ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.setAdapter(new EfficientAdapter(musicResults.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
l1.setDividerHeight(2);
l1.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- // @override
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
@@ -119,13 +122,12 @@
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>";
@@ -137,44 +139,54 @@
post.Post(xml);
}
-
private void SavetoSDCard() {
}
- @Override
- public void onStart() {
- super.onStart();
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
- }
-
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
- update();
+ new update().execute();
}
};
- private void update() {
+ private class update extends AsyncTask<String, Void, Void> {
+ private final ProgressDialog dialog = new ProgressDialog(musicResults.this);
- Log.d("update search", "do update");
+ // can use UI thread here
+ protected void onPreExecute() {
+ this.dialog.setMessage("Loading...");
+ this.dialog.show();
+ }
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
- if(Mode == SelectMode.Artist)
- itemList = handler.GetSongsByArtist(Select);
- if(Mode == SelectMode.Album)
- itemList = handler.GetSongsByAlbum(Select);
+ // automatically done on worker thread (separate from UI thread)
+ protected Void doInBackground(final String... args) {
+ Log.d("update search", "do update");
- if (itemList.size() == 0) {
- Toast.makeText(musicResults.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ if(Mode == SelectMode.Artist)
+ itemList = handler.GetSongsByArtist(Select);
+ if(Mode == SelectMode.Album)
+ itemList = handler.GetSongsByAlbum(Select);
+
+ return null;
}
- ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.invalidateViews();
+ // can use UI thread here
+ protected void onPostExecute(final Void unused) {
+ if (this.dialog.isShowing()) {
+ this.dialog.dismiss();
+ }
+
+ if (itemList.size() == 0) {
+ Toast.makeText(musicResults.this, "TIME OUT SERVER",
+ Toast.LENGTH_SHORT).show();
+ } else {
+ ListView listview = (ListView) findViewById(R.id.list_result);
+ listview.setAdapter(new EfficientAdapter(musicResults.this));
+ }
+ }
}
-
+
private static class EfficientAdapter extends BaseAdapter {
private LayoutInflater mInflater;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-14 13:37:39 UTC (rev 4031)
@@ -24,10 +24,12 @@
import java.util.ArrayList;
import android.app.Activity;
import android.app.AlertDialog;
+import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
@@ -56,15 +58,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.music_song);
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+
ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.setAdapter(new EfficientAdapter(musicSong.this));
- ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
- l1.setDivider(divcolor);
- l1.setDividerHeight(2);
-
l1.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- // @override
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
@@ -97,36 +96,51 @@
alert.show();
}
});
+
+ ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
+ l1.setDivider(divcolor);
+ l1.setDividerHeight(2);
}
- @Override
- public void onStart() {
- super.onStart();
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
- }
-
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
- update();
+ new update().execute();
}
};
- private void update() {
+ private class update extends AsyncTask<String, Void, Void> {
+ private final ProgressDialog dialog = new ProgressDialog(musicSong.this);
- Log.d("update song", "do update");
+ // can use UI thread here
+ protected void onPreExecute() {
+ this.dialog.setMessage("Loading...");
+ this.dialog.show();
+ }
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
- songList = handler.GetSongs();
+ // automatically done on worker thread (separate from UI thread)
+ protected Void doInBackground(final String... args) {
+ Log.d("update song", "do update");
- if (songList.size() == 0) {
- Toast.makeText(musicSong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
- .show();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ songList = handler.GetSongs();
+
+ return null;
}
- ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.invalidateViews();
+ // can use UI thread here
+ protected void onPostExecute(final Void unused) {
+ if (this.dialog.isShowing()) {
+ this.dialog.dismiss();
+ }
+
+ if (songList.size() == 0) {
+ Toast.makeText(musicSong.this, "TIME OUT SERVER",
+ Toast.LENGTH_SHORT).show();
+ } else {
+ ListView listview = (ListView) findViewById(R.id.list_song);
+ listview.setAdapter(new EfficientAdapter(musicSong.this));
+ }
+ }
}
public void PostClear() {
@@ -142,7 +156,6 @@
post.Post(xml);
}
-
public void PostAddItem(ReceiveDbXmlHandler.DbItems Item) {
PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
@@ -160,7 +173,6 @@
post.Post(xml);
}
-
private void SavetoSDCard() {
}
Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2
===================================================================
--- trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2010-12-14 13:37:39 UTC (rev 4031)
@@ -142,15 +142,16 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control.
-Gfx has been done by oddfella and some additional coding is from rolls1400.
-
+ <ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control.
+Gfx has been done by oddfella and some additional coding is from rolls1400.
+
Have fun.</ExtensionDescription>
<VersionDescription>initial release</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
<ReleaseDate>2010-12-09T16:17:18.1693243+01:00</ReleaseDate>
<Tags>android,remote</Tags>
+ <Location>C:\AAA\AndroidRemote2\Release\AndroidRemote.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
Added: trunk/plugins/AndroidRemote/Release/remote3.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Release/remote3.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-14 04:10:10 UTC (rev 4030)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-14 13:37:39 UTC (rev 4031)
@@ -545,6 +545,8 @@
// parameter = filename,artist,title,duration
PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ playlistPlayer.CurrentPlaylistType = PlayListType.PLAYLIST_MUSIC;
+
PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
bool found = false;
@@ -561,6 +563,8 @@
if (!found)
{
+ AndroidServer.logDebug("add music : " + data["artist"] + " - " + data["title"]);
+
PlayListItem playlistItem = new PlayListItem();
playlistItem.Type = PlayListItem.PlayListItemType.Audio;
playlistItem.FileName = fileName;
@@ -597,10 +601,13 @@
#region clear playlist
if (data["command"] == ("REMOVE_PLAYLIST"))
{
+ AndroidServer.logDebug("remove from playlist : " + data["filename"]);
// add music
// parameter = filename
PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ playlistPlayer.CurrentPlaylistType = PlayListType.PLAYLIST_MUSIC;
+
PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
string fileName = data["filename"]; // TODO need to be converted to local name
@@ -609,6 +616,7 @@
if (data["command"] == ("CLEAR_PLAYLIST"))
{
+ AndroidServer.logDebug("clear playlist");
// clear playlist
// parameter = none
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.
|
|
From: <Rol...@us...> - 2010-12-14 04:10:16
|
Revision: 4030
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4030&view=rev
Author: Rollsroyc3
Date: 2010-12-14 04:10:10 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
added worker thread code with dialogs to pictures.
started swipe code with context menu.
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-11 11:49:00 UTC (rev 4029)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-14 04:10:10 UTC (rev 4030)
@@ -28,6 +28,7 @@
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
@@ -112,35 +113,50 @@
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
- update();
+ new update().execute();
+ //update();
}
};
- private void update() {
+
+
+ private class update extends AsyncTask<String, Void, Void> {
+ private final ProgressDialog dialog = new ProgressDialog(pictures.this);
+
+ // can use UI thread here
+ protected void onPreExecute() {
+ this.dialog.setMessage("Loading...");
+ this.dialog.show();
+ }
+
+ // automatically done on worker thread (separate from UI thread)
+ protected Void doInBackground(final String... args) {
+ Log.d("update pictures", "do update folder : " + actualDir);
+
+ ReceiveDirHandler h = ReceiveDirHandler.getinstance();
+ pictureList = h.getPictureDir(actualDir);
- ProgressDialog dialog = new ProgressDialog(this);
- dialog.setCancelable(true);
- dialog.setMessage("Loading...");
- dialog.show();
-
+ return null;
+ }
+
+ // can use UI thread here
+ protected void onPostExecute(final Void unused) {
+ if (this.dialog.isShowing()) {
+ this.dialog.dismiss();
+ }
- Log.d("update pictures", "do update folder : " + actualDir);
-
- ReceiveDirHandler h = ReceiveDirHandler.getinstance();
- pictureList = h.getPictureDir(actualDir);
-
- if (pictureList.size() == 0) {
+ if (pictureList.size() == 0) {
Toast.makeText(pictures.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
- } else {
- GridView gridview = (GridView) findViewById(R.id.GridView01);
- gridview.setAdapter(new ImageAdapter2(this));
- }
-
- dialog.cancel();
- }
-
- public class ImageAdapter2 extends BaseAdapter {
+ } else {
+ GridView gridview = (GridView) findViewById(R.id.GridView01);
+ gridview.setAdapter(new ImageAdapter2(pictures.this));
+ }
+ }
+ }
+
+
+ public class ImageAdapter2 extends BaseAdapter {
private Context mContext;
public static final int ACTIVITY_CREATE = 10;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-11 11:49:00 UTC (rev 4029)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-14 04:10:10 UTC (rev 4030)
@@ -29,30 +29,40 @@
import mediaportal.remote.R;
import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.util.Log;
import android.view.ContextMenu;
+import android.view.GestureDetector;
import android.view.MenuInflater;
import android.view.MenuItem;
+import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.ContextMenu.ContextMenuInfo;
+import android.view.GestureDetector.OnGestureListener;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
-public class picturesfullscreen extends Activity {
+public class picturesfullscreen extends Activity implements OnGestureListener {
private Handler mHandler = new Handler();
-
+ private GestureDetector gestureScanner;
+ private static final int SWIPE_MIN_DISTANCE = 120;
+ private static final int SWIPE_MAX_OFF_PATH = 250;
+ private static final int SWIPE_THRESHOLD_VELOCITY = 200;
private boolean slideShow;
private boolean randomShow;
+ public static boolean SlideshowPaused = false;
+ private static long SlideInterval = 6000;
/** Called when the activity is first created. */
@Override
@@ -65,33 +75,63 @@
setContentView(R.layout.picturesfullscreen);
ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
- registerForContextMenu(imagev);
-
- setPicture();
+ //registerForContextMenu(imagev);
+
+ gestureScanner = new GestureDetector(this);
+
+ new setPicture().execute();
+
}
- private void setPicture() {
- ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
- DirItems item = pictures.pictureList.get(pictures.selectedPicture);
- if (!item.isFolder) {
- httpHandler http = new httpHandler();
- String file = "http://" + Settings.Server + ":" + Settings.Port
- + "/pictures/";
- file += pictures.actualDir + item.File;
- item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
- imagev.setImageBitmap(item.Picture);
+
+
+
+ private class setPicture extends AsyncTask<String, Void, Void> {
+ private final ProgressDialog dialog = new ProgressDialog(picturesfullscreen.this);
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+
+ // can use UI thread here
+ protected void onPreExecute() {
+ this.dialog.setMessage("Loading...");
+ this.dialog.show();
+ }
+
+ // automatically done on worker thread (separate from UI thread)
+ protected Void doInBackground(final String... args) {
+ if (!item.isFolder) {
+ httpHandler http = new httpHandler();
+ String file = "http://" + Settings.Server + ":" + Settings.Port
+ + "/pictures/";
+ file += pictures.actualDir + item.File;
+ item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
+ }
+
+ return null;
+ }
+
+ // can use UI thread here
+ protected void onPostExecute(final Void unused) {
+ if (this.dialog.isShowing()) {
+ this.dialog.dismiss();
+ }
+
+ if (item.isFolder != true){
+ ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+ imagev.setImageBitmap(item.Picture);
+ TextView txt = (TextView) findViewById(R.id.full_text);
+ txt.setText(item.File);
+ }
- TextView txt = (TextView) findViewById(R.id.full_text);
- txt.setText(item.File);
- }
- }
+ }
+ }
+
@Override
public void onStart() {
super.onStart();
mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 2000);
+ mHandler.postDelayed(mUpdateTimeTask, SlideInterval);
}
private Runnable mUpdateTimeTask = new Runnable() {
@@ -105,7 +145,8 @@
pictures.selectedPicture++;
else
pictures.selectedPicture = 0;
- setPicture();
+
+ new setPicture().execute();
} else {
String req = "http://" + Settings.Server + ":"
+ Settings.Port + "/random/pictures/random.jpg";
@@ -121,16 +162,26 @@
}
}
- mHandler.postDelayed(mUpdateTimeTask, 2000);
+ mHandler.postDelayed(mUpdateTimeTask, SlideInterval);
}
};
@Override
public void onPause() {
super.onPause();
+ SlideshowPaused = true;
mHandler.removeCallbacks(mUpdateTimeTask);
}
-
+
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ SlideshowPaused = false;
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, SlideInterval);
+ }
+
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
@@ -257,5 +308,88 @@
// e.printStackTrace();
}
}
+
+
+ @Override
+ public boolean onTouchEvent(MotionEvent me) {
+ this.gestureScanner.onTouchEvent(me);
+ return super.onTouchEvent(me);
+ }
+
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+ float velocityY) {
+ try {
+ int max = pictures.pictureList.size();
+
+ if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
+ return false;
+ // right to left swipe
+ if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+
+ if (pictures.selectedPicture < max - 1) {
+ pictures.selectedPicture++;
+ new setPicture().execute();
+ } else
+ Toast.makeText(this, "reached end +",
+ Toast.LENGTH_SHORT).show();
+ return true;
+ } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+
+ if (pictures.selectedPicture > 0) {
+ pictures.selectedPicture--;
+ new setPicture().execute();
+ } else
+ Toast.makeText(this, "reached end -",
+ Toast.LENGTH_SHORT).show();
+ return true;
+ }
+ } catch (Exception e) {
+ // nothing
+ }
+ return false;
+ }
+
+ public boolean onDown(MotionEvent arg0) {
+ return false;
+ }
+
+ public void onLongPress(MotionEvent arg0) {
+ }
+
+ public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
+ float arg3) {
+ return false;
+ }
+
+ public void onShowPress(MotionEvent arg0) {
+ }
+
+ public boolean onSingleTapUp(MotionEvent arg0) {
+ if (slideShow == true || randomShow == true){
+ if (SlideshowPaused == false)
+ {
+ onPause();
+ Toast.makeText(this, "Pause",
+ Toast.LENGTH_SHORT).show();
+ return true;
+ }
+ else
+ {
+ onResume();
+ Toast.makeText(this, "Play",
+ Toast.LENGTH_SHORT).show();
+ return true;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-11 11:49:07
|
Revision: 4029
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4029&view=rev
Author: kroko_koenig
Date: 2010-12-11 11:49:00 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
so far...
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-11 11:49:00 UTC (rev 4029)
@@ -11,6 +11,11 @@
Music section
-------------
browse folders (MP shares)
+browse MP database for artist,albums,songs
+add title to playlist
+view playlist
+delete item from playlist
+clear playlist
Video section
-------------
@@ -21,17 +26,19 @@
show actual title
show actual time
show actual cover
+clear playlist
+delete one item
Remote
------
most functions as on my remote
+two more buttons for subtitle / osd
-
Main issues
------------
-Vibration (on/off settings)
-Vibration feedback
+Vibration feedback (not completed)
Check if WIFI is on
-gesture control for pictures (swipe)
+gesture control for pictures (swipe) / alertdialog
save files from Android to MP
if the MP has no focus the remote doesnt work (normal)
+Progress is not displayed
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -44,8 +44,10 @@
private Handler mHandler = new Handler();
private String actualDir = "";
+
private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> musicList;
-
+ private static ReceiveDirectoryXmlHandler.DirItems selectedItem;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -55,7 +57,7 @@
mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(MusicDir.this));
+
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
@@ -66,14 +68,16 @@
musicItem music = (musicItem) iv.getTag();
if (music.typ == "item") {
- // Picturesfullscreen.selectedPicture = position - 1;
- // Intent myIntent = new Intent(MusicDir.this,
- // Picturesfullscreen.class);
- // startActivityForResult(myIntent, 0);
+ selectedItem = musicList.get(position);
+ PostAddFile(selectedItem.File);
+
+ Toast.makeText(MusicDir.this,
+ selectedItem.File + " has been added", Toast.LENGTH_SHORT).show();
+
}
if (music.typ == "folder") {
- actualDir += music.title + "/";
+ actualDir += music.title.replaceAll(" ", "%20") + "/";
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 0);
@@ -93,17 +97,32 @@
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 0);
}
-
}
});
}
+ public void PostAddFile(String Filename) {
+
+ 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>" + Filename + "</filename>";
+ xml += "<artist></artist>";
+ xml += "<title>" + Filename + "</title>";
+ xml += "<duration>0</duration>";
+ xml += "</message>";
+
+ post.Post(xml);
+ }
+
+
@Override
public void onStart() {
super.onStart();
-
- // mHandler.removeCallbacks(mUpdateTimeTask);
- // mHandler.postDelayed(mUpdateTimeTask, 100);
}
private Runnable mUpdateTimeTask = new Runnable() {
@@ -124,7 +143,7 @@
.show();
} else {
GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.invalidateViews();
+ gridview.setAdapter(new ImageAdapter2(this));
}
}
@@ -158,52 +177,51 @@
if (convertView == null) { // if it's not recycled, initialize some
// attributes
- if (position > 0) {
- position = position - 1;
+ LayoutInflater li = LayoutInflater.from(mContext);
+ v = li.inflate(R.layout.icon, null);
+ } else {
+ v = convertView;
+ }
- DirItems item1 = musicList.get(position);
+ if (position > 0) {
+ position = position - 1;
- String txtName = item1.File;
- Boolean isFolder = item1.isFolder;
+ DirItems item1 = musicList.get(position);
- LayoutInflater li = LayoutInflater.from(mContext);
- v = li.inflate(R.layout.icon, null);
+ String txtName = item1.File;
+ Boolean isFolder = item1.isFolder;
- TextView tv = (TextView) v.findViewById(R.id.icon_text);
- tv.setText(txtName);
+ TextView tv = (TextView) v.findViewById(R.id.icon_text);
+ tv.setText(txtName);
- ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
-
- if (isFolder) {
- iv.setImageResource(R.drawable.folder);
- musicItem item = new musicItem();
- item.title = txtName;
- item.typ = "folder";
- iv.setTag(item);
- } else {
- iv.setImageResource(R.drawable.audio);
- musicItem item = new musicItem();
- item.title = txtName;
- item.typ = "item";
- iv.setTag(item);
- }
- } else {
- LayoutInflater li = LayoutInflater.from(mContext);
- v = li.inflate(R.layout.icon, null);
+ ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
- TextView tv = (TextView) v.findViewById(R.id.icon_text);
- tv.setText("..");
-
- ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
- iv.setImageResource(R.drawable.folderback);
+ if (isFolder) {
+ iv.setImageResource(R.drawable.folder);
musicItem item = new musicItem();
- item.title = "..";
- item.typ = "oneup";
+ item.title = txtName;
+ item.typ = "folder";
iv.setTag(item);
+ } else {
+ iv.setImageResource(R.drawable.audio);
+ musicItem item = new musicItem();
+ item.title = txtName;
+ item.typ = "item";
+ iv.setTag(item);
}
+ } else {
+ LayoutInflater li = LayoutInflater.from(mContext);
+ v = li.inflate(R.layout.icon, null);
- } else {
- v = convertView;
+ TextView tv = (TextView) v.findViewById(R.id.icon_text);
+ tv.setText("..");
+
+ ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+ iv.setImageResource(R.drawable.folderback);
+ musicItem item = new musicItem();
+ item.title = "..";
+ item.typ = "oneup";
+ iv.setTag(item);
}
return v;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -31,6 +31,7 @@
import android.content.SharedPreferences;
import android.content.res.AssetManager;
import android.os.Bundle;
+import android.os.Handler;
import android.os.Vibrator;
import android.view.View;
import android.widget.*;
@@ -38,7 +39,8 @@
public class main extends Activity {
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
+ private Handler mHandler = new Handler();
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -162,4 +164,48 @@
v.vibrate(100);
}
}
+
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 1000);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ }
+
+ private Runnable mUpdateTimeTask = new Runnable() {
+ public void run() {
+ update();
+ mHandler.postDelayed(mUpdateTimeTask, 1000);
+ }
+ };
+
+ private void update() {
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
+ MODE_PRIVATE);
+
+ String HttpServer = settings.getString("Server", "192.168.0.30");
+ String HttpPort = settings.getString("Port", "8200");
+
+ nowplayinghandler handler = nowplayinghandler.getinstance();
+ handler.setconnection(HttpServer, HttpPort);
+ handler.fetchdata();
+
+ String display = "nothing playing";
+ TextView txt0 = (TextView) findViewById(R.id.main_now_playing);
+
+ if ((nowplayinghandler.PlayerState != null) &&
+ (!nowplayinghandler.PlayerState.equals("no player active"))) {
+ display = nowplayinghandler.Artist + " - " + nowplayinghandler.Title;
+ }
+ txt0.setText(display);
+ }
+
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -47,7 +47,7 @@
btn1.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- PostCommand("previous");
+ PostCommand("prevItem");
}
});
btn2.setOnClickListener(new View.OnClickListener() {
@@ -63,7 +63,7 @@
});
btn5.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- PostCommand("next");
+ PostCommand("nextItem");
}
});
btn6.setOnClickListener(new View.OnClickListener() {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -117,7 +117,7 @@
public void onClick(DialogInterface dialog, int item) {
switch (item) {
case 0:
-
+ PostDeleteItem(selectedItem.Filename);
mHandler.postDelayed(mUpdateTimeTask, 100);
Toast.makeText(nowplaylist.this,
selectedItem.Title + " has been deleted", Toast.LENGTH_SHORT).show();
@@ -157,7 +157,7 @@
post.Post(xml);
}
- public void PostAddItem(ReceiveDbXmlHandler.DbItems Item) {
+ public void PostDeleteItem(String Filename) {
PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
@@ -165,11 +165,8 @@
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 += "<command>DELETE_MUSIC</command>";
+ xml += "<filename>" + Filename + "</filename>";
xml += "</message>";
post.Post(xml);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -45,11 +45,13 @@
if (localName == "Typ") {
item.Typ = currentValue;
}
+ if (localName == "Filename") {
+ item.Filename = currentValue;
+ }
if (localName == "Item") {
nowplaylisthandler.PlayList.add(item);
item = null;
}
-
}
/**
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -31,6 +31,7 @@
public String Duration = "";
public String Played = "";
public String Typ = "";
+ public String Filename = "";
}
public static nowplaylisthandler getinstance() {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-11 11:49:00 UTC (rev 4029)
@@ -59,6 +59,7 @@
mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.GridView01);
+
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-11 09:50:46 UTC (rev 4028)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-11 11:49:00 UTC (rev 4029)
@@ -365,8 +365,28 @@
#region player
if (data["command"] == "ACTION_PLAY")
{
- Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
- GUIGraphicsContext.OnAction(action);
+ PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+
+ if (g_Player.Playing)
+ {
+ Action action = new Action(Action.ActionType.ACTION_PAUSE, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ else
+ {
+ if (playlistPlayer.CurrentPlaylistType == PlayListType.PLAYLIST_NONE)
+ {
+ playlistPlayer.CurrentPlaylistType = PlayListType.PLAYLIST_MUSIC;
+
+ PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
+ if (playList.Count > 0) playlistPlayer.Play(0);
+ }
+ else
+ {
+ Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ }
}
if (data["command"] == ("ACTION_STOP"))
{
@@ -517,6 +537,8 @@
#endregion
#region playlist
+
+ #region add a item
if (data["command"] == ("ADD_MUSIC"))
{
// add music
@@ -557,7 +579,22 @@
}
}
+ #endregion
+ #region delete a item
+ if (data["command"] == ("DELETE_MUSIC"))
+ {
+ // deltete music
+ // parameter = filename
+
+ PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
+
+ playList.Remove(data["filename"]);
+ }
+ #endregion
+
+ #region clear playlist
if (data["command"] == ("REMOVE_PLAYLIST"))
{
// add music
@@ -580,6 +617,7 @@
playList.Clear();
}
+ #endregion
#endregion
}
@@ -1383,6 +1421,7 @@
msg += "<Duration>" + duration + "</Duration>\r\n";
msg += "<Played>" + played.ToString() + "</Played>\r\n";
msg += "<Typ>" + typ + "</Typ>\r\n";
+ msg += "<Filename>" + file + "</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.
|
|
From: <kro...@us...> - 2010-12-11 09:50:54
|
Revision: 4028
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4028&view=rev
Author: kroko_koenig
Date: 2010-12-11 09:50:46 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
music part almost...
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.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/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
trunk/plugins/AndroidRemote/Release/setup2.jpg
trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/music_menu.xml
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -123,6 +123,7 @@
public static final int btn_main_skp_back=0x7f06000e;
public static final int btn_main_skp_forw=0x7f060010;
public static final int btn_main_video=0x7f060009;
+ public static final int clearplaylist=0x7f060050;
public static final int full_text=0x7f060018;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
@@ -146,14 +147,16 @@
public static final int now_progress=0x7f06001e;
public static final int now_stop=0x7f060024;
public static final int now_title=0x7f060021;
- public static final int open=0x7f060050;
- public static final int rslide=0x7f060053;
- public static final int save=0x7f06004f;
- public static final int send=0x7f060051;
+ public static final int open=0x7f060053;
+ public static final int playlist=0x7f06004f;
+ public static final int rslide=0x7f060056;
+ public static final int save=0x7f060052;
+ public static final int sdcard=0x7f060051;
+ public static final int send=0x7f060054;
public static final int server_ip=0x7f06004a;
public static final int server_macid=0x7f06004c;
public static final int server_port=0x7f06004b;
- public static final int slide=0x7f060052;
+ public static final int slide=0x7f060055;
public static final int title=0x7f06004e;
public static final int vibration=0x7f06004d;
public static final int widget0=0x7f060011;
@@ -185,7 +188,8 @@
public static final int title=0x7f030011;
}
public static final class menu {
- public static final int picturefullscreenmenu=0x7f050000;
+ public static final int music_menu=0x7f050000;
+ public static final int picturefullscreenmenu=0x7f050001;
}
public static final class string {
public static final int app_name=0x7f040000;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml 2010-12-11 09:50:46 UTC (rev 4028)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:background="@drawable/back"
- android:layout_height="fill_parent">
+ android:layout_height="fill_parent"
+ android:background="@drawable/brush">
<TextView android:id="@+id/TextView01" android:layout_height="wrap_content"
android:text="Actual playlist"
android:textStyle="normal|bold" android:gravity="center_vertical|center_horizontal"
- android:layout_width="fill_parent"></TextView>
+ android:layout_width="fill_parent" android:background="#FFA9A9A9" android:textColor="#000" android:textSize="18dip"></TextView>
<ListView android:id="@+id/ListView01" android:layout_height="wrap_content"
android:layout_width="fill_parent">
</ListView>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-12-11 09:50:46 UTC (rev 4028)
@@ -18,9 +18,8 @@
android:gravity="center_horizontal">
</TextView>
- <ImageView android:id="@+id/now_cd" android:layout_width="200dip"
- android:layout_height="200dip" android:scaleType="centerCrop"
- android:background="@drawable/cdcover" android:layout_gravity="center_horizontal">
+ <ImageView android:id="@+id/now_cd" android:scaleType="centerCrop"
+ android:background="@drawable/cdcover" android:layout_gravity="center_horizontal" android:layout_height="180dip" android:layout_width="180dip">
</ImageView>
<SeekBar android:id="@+id/now_progress" android:layout_width="fill_parent"
@@ -60,15 +59,15 @@
<LinearLayout android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
<ImageButton android:id="@+id/now_prev"
- android:background="@drawable/skip_back" android:layout_width="60dip" android:layout_height="40dip"/>
+ android:background="@drawable/skip_back" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_stop"
- android:background="@drawable/stop" android:layout_width="60dip" android:layout_height="40dip"/>
+ android:background="@drawable/stop" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_play"
- android:background="@drawable/right" android:layout_width="60dip" android:layout_height="40dip"/>
+ android:background="@drawable/right" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_next"
- android:background="@drawable/skip_forward" android:layout_width="60dip" android:layout_height="40dip"/>
+ android:background="@drawable/skip_forward" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_list"
- android:background="@drawable/document" android:layout_width="60dip" android:layout_height="40dip"/>
+ android:background="@drawable/document" android:layout_width="60dip" android:layout_height="60dip"/>
</LinearLayout>
</LinearLayout>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/music_menu.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/music_menu.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/music_menu.xml 2010-12-11 09:50:46 UTC (rev 4028)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+
+
+
+<item android:id="@+id/playlist" android:title="Add to playlist"></item>
+<item android:id="@+id/clearplaylist" android:title="Clear playlist"></item><item android:id="@+id/sdcard" android:title="Save to SD card"></item>
+
+</menu>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -53,6 +53,10 @@
public ArrayList<DbItems> GetSongsByArtist(String Artist) {
return fetchData("song.xml?artist=" + Artist);
}
+
+ public ArrayList<DbItems> GetSongsByAlbum(String AlbumArtist) {
+ return fetchData("song.xml?album=" + AlbumArtist);
+ }
private ArrayList<DbItems> fetchData(String Data) {
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-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -25,9 +25,11 @@
import java.io.InputStream;
import mediaportal.remote.R;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.content.res.AssetManager;
import android.os.Bundle;
+import android.os.Vibrator;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
@@ -55,6 +57,7 @@
Button can = (Button) findViewById(R.id.btnBack);
can.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("previousMenu");
}
});
@@ -62,6 +65,7 @@
Button menu = (Button) findViewById(R.id.btnMenu);
menu.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("contextMenu");
}
});
@@ -69,6 +73,7 @@
Button home = (Button) findViewById(R.id.btnHome);
home.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("parentDir");
}
});
@@ -76,6 +81,7 @@
Button info = (Button) findViewById(R.id.btnInfo);
info.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("showInfo");
}
});
@@ -83,6 +89,7 @@
Button left = (Button) findViewById(R.id.btnLeft);
left.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("moveLeft");
}
});
@@ -90,6 +97,7 @@
Button right = (Button) findViewById(R.id.btnRight);
right.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("moveRight");
}
});
@@ -97,6 +105,7 @@
Button up = (Button) findViewById(R.id.btnUp);
up.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("moveUp");
}
});
@@ -104,6 +113,7 @@
Button down = (Button) findViewById(R.id.btnDown);
down.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("moveDown");
}
});
@@ -111,6 +121,7 @@
Button ok = (Button) findViewById(R.id.btnOk);
ok.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("selectItem");
}
});
@@ -125,6 +136,7 @@
Button pause = (Button) findViewById(R.id.btnPause);
pause.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("pause");
}
});
@@ -132,6 +144,7 @@
Button stop = (Button) findViewById(R.id.btnStop);
stop.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("stop");
}
});
@@ -139,6 +152,7 @@
Button skipForw = (Button) findViewById(R.id.btnSkipForw);
skipForw.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("nextItem");
}
});
@@ -146,6 +160,7 @@
Button skipBack = (Button) findViewById(R.id.btnSkipBack);
skipBack.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("prevItem");
}
});
@@ -153,6 +168,7 @@
Button fForw = (Button) findViewById(R.id.btnFForw);
fForw.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("forward");
}
});
@@ -160,6 +176,7 @@
Button fBackw = (Button) findViewById(R.id.btnFBack);
fBackw.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("rewind");
}
});
@@ -231,4 +248,12 @@
public boolean onSingleTapUp(MotionEvent arg0) {
return false;
}
+
+ public void DoVibrate() {
+ if (Settings.Vibrate) {
+ // Get instance of Vibrator from current Context
+ Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ v.vibrate(100);
+ }
+ }
}
\ No newline at end of file
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-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -25,9 +25,11 @@
import java.io.InputStream;
import mediaportal.remote.R;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.content.res.AssetManager;
import android.os.Bundle;
+import android.os.Vibrator;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
@@ -54,18 +56,21 @@
Button btnVolumeUp = (Button) findViewById(R.id.btnVolumeUp);
btnVolumeUp.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("volumeUp");
}
});
Button btnVolumeDown = (Button) findViewById(R.id.btnVolumeDown);
btnVolumeDown.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("volumeDown");
}
});
Button btnVolumeMute = (Button) findViewById(R.id.btnVolumeMute);
btnVolumeMute.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("volumeMute");
}
});
@@ -73,12 +78,14 @@
Button btnChannelUp = (Button) findViewById(R.id.btnChannelUp);
btnChannelUp.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("nextChannel");
}
});
Button btnChannelDown = (Button) findViewById(R.id.btnChannelDown);
btnChannelDown.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("prevChannel");
}
});
@@ -86,6 +93,7 @@
Button btnExit = (Button) findViewById(R.id.btnExit);
btnExit.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("exit");
}
});
@@ -98,12 +106,14 @@
Button btnHibernate = (Button) findViewById(R.id.btnHibernate);
btnHibernate.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("hibernate");
}
});
Button btnRestart = (Button) findViewById(R.id.btnRestart);
btnRestart.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("restart");
}
});
@@ -117,6 +127,7 @@
Button btnWakeOnLan = (Button) findViewById(R.id.btnWakeOnLan);
btnWakeOnLan.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
PostCommand("wakeonlan");
}
});
@@ -185,4 +196,12 @@
public boolean onSingleTapUp(MotionEvent arg0) {
return false;
}
+
+ public void DoVibrate() {
+ if (Settings.Vibrate) {
+ // Get instance of Vibrator from current Context
+ Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ v.vibrate(100);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -25,6 +25,7 @@
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
@@ -52,17 +53,25 @@
ListView l1 = (ListView) findViewById(R.id.list_album);
l1.setAdapter(new EfficientAdapter(musicAlbum.this));
+ l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
+ {
+ //@override
+ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+ long arg3) {
+
+ ReceiveDbXmlHandler.DbItems item = albumList.get(arg2);
+
+ musicResults.Select = item.Album + "&" + item.Artist;
+ musicResults.Mode = musicResults.SelectMode.Album;
+
+ Intent myIntent = new Intent(arg1.getContext(), musicResults.class);
+ startActivityForResult(myIntent, 0);
+ }
+ });
+
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
l1.setDividerHeight(2);
-
- l1.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
- public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
- int arg2, long arg3) {
- // TODO Auto-generated method stub
- return false;
- }
- });
}
@Override
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -60,7 +60,10 @@
long arg3) {
ReceiveDbXmlHandler.DbItems item = artistList.get(arg2);
+
musicResults.Select = item.Artist;
+ musicResults.Mode = musicResults.SelectMode.Artist;
+
Intent myIntent = new Intent(arg1.getContext(), musicResults.class);
startActivityForResult(myIntent, 0);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -23,18 +23,18 @@
import java.util.ArrayList;
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
-import android.view.ContextMenu;
import android.view.LayoutInflater;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ListView;
import android.widget.TextView;
@@ -42,13 +42,23 @@
public class musicResults extends Activity {
+ public static enum SelectMode
+ {
+ Artist,Album;
+ }
+
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
private static ArrayList<ReceiveDbXmlHandler.DbItems> itemList;
public static String Select = "";
-
+ public static SelectMode Mode;
+
+ ReceiveDbXmlHandler.DbItems selectedItem = null;
+ final CharSequence[] items = { "Add to playlist", "Clear playlist",
+ "Save to SD card", "Cancel" };
+
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_results);
@@ -60,37 +70,78 @@
l1.setDivider(divcolor);
l1.setDividerHeight(2);
- registerForContextMenu(l1);
+ l1.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ // @override
+ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+ long arg3) {
+
+ selectedItem = itemList.get(arg2);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(arg0
+ .getContext());
+ builder.setTitle(selectedItem.Title);
+ builder.setItems(items, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int item) {
+ switch (item) {
+ case 0:
+ PostAddItem(selectedItem);
+ Toast.makeText(musicResults.this,
+ selectedItem.Title + " has been added", Toast.LENGTH_SHORT).show();
+ break;
+ case 1:
+ PostClear();
+ Toast.makeText(musicResults.this, "Playlist has been cleared", Toast.LENGTH_SHORT).show();
+ break;
+ case 2:
+ SavetoSDCard();
+ Toast.makeText(musicResults.this,
+ selectedItem.Title + " has been transferd", Toast.LENGTH_SHORT).show();
+ break;
+ }
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ });
}
- @Override
- public void onCreateContextMenu(ContextMenu menu, View v,
- ContextMenuInfo menuInfo) {
- super.onCreateContextMenu(menu, v, menuInfo);
- menu.setHeaderTitle("Select action");
+ public void PostClear() {
- menu.add(0, 101, 0, "Add title to playlist");
- menu.add(0, 102, 0, "Download title to SD");
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
- ListView l1 = (ListView) findViewById(R.id.list_result);
- int x = l1.getSelectedItemPosition();
- if (x == -1)
- x = 0;
- if (itemList.size() > 0) {
- ReceiveDbXmlHandler.DbItems itm = itemList.get(x);
+ String xml = "";
- httpHandler http = new httpHandler();
- http.DownloadFile();
- }
- x = 1;
+ xml += "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+ xml += "<message>";
+ xml += "<command>CLEAR_PLAYLIST</command>";
+ xml += "</message>";
+
+ post.Post(xml);
}
- @Override
- public boolean onContextItemSelected(MenuItem item) {
- // item.id ==
- return true;
+ 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 void SavetoSDCard() {
+
+ }
+
@Override
public void onStart() {
super.onStart();
@@ -110,7 +161,10 @@
Log.d("update search", "do update");
ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ if(Mode == SelectMode.Artist)
itemList = handler.GetSongsByArtist(Select);
+ if(Mode == SelectMode.Album)
+ itemList = handler.GetSongsByAlbum(Select);
if (itemList.size() == 0) {
Toast.makeText(musicResults.this, "TIME OUT SERVER",
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -23,7 +23,9 @@
import java.util.ArrayList;
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
@@ -46,6 +48,10 @@
public static String Select = "";
+ ReceiveDbXmlHandler.DbItems selectedItem = null;
+ final CharSequence[] items = { "Add to playlist", "Clear playlist",
+ "Save to SD card", "Cancel" };
+
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_song);
@@ -62,11 +68,33 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- ReceiveDbXmlHandler.DbItems item = songList.get(arg2);
- PostAddItem(item);
- Toast.makeText(musicSong.this,
- "Title " + item.Title + " has been added",
- Toast.LENGTH_SHORT).show();
+ selectedItem = songList.get(arg2);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(arg0
+ .getContext());
+ builder.setTitle(selectedItem.Title);
+ builder.setItems(items, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int item) {
+ switch (item) {
+ case 0:
+ PostAddItem(selectedItem);
+ Toast.makeText(musicSong.this,
+ selectedItem.Title + " has been added", Toast.LENGTH_SHORT).show();
+ break;
+ case 1:
+ PostClear();
+ Toast.makeText(musicSong.this, "Playlist has been cleared", Toast.LENGTH_SHORT).show();
+ break;
+ case 2:
+ SavetoSDCard();
+ Toast.makeText(musicSong.this,
+ selectedItem.Title + " has been transferd", Toast.LENGTH_SHORT).show();
+ break;
+ }
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
}
});
}
@@ -133,6 +161,10 @@
post.Post(xml);
}
+ private void SavetoSDCard() {
+
+ }
+
private static class EfficientAdapter extends BaseAdapter {
private LayoutInflater mInflater;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -13,7 +13,9 @@
import org.apache.http.params.HttpParams;
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.content.res.AssetManager;
import android.graphics.Color;
@@ -89,6 +91,9 @@
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
+ final CharSequence[] items = { "Delete item", "Clear playlist", "Cancel" };
+ private nowplaylisthandler.PlayListItem selectedItem;
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -97,15 +102,38 @@
ListView l1 = (ListView) findViewById(R.id.ListView01);
l1.setAdapter(new EfficientAdapter(this));
- l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
- {
- //@override
+
+ l1.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ // @override
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
- long arg3) {
- //Toast.makeText(getBaseContext(), "You clicked "+country[arg2], Toast.LENGTH_LONG).show();
- }
+ long arg3) {
+
+ selectedItem = nowplaylisthandler.PlayList.get(arg2);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(arg0
+ .getContext());
+ builder.setTitle(selectedItem.Title);
+ builder.setItems(items, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int item) {
+ switch (item) {
+ case 0:
+
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+ Toast.makeText(nowplaylist.this,
+ selectedItem.Title + " has been deleted", Toast.LENGTH_SHORT).show();
+ break;
+ case 1:
+ PostClear();
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+ Toast.makeText(nowplaylist.this, "Playlist has been cleared", Toast.LENGTH_SHORT).show();
+ break;
+ }
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
}
- );
+ });
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -115,6 +143,38 @@
Toast.LENGTH_LONG).show();
}
+ 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);
+ }
+
@Override
public void onStart() {
super.onStart();
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-11 09:50:46 UTC (rev 4028)
@@ -23,38 +23,52 @@
import mediaportal.remote.R;
import android.app.Activity;
+import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
+import android.os.Vibrator;
import android.widget.CheckBox;
import android.widget.EditText;
+import android.widget.CompoundButton;
public class setup extends Activity {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setContentView(R.layout.setup);
+
+ CheckBox chk = (CheckBox) findViewById(R.id.vibration);
+ chk.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ public void onCheckedChanged(CompoundButton buttonView,
+ boolean isChecked) {
+ if (isChecked) {
+ DoVibrate();
+ }
+ }
+ });
}
-
+
@Override
public void onResume() {
super.onResume();
-
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE, MODE_PRIVATE);
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
+ MODE_PRIVATE);
+
Settings.Server = settings.getString("Server", "192.168.0.30");
Settings.Port = settings.getString("Port", "8200");
Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
Settings.Vibrate = settings.getBoolean("Vibrate", true);
-
- EditText txt1 = (EditText)findViewById(R.id.server_ip);
- EditText txt2 = (EditText)findViewById(R.id.server_port);
- EditText txt3 = (EditText)findViewById(R.id.server_macid);
- CheckBox chk = (CheckBox)findViewById(R.id.vibration);
-
+
+ EditText txt1 = (EditText) findViewById(R.id.server_ip);
+ EditText txt2 = (EditText) findViewById(R.id.server_port);
+ EditText txt3 = (EditText) findViewById(R.id.server_macid);
+ CheckBox chk = (CheckBox) findViewById(R.id.vibration);
+
txt1.setText(Settings.Server);
txt2.setText(Settings.Port);
txt3.setText(Settings.MacId);
@@ -65,23 +79,32 @@
public void onPause() {
super.onPause();
- EditText txt1 = (EditText)findViewById(R.id.server_ip);
- EditText txt2 = (EditText)findViewById(R.id.server_port);
- EditText txt3 = (EditText)findViewById(R.id.server_macid);
- CheckBox chk = (CheckBox)findViewById(R.id.vibration);
+ EditText txt1 = (EditText) findViewById(R.id.server_ip);
+ EditText txt2 = (EditText) findViewById(R.id.server_port);
+ EditText txt3 = (EditText) findViewById(R.id.server_macid);
+ CheckBox chk = (CheckBox) findViewById(R.id.vibration);
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE, MODE_PRIVATE);
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
+ MODE_PRIVATE);
SharedPreferences.Editor prefEditor = settings.edit();
-
+
prefEditor.putString("Server", txt1.getText().toString());
- prefEditor.putString("Port",txt2.getText().toString());
+ prefEditor.putString("Port", txt2.getText().toString());
prefEditor.putString("MacId", txt3.getText().toString());
prefEditor.putBoolean("Vibrate", chk.isChecked());
prefEditor.commit();
-
+
Settings.Server = settings.getString("Server", "192.168.0.30");
Settings.Port = settings.getString("Port", "8200");
Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
Settings.Vibrate = settings.getBoolean("Vibrate", true);
}
+
+ public void DoVibrate() {
+ if (Settings.Vibrate) {
+ // Get instance of Vibrator from current Context
+ Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ v.vibrate(100);
+ }
+ }
}
Modified: trunk/plugins/AndroidRemote/Release/setup2.jpg
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2010-12-11 09:50:46 UTC (rev 4028)
@@ -29,27 +29,16 @@
private void InitializeComponent()
{
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.btnCopy = new System.Windows.Forms.Button();
+ this.txtMyIP = new System.Windows.Forms.Label();
this.txtPort = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.txtServer = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.btnVideos = new System.Windows.Forms.Button();
- this.btnMusic = new System.Windows.Forms.Button();
- this.btnPic = new System.Windows.Forms.Button();
- this.txtVideos = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.txtMusic = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.txtPic = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.txtMyIP = new System.Windows.Forms.Label();
- this.btnCopy = new System.Windows.Forms.Button();
- this.label4 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
@@ -68,6 +57,36 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Command controller";
//
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label4.Location = new System.Drawing.Point(286, 32);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(23, 16);
+ this.label4.TabIndex = 6;
+ this.label4.Text = "IP:";
+ //
+ // btnCopy
+ //
+ this.btnCopy.Location = new System.Drawing.Point(287, 54);
+ this.btnCopy.Name = "btnCopy";
+ this.btnCopy.Size = new System.Drawing.Size(75, 23);
+ this.btnCopy.TabIndex = 5;
+ this.btnCopy.Text = "use this IP";
+ this.btnCopy.UseVisualStyleBackColor = true;
+ this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
+ //
+ // txtMyIP
+ //
+ this.txtMyIP.AutoSize = true;
+ this.txtMyIP.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtMyIP.Location = new System.Drawing.Point(315, 32);
+ this.txtMyIP.Name = "txtMyIP";
+ this.txtMyIP.Size = new System.Drawing.Size(41, 16);
+ this.txtMyIP.TabIndex = 4;
+ this.txtMyIP.Text = "my IP";
+ //
// txtPort
//
this.txtPort.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -107,7 +126,7 @@
// btnSave
//
this.btnSave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnSave.Location = new System.Drawing.Point(12, 296);
+ this.btnSave.Location = new System.Drawing.Point(12, 114);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(84, 29);
this.btnSave.TabIndex = 1;
@@ -118,7 +137,7 @@
// btnCancel
//
this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnCancel.Location = new System.Drawing.Point(419, 296);
+ this.btnCancel.Location = new System.Drawing.Point(419, 114);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(84, 29);
this.btnCancel.TabIndex = 2;
@@ -126,147 +145,11 @@
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.btnVideos);
- this.groupBox2.Controls.Add(this.btnMusic);
- this.groupBox2.Controls.Add(this.btnPic);
- this.groupBox2.Controls.Add(this.txtVideos);
- this.groupBox2.Controls.Add(this.label7);
- this.groupBox2.Controls.Add(this.txtMusic);
- this.groupBox2.Controls.Add(this.label5);
- this.groupBox2.Controls.Add(this.txtPic);
- this.groupBox2.Controls.Add(this.label3);
- this.groupBox2.Location = new System.Drawing.Point(12, 114);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(491, 164);
- this.groupBox2.TabIndex = 3;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Share";
- //
- // btnVideos
- //
- this.btnVideos.Location = new System.Drawing.Point(445, 93);
- this.btnVideos.Name = "btnVideos";
- this.btnVideos.Size = new System.Drawing.Size(40, 23);
- this.btnVideos.TabIndex = 9;
- this.btnVideos.Text = "...";
- this.btnVideos.UseVisualStyleBackColor = true;
- this.btnVideos.Click += new System.EventHandler(this.btnVideos_Click);
- //
- // btnMusic
- //
- this.btnMusic.Location = new System.Drawing.Point(445, 61);
- this.btnMusic.Name = "btnMusic";
- this.btnMusic.Size = new System.Drawing.Size(40, 23);
- this.btnMusic.TabIndex = 8;
- this.btnMusic.Text = "...";
- this.btnMusic.UseVisualStyleBackColor = true;
- this.btnMusic.Click += new System.EventHandler(this.btnMusic_Click);
- //
- // btnPic
- //
- this.btnPic.Location = new System.Drawing.Point(445, 29);
- this.btnPic.Name = "btnPic";
- this.btnPic.Size = new System.Drawing.Size(40, 23);
- this.btnPic.TabIndex = 7;
- this.btnPic.Text = "...";
- this.btnPic.UseVisualStyleBackColor = true;
- this.btnPic.Click += new System.EventHandler(this.btnPic_Click);
- //
- // txtVideos
- //
- this.txtVideos.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txtVideos.Location = new System.Drawing.Point(36, 96);
- this.txtVideos.Name = "txtVideos";
- this.txtVideos.Size = new System.Drawing.Size(392, 16);
- this.txtVideos.TabIndex = 6;
- this.txtVideos.Text = "...";
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label7.Location = new System.Drawing.Point(14, 80);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(51, 16);
- this.label7.TabIndex = 5;
- this.label7.Text = "Videos";
- //
- // txtMusic
- //
- this.txtMusic.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txtMusic.Location = new System.Drawing.Point(36, 64);
- this.txtMusic.Name = "txtMusic";
- this.txtMusic.Size = new System.Drawing.Size(392, 16);
- this.txtMusic.TabIndex = 4;
- this.txtMusic.Text = "...";
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(14, 48);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(43, 16);
- this.label5.TabIndex = 3;
- this.label5.Text = "Music";
- //
- // txtPic
- //
- this.txtPic.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txtPic.Location = new System.Drawing.Point(36, 32);
- this.txtPic.Name = "txtPic";
- this.txtPic.Size = new System.Drawing.Size(392, 16);
- this.txtPic.TabIndex = 2;
- this.txtPic.Text = "...";
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(14, 16);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(56, 16);
- this.label3.TabIndex = 1;
- this.label3.Text = "Pictures";
- //
- // txtMyIP
- //
- this.txtMyIP.AutoSize = true;
- this.txtMyIP.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txtMyIP.Location = new System.Drawing.Point(315, 32);
- this.txtMyIP.Name = "txtMyIP";
- this.txtMyIP.Size = new System.Drawing.Size(41, 16);
- this.txtMyIP.TabIndex = 4;
- this.txtMyIP.Text = "my IP";
- //
- // btnCopy
- //
- this.btnCopy.Location = new System.Drawing.Point(287, 54);
- this.btnCopy.Name = "btnCopy";
- this.btnCopy.Size = new System.Drawing.Size(75, 23);
- this.btnCopy.TabIndex = 5;
- this.btnCopy.Text = "use this IP";
- this.btnCopy.UseVisualStyleBackColor = true;
- this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(286, 32);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(23, 16);
- this.label4.TabIndex = 6;
- this.label4.Text = "IP:";
- //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(515, 337);
- this.Controls.Add(this.groupBox2);
+ this.ClientSize = new System.Drawing.Size(511, 155);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnSave);
this.Controls.Add(this.groupBox1);
@@ -281,8 +164,6 @@
this.Load += new System.EventHandler(this.Setup_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
this.ResumeLayout(false);
}
@@ -296,16 +177,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.Button btnCancel;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Button btnVideos;
- private System.Windows.Forms.Button btnMusic;
- private System.Windows.Forms.Button btnPic;
- private System.Windows.Forms.Label txtVideos;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Label txtMusic;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label txtPic;
- private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label txtMyIP;
private System.Windows.Forms.Button btnCopy;
private System.Windows.Forms.Label label4;
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2010-12-11 06:12:57 UTC (rev 4027)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2010-12-11 09:50:46 UTC (rev 4028)
@@ -61,13 +61,6 @@
{
txtServer.Text = xmlreader.GetValueAsString("android", "server", "192.168.0.30");
txtPort.Text = xmlreader.GetValueAsString("android", "port", "8200");
-
- txtPic.Text = xmlreader.GetValueAsString("android", "pictures",
- Environment.GetFolderPath(Environment.SpecialFolder.MyPictures));
- txtMusic.Text = xmlreader.GetValueAsString("android", "music",
- Environment.GetFolderPath(Environment.SpecialFolder.MyMusic));
- txtVideos.Text = xmlreader.GetValueAsString("android", "videos",
- Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments));
}
}
private void SaveSettings()
@@ -77,10 +70,6 @@
{
xmlwriter.SetValue("android", "server", txtServer.Text);
xmlwriter.SetValue("android", "port", txtPort.Text);
-
- xmlwriter.SetValue("android", "pictures", txtPic.Text);
- xmlwriter.SetValue("android", "music", txtMusic.Text);
- xmlwriter.SetValue("android", "videos", txtVideos.Text);
}
}
@@ -94,39 +83,6 @@
this.Close();
}
- private void btnPic_Click(object sender, EventArgs e)
- {
- FolderBrowserDialog folder = new FolderBrowserDialog();
- folder.SelectedPath = txtPic.Text;
-
- DialogResult res = folder.ShowDialog();
- if (res == DialogResult.OK)
- {
- txtPic.Text = folder.SelectedPath;
- }
- }
- private void btnMusic_Click(object sender, EventArgs e)
- {
- FolderBrowserDialog folder = new FolderBrowserDialog();
- folder.SelectedPath = txtMusic.Text;
-
- DialogResult res = folder.ShowDialog();
- if (res == DialogResult.OK)
- {
- txtMusic.Text = folder.SelectedPath;
- }
- }
- private void btnVideos_Click(object sender, EventArgs e)
- {
- FolderBrowserDialog folder = new FolderBrowserDialog();
- folder.SelectedPath = txtVideos.Text;
-
- DialogResult res = folder.ShowDialog();
- if (res == DialogResult.OK)
- {
- txtVideos.Text = folder.SelectedPath;
- }
- }
private void btnCopy_Click(object sender, EventArgs e)
{
txtServer.Text = txtMyIP.Text;
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.
|
|
From: <Rol...@us...> - 2010-12-11 06:13:03
|
Revision: 4027
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4027&view=rev
Author: Rollsroyc3
Date: 2010-12-11 06:12:57 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Just updated case of musicdir filename so my project could compile.
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-10 11:12:42 UTC (rev 4026)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-11 06:12:57 UTC (rev 4027)
@@ -19,7 +19,7 @@
<activity android:launchMode="singleInstance" android:name=".Remote_02"></activity>
<activity android:name=".pictures" android:launchMode="singleInstance"></activity>
<activity android:name=".picturesfullscreen" android:launchMode="singleInstance"></activity>
- <activity android:launchMode="singleInstance" android:name=".musicDir"></activity>
+ <activity android:launchMode="singleInstance" android:name=".MusicDir"></activity>
<activity android:name=".setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaylist" android:launchMode="singleInstance"></activity>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-10 11:12:42 UTC (rev 4026)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-11 06:12:57 UTC (rev 4027)
@@ -40,7 +40,7 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
-public class musicDir extends Activity {
+public class MusicDir extends Activity {
private Handler mHandler = new Handler();
private String actualDir = "";
@@ -55,7 +55,7 @@
mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(musicDir.this));
+ gridview.setAdapter(new ImageAdapter2(MusicDir.this));
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
@@ -120,7 +120,7 @@
musicList = h.getMusicDir(actualDir);
if (musicList.size() == 0) {
- Toast.makeText(musicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
} else {
GridView gridview = (GridView) findViewById(R.id.music_grid);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-10 11:12:42 UTC (rev 4026)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-11 06:12:57 UTC (rev 4027)
@@ -58,7 +58,7 @@
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, musicDir.class);
+ intent = new Intent().setClass(this, MusicDir.class);
spec = tabHost.newTabSpec("music")
.setIndicator("Music", res.getDrawable(R.drawable.ic_tab4))
.setContent(intent);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-10 11:12:49
|
Revision: 4026
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4026&view=rev
Author: kroko_koenig
Date: 2010-12-10 11:12:42 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
vibration and small layout
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java
trunk/plugins/AndroidRemote/Release/settings.jpg
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote01.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote02.xml
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -82,38 +82,38 @@
public static final int GridView01=0x7f060017;
public static final int ImageView01=0x7f060019;
public static final int LinearLayout01=0x7f06001a;
- public static final int ListView01=0x7f060029;
+ public static final int ListView01=0x7f060028;
public static final int TableLayout01=0x7f060005;
public static final int TableRow01=0x7f060006;
public static final int TextView01=0x7f060003;
public static final int TextView02=0x7f060004;
- public static final int btnBack=0x7f06003f;
- public static final int btnChannelDown=0x7f060044;
- public static final int btnChannelUp=0x7f060041;
- public static final int btnDown=0x7f06003e;
- public static final int btnExit=0x7f060045;
- public static final int btnFBack=0x7f06002c;
- public static final int btnFForw=0x7f06002e;
- public static final int btnHibernate=0x7f060047;
- public static final int btnHome=0x7f060035;
- public static final int btnInfo=0x7f060037;
- public static final int btnLeft=0x7f060039;
- public static final int btnMenu=0x7f06003d;
- public static final int btnOk=0x7f06003a;
- public static final int btnPause=0x7f060032;
- public static final int btnPlay=0x7f06002d;
- public static final int btnRestart=0x7f060048;
- public static final int btnRight=0x7f06003b;
- public static final int btnShutOff=0x7f060049;
- public static final int btnSkipBack=0x7f060030;
- public static final int btnSkipForw=0x7f060033;
- public static final int btnStop=0x7f060031;
- public static final int btnSuspend=0x7f060046;
- public static final int btnUp=0x7f060036;
- public static final int btnVolumeDown=0x7f060043;
- public static final int btnVolumeMute=0x7f060042;
- public static final int btnVolumeUp=0x7f060040;
- public static final int btnWakeOnLan=0x7f06004a;
+ public static final int btnBack=0x7f06003e;
+ public static final int btnChannelDown=0x7f060043;
+ public static final int btnChannelUp=0x7f060040;
+ public static final int btnDown=0x7f06003d;
+ public static final int btnExit=0x7f060044;
+ public static final int btnFBack=0x7f06002b;
+ public static final int btnFForw=0x7f06002d;
+ public static final int btnHibernate=0x7f060046;
+ public static final int btnHome=0x7f060034;
+ public static final int btnInfo=0x7f060036;
+ public static final int btnLeft=0x7f060038;
+ public static final int btnMenu=0x7f06003c;
+ public static final int btnOk=0x7f060039;
+ public static final int btnPause=0x7f060031;
+ public static final int btnPlay=0x7f06002c;
+ public static final int btnRestart=0x7f060047;
+ public static final int btnRight=0x7f06003a;
+ public static final int btnShutOff=0x7f060048;
+ public static final int btnSkipBack=0x7f06002f;
+ public static final int btnSkipForw=0x7f060032;
+ public static final int btnStop=0x7f060030;
+ public static final int btnSuspend=0x7f060045;
+ public static final int btnUp=0x7f060035;
+ public static final int btnVolumeDown=0x7f060042;
+ public static final int btnVolumeMute=0x7f060041;
+ public static final int btnVolumeUp=0x7f06003f;
+ public static final int btnWakeOnLan=0x7f060049;
public static final int btn_main_music=0x7f060008;
public static final int btn_main_now_playing=0x7f06000b;
public static final int btn_main_pictures=0x7f060007;
@@ -132,14 +132,13 @@
public static final int list_song=0x7f060016;
public static final int main_now_playing=0x7f06000d;
public static final int music_grid=0x7f060012;
- public static final int naviRemote_text=0x7f06002a;
+ public static final int naviRemote_text=0x7f060029;
public static final int now_album=0x7f06001c;
public static final int now_artist=0x7f060022;
public static final int now_cd=0x7f06001d;
- public static final int now_list=0x7f060028;
- public static final int now_next=0x7f060027;
- public static final int now_pause=0x7f060025;
- public static final int now_play=0x7f060026;
+ public static final int now_list=0x7f060027;
+ public static final int now_next=0x7f060026;
+ public static final int now_play=0x7f060025;
public static final int now_playing=0x7f06001b;
public static final int now_playing_right=0x7f060020;
public static final int now_playing_t_left=0x7f06001f;
@@ -151,17 +150,18 @@
public static final int rslide=0x7f060053;
public static final int save=0x7f06004f;
public static final int send=0x7f060051;
- public static final int server_ip=0x7f06004b;
- public static final int server_macid=0x7f06004d;
- public static final int server_port=0x7f06004c;
+ public static final int server_ip=0x7f06004a;
+ public static final int server_macid=0x7f06004c;
+ public static final int server_port=0x7f06004b;
public static final int slide=0x7f060052;
public static final int title=0x7f06004e;
+ public static final int vibration=0x7f06004d;
public static final int widget0=0x7f060011;
- public static final int widget00=0x7f06002b;
- public static final int widget01=0x7f06002f;
- public static final int widget02=0x7f060034;
- public static final int widget03=0x7f060038;
- public static final int widget04=0x7f06003c;
+ public static final int widget00=0x7f06002a;
+ public static final int widget01=0x7f06002e;
+ public static final int widget02=0x7f060033;
+ public static final int widget03=0x7f060037;
+ public static final int widget04=0x7f06003b;
public static final int widget44=0x7f060000;
}
public static final class layout {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-10 11:12:42 UTC (rev 4026)
@@ -1,22 +1,37 @@
Pictures section
----------------
-
-implemented:
-
browse folders (MP shares)
display thumbs
-
-
save to sd
open browser
send picture
slide show
random slide show
-wishes:
+Music section
+-------------
+browse folders (MP shares)
+Video section
+-------------
+nothing yet
+
+NowPlaying
+----------
+show actual title
+show actual time
+show actual cover
+
+Remote
+------
+most functions as on my remote
+
+
+Main issues
+------------
+Vibration (on/off settings)
+Vibration feedback
+Check if WIFI is on
gesture control for pictures (swipe)
save files from Android to MP
-
-Music section
--------------
+if the MP has no focus the remote doesnt work (normal)
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-10 11:12:42 UTC (rev 4026)
@@ -35,13 +35,13 @@
android:layout_height="wrap_content" android:layout_marginTop="10dip">
<TextView android:id="@+id/now_playing_t_left"
android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textSize="12dip" android:textColor="#FF8080ff" android:text="00:00"
- android:gravity="left" />
+ android:textSize="12dip" android:text="00:00"
+ android:gravity="left" android:textColor="#FF000000"/>
<TextView android:id="@+id/now_playing_right"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:textSize="12dip"
- android:textColor="#FF8080ff" android:gravity="right" android:text="00:00"
- android:singleLine="true" />
+ android:gravity="right" android:text="00:00"
+ android:singleLine="true" android:textColor="#FF000000"/>
</RelativeLayout>
<TextView android:id="@+id/now_title" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:textSize="16dip"
@@ -57,19 +57,17 @@
</LinearLayout>
<LinearLayout android:layout_height="wrap_content"
- android:orientation="horizontal" android:layout_width="fill_parent">
+ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
<ImageButton android:id="@+id/now_prev"
- android:background="@drawable/rewind" android:layout_height="60dip" android:layout_width="60dip"/>
+ android:layout_height="60dip" android:background="@drawable/skip_back" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_stop"
- android:background="@drawable/stop" android:layout_height="60dip" android:layout_width="60dip"/>
- <ImageButton android:id="@+id/now_pause"
- android:background="@drawable/pause" android:layout_width="60dip" android:layout_height="60dip"/>
+ android:background="@drawable/stop" android:layout_height="60dip" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_play"
- android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/right"/>
+ android:layout_height="60dip" android:background="@drawable/right" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_next"
- android:background="@drawable/forward" android:layout_width="60dip" android:layout_height="60dip"/>
+ android:layout_height="60dip" android:background="@drawable/skip_forward" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_list"
- android:background="@drawable/document" android:layout_width="60dip" android:layout_height="60dip"/>
+ android:background="@drawable/document" android:layout_height="60dip" android:layout_width="60dip"/>
</LinearLayout>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2010-12-10 11:12:42 UTC (rev 4026)
@@ -24,5 +24,6 @@
<EditText android:id="@+id/server_macid" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="12-34-56-78-90-12"
android:inputType="number|numberSigned"></EditText>
-
+
+<CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#000" android:textSize="18dip" android:id="@+id/vibration" android:text="use vibration feedback"></CheckBox>
</LinearLayout>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml 2010-12-10 11:12:42 UTC (rev 4026)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:background="@drawable/brush">
+
+<TableLayout
+ android:id="@+id/TableLayout01"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
+
+
+<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
+
+ <ImageButton android:src="@drawable/main_pictures" android:scaleType="fitXY"
+ android:layout_height="80dip" android:layout_width="80dip"
+ android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures">
+ </ImageButton>
+
+ <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip"
+ android:src="@drawable/main_music" android:id="@+id/btn_main_music">
+ </ImageButton>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
+
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="80dip" android:layout_width="80dip"
+ android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_video" android:id="@+id/btn_main_video">
+ </ImageButton>
+
+ <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_remote" android:id="@+id/btn_main_remote">
+ </ImageButton>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
+
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="80dip" android:layout_width="80dip"
+ android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_now_playing" android:id="@+id/btn_main_now_playing">
+ </ImageButton>
+
+ <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_settings" android:id="@+id/btn_main_settings">
+ </ImageButton>
+
+ </TableRow>
+
+</TableLayout>
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="nothing playing"
+ android:gravity="center_horizontal" android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing">
+ </TextView>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:background="#0FF0FFFF" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
+
+
+
+
+
+
+ <ImageButton android:src="@drawable/main_skp_back" android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_play" android:src="@drawable/main_play" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_skp_forw" android:src="@drawable/main_skp_forw" android:padding="2dip"></ImageButton>
+</LinearLayout>
+</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-12-10 11:12:42 UTC (rev 4026)
@@ -1,7 +1,7 @@
<LinearLayout android:id="@+id/LinearLayout01"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/back"
+ android:background="@drawable/brush"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/now_playing" android:layout_width="fill_parent"
@@ -36,13 +36,13 @@
android:layout_height="wrap_content" android:layout_marginTop="10dip">
<TextView android:id="@+id/now_playing_t_left"
android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textSize="12dip" android:textColor="#FF8080ff" android:text="00:00"
- android:gravity="left" />
+ android:textSize="12dip" android:text="00:00"
+ android:gravity="left" android:textColor="#FF000000"/>
<TextView android:id="@+id/now_playing_right"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:textSize="12dip"
- android:textColor="#FF8080ff" android:gravity="right" android:text="00:00"
- android:singleLine="true" />
+ android:gravity="right" android:text="00:00"
+ android:singleLine="true" android:textColor="#FF000000"/>
</RelativeLayout>
<TextView android:id="@+id/now_title" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:textSize="14dip"
@@ -58,24 +58,17 @@
</LinearLayout>
<LinearLayout android:layout_height="wrap_content"
- android:orientation="horizontal" android:layout_width="fill_parent">
+ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
<ImageButton android:id="@+id/now_prev"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/rewind" />
+ android:background="@drawable/skip_back" android:layout_width="60dip" android:layout_height="40dip"/>
<ImageButton android:id="@+id/now_stop"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/stop" />
- <ImageButton android:id="@+id/now_pause"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/pause" />
+ android:background="@drawable/stop" android:layout_width="60dip" android:layout_height="40dip"/>
<ImageButton android:id="@+id/now_play"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/play" />
+ android:background="@drawable/right" android:layout_width="60dip" android:layout_height="40dip"/>
<ImageButton android:id="@+id/now_next"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/forward" />
+ android:background="@drawable/skip_forward" android:layout_width="60dip" android:layout_height="40dip"/>
<ImageButton android:id="@+id/now_list"
- android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/document"/>
+ android:background="@drawable/document" android:layout_width="60dip" android:layout_height="40dip"/>
</LinearLayout>
</LinearLayout>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote01.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote01.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote01.xml 2010-12-10 11:12:42 UTC (rev 4026)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ android:id="@+id/widget0"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:background="@drawable/brush"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Remote 01"
+ android:gravity="center_horizontal" android:background="#FFA9A9A9"
+ android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:padding="5dip">
+ </TextView>
+
+ <LinearLayout
+ android:id="@+id/widget00"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:layout_marginTop="5dip">
+
+ <Button android:id="@+id/btnFBack"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:background="@drawable/rewind">
+ </Button>
+
+ <Button android:id="@+id/btnPlay"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/play">
+ </Button>
+
+ <Button android:id="@+id/btnFForw"
+ android:layout_width="80dip"
+ android:layout_height="60dip" android:background="@drawable/forward">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/widget01"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ >
+ <Button android:id="@+id/btnSkipBack"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:background="@drawable/skip_back">
+ </Button>
+
+ <Button android:id="@+id/btnStop"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:background="@drawable/stop">
+ </Button>
+
+ <Button android:id="@+id/btnPause"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:background="@drawable/pause">
+ </Button>
+
+ <Button android:id="@+id/btnSkipForw"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:background="@drawable/skip_forward">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/widget02"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:paddingTop="10dip">
+
+ <Button android:id="@+id/btnHome"
+ android:layout_width="80dip"
+ android:background="@drawable/home" android:layout_height="50dip">
+ </Button>
+
+ <Button android:id="@+id/btnUp"
+ android:layout_width="160dip" android:background="@drawable/up" android:layout_height="50dip">
+ </Button>
+
+ <Button android:id="@+id/btnInfo"
+ android:layout_width="80dip"
+ android:background="@drawable/info" android:layout_height="50dip">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/widget03"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <Button android:id="@+id/btnLeft"
+ android:layout_width="80dip"
+ android:background="@drawable/left" android:layout_height="100dip">
+ </Button>
+
+ <Button android:id="@+id/btnOk"
+ android:layout_width="160dip" android:background="@drawable/select" android:layout_height="100dip">
+ </Button>
+
+ <Button android:id="@+id/btnRight"
+ android:layout_width="80dip"
+ android:background="@drawable/right" android:layout_height="100dip">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/widget04"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ >
+
+ <Button android:id="@+id/btnMenu"
+ android:layout_width="80dip"
+ android:background="@drawable/menu" android:layout_height="50dip">
+ </Button>
+
+ <Button android:id="@+id/btnDown"
+ android:layout_width="160dip"
+ android:background="@drawable/down" android:layout_height="50dip">
+ </Button>
+
+ <Button android:id="@+id/btnBack"
+ android:layout_width="80dip"
+ android:background="@drawable/back" android:layout_height="50dip">
+ </Button>
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote02.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote02.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/remote02.xml 2010-12-10 11:12:42 UTC (rev 4026)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:id="@+id/widget0"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:background = "@drawable/brush"
+ android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <TextView android:id="@+id/naviRemote_text"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="Remote 02" android:gravity="center_horizontal"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:textSize="15dip" android:padding="2dip">
+ </TextView>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal" android:layout_marginTop="0dip">
+
+ <Button android:id="@+id/btnVolumeUp" android:background="@drawable/volume_p" android:layout_height="50dip" android:layout_width="60dip">
+ </Button>
+
+ <Button android:id="@+id/btnChannelUp" android:layout_marginLeft="40dip" android:background="@drawable/channel_p" android:layout_height="50dip" android:layout_width="60dip">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_height="wrap_content" android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical">
+
+ <Button android:id="@+id/btnVolumeMute" android:background="@drawable/mute" android:layout_height="50dip" android:layout_width="60dip">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_height="wrap_content" android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical" android:paddingBottom="5dip">
+
+ <Button android:id="@+id/btnVolumeDown" android:background="@drawable/volume_m" android:layout_height="50dip" android:layout_width="60dip">
+ </Button>
+
+ <Button android:id="@+id/btnChannelDown" android:layout_marginLeft="40dip" android:background="@drawable/channel_m" android:layout_height="50dip" android:layout_width="60dip">
+ </Button>
+ </LinearLayout>
+
+ <TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Power control"
+ android:gravity="center_horizontal" android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="2dip">
+ </TextView>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:textColor="#FFFFFFFF"
+ android:id="@+id/btnExit" android:gravity="bottom|center" android:background="@drawable/exit">
+ </Button>
+
+ <Button android:textSize="12dip" android:layout_height="60dip"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnSuspend"
+ android:gravity="bottom|center"
+ android:layout_width="60dip" android:background="@drawable/suspend">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:textColor="#FFFFFFFF" android:id="@+id/btnHibernate"
+ android:gravity="bottom|center" android:background="@drawable/hibernate">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:textColor="#FFFFFFFF" android:id="@+id/btnRestart"
+ android:gravity="bottom|center" android:background="@drawable/restart">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:textColor="#FFFFFFFF" android:id="@+id/btnShutOff"
+ android:gravity="bottom|center" android:background="@drawable/power_off">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_marginTop="10dip" android:layout_gravity="center_horizontal">
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:textColor="#FFFFFFFF" android:id="@+id/btnWakeOnLan"
+ android:gravity="bottom|center" android:background="@drawable/wake_on_lan">
+ </Button>
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
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-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -23,9 +23,7 @@
import java.io.IOException;
import java.io.InputStream;
-
import mediaportal.remote.R;
-
import android.app.Activity;
import android.content.Intent;
import android.content.res.AssetManager;
@@ -35,6 +33,7 @@
import android.view.View;
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
+import android.widget.Toast;
public class Remote_01 extends Activity implements OnGestureListener {
@@ -164,6 +163,10 @@
PostCommand("rewind");
}
});
+
+ Toast.makeText(this,
+ "swipe to left for more", Toast.LENGTH_LONG)
+ .show();
}
public void PostCommand(String button) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -26,5 +26,5 @@
public static String Server = "192.168.0.30";
public static String Port = "8200";
public static String MacId = "11-22-33-44-55-66";
-
+ public static Boolean Vibrate= true;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -21,23 +21,29 @@
package mediaportal.remote;
+import java.io.IOException;
+import java.io.InputStream;
+
import mediaportal.remote.R;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.AssetManager;
import android.os.Bundle;
+import android.os.Vibrator;
import android.view.View;
import android.widget.*;
public class main extends Activity {
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
+
SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
MODE_PRIVATE);
@@ -48,6 +54,7 @@
ImageButton btnPictures = (ImageButton) findViewById(R.id.btn_main_pictures);
btnPictures.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
Intent myIntent = new Intent(view.getContext(), pictures.class);
startActivityForResult(myIntent, 0);
}
@@ -56,6 +63,7 @@
ImageButton btnMusic = (ImageButton) findViewById(R.id.btn_main_music);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
Intent myIntent = new Intent(view.getContext(), musicTab.class);
startActivityForResult(myIntent, 0);
}
@@ -64,13 +72,17 @@
ImageButton btnVideo = (ImageButton) findViewById(R.id.btn_main_video);
btnVideo.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Toast.makeText(view.getContext(), "not implemented yet. Sorry !", Toast.LENGTH_LONG).show();
+ DoVibrate();
+ Toast.makeText(view.getContext(),
+ "not implemented yet. Sorry !", Toast.LENGTH_LONG)
+ .show();
}
});
ImageButton btnRemote = (ImageButton) findViewById(R.id.btn_main_remote);
btnRemote.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
Intent myIntent = new Intent(view.getContext(), Remote_01.class);
startActivityForResult(myIntent, 0);
}
@@ -79,6 +91,7 @@
ImageButton btnNowPlaying = (ImageButton) findViewById(R.id.btn_main_now_playing);
btnNowPlaying.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ DoVibrate();
Intent myIntent = new Intent(view.getContext(),
nowplaying.class);
startActivityForResult(myIntent, 0);
@@ -88,12 +101,65 @@
ImageButton btnSettings = (ImageButton) findViewById(R.id.btn_main_settings);
btnSettings.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(),
- setup.class);
+ DoVibrate();
+ Intent myIntent = new Intent(view.getContext(), setup.class);
startActivityForResult(myIntent, 0);
}
});
+
+ ImageButton skipForw = (ImageButton) findViewById(R.id.btn_main_skp_forw);
+ skipForw.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ DoVibrate();
+ PostCommand("nextItem");
+ }
+ });
+
+ ImageButton skipBack = (ImageButton) findViewById(R.id.btn_main_skp_back);
+ skipBack.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ DoVibrate();
+ PostCommand("prevItem");
+ }
+ });
+
+ ImageButton play = (ImageButton) findViewById(R.id.btn_main_play);
+ play.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ DoVibrate();
+ PostCommand("play");
+ }
+ });
}
-
+ public void PostCommand(String button) {
+
+ PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
+
+ AssetManager assetManager = getAssets();
+ String xml = "";
+
+ try {
+ InputStream inputStream = null;
+ inputStream = assetManager.open("cmd_" + button + ".xml");
+
+ int x = inputStream.read();
+
+ while (x != -1) {
+ xml = xml + (char) x;
+ x = inputStream.read();
+ }
+ post.Post(xml);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void DoVibrate() {
+ if (Settings.Vibrate) {
+ // Get instance of Vibrator from current Context
+ Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ v.vibrate(100);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -41,7 +41,6 @@
ImageButton btn1 = (ImageButton) findViewById(R.id.now_prev);
ImageButton btn2 = (ImageButton) findViewById(R.id.now_stop);
- ImageButton btn3 = (ImageButton) findViewById(R.id.now_pause);
ImageButton btn4 = (ImageButton) findViewById(R.id.now_play);
ImageButton btn5 = (ImageButton) findViewById(R.id.now_next);
ImageButton btn6 = (ImageButton) findViewById(R.id.now_list);
@@ -56,11 +55,7 @@
PostCommand("stop");
}
});
- btn3.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("pause");
- }
- });
+
btn4.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
PostCommand("play");
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -25,6 +25,7 @@
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.Bundle;
+import android.widget.CheckBox;
import android.widget.EditText;
public class setup extends Activity {
@@ -47,14 +48,17 @@
Settings.Server = settings.getString("Server", "192.168.0.30");
Settings.Port = settings.getString("Port", "8200");
Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
+ Settings.Vibrate = settings.getBoolean("Vibrate", true);
EditText txt1 = (EditText)findViewById(R.id.server_ip);
EditText txt2 = (EditText)findViewById(R.id.server_port);
EditText txt3 = (EditText)findViewById(R.id.server_macid);
+ CheckBox chk = (CheckBox)findViewById(R.id.vibration);
txt1.setText(Settings.Server);
txt2.setText(Settings.Port);
txt3.setText(Settings.MacId);
+ chk.setChecked(Settings.Vibrate);
}
@Override
@@ -64,6 +68,7 @@
EditText txt1 = (EditText)findViewById(R.id.server_ip);
EditText txt2 = (EditText)findViewById(R.id.server_port);
EditText txt3 = (EditText)findViewById(R.id.server_macid);
+ CheckBox chk = (CheckBox)findViewById(R.id.vibration);
SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE, MODE_PRIVATE);
SharedPreferences.Editor prefEditor = settings.edit();
@@ -71,10 +76,12 @@
prefEditor.putString("Server", txt1.getText().toString());
prefEditor.putString("Port",txt2.getText().toString());
prefEditor.putString("MacId", txt3.getText().toString());
+ prefEditor.putBoolean("Vibrate", chk.isChecked());
prefEditor.commit();
Settings.Server = settings.getString("Server", "192.168.0.30");
Settings.Port = settings.getString("Port", "8200");
Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
+ Settings.Vibrate = settings.getBoolean("Vibrate", true);
}
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java 2010-12-10 08:51:46 UTC (rev 4025)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java 2010-12-10 11:12:42 UTC (rev 4026)
@@ -29,7 +29,7 @@
public class splash extends Activity {
- private final int SPLASH_DISPLAY_LENGHT = 1500;
+ private final int SPLASH_DISPLAY_LENGHT = 2000;
@Override
public void onCreate(Bundle icicle) {
Modified: trunk/plugins/AndroidRemote/Release/settings.jpg
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-10 08:51:53
|
Revision: 4025
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4025&view=rev
Author: kroko_koenig
Date: 2010-12-10 08:51:46 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
add installer for MP
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2
trunk/plugins/AndroidRemote/Release/AppsInstaller_icon.png
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-09 15:11:53 UTC (rev 4024)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-10 08:51:46 UTC (rev 4025)
@@ -59,22 +59,17 @@
<LinearLayout android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_width="fill_parent">
<ImageButton android:id="@+id/now_prev"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/rewind" />
+ android:background="@drawable/rewind" android:layout_height="60dip" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_stop"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/stop" />
+ android:background="@drawable/stop" android:layout_height="60dip" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_pause"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/pause" />
+ android:background="@drawable/pause" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_play"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/play" />
+ android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/right"/>
<ImageButton android:id="@+id/now_next"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:background="@drawable/forward" />
+ android:background="@drawable/forward" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_list"
- android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/document"/>
+ android:background="@drawable/document" android:layout_width="60dip" android:layout_height="60dip"/>
</LinearLayout>
</LinearLayout>
Added: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2
===================================================================
--- trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 (rev 0)
+++ trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2010-12-10 08:51:46 UTC (rev 4025)
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <ParentGroup />
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Server\AndroidRemote\bin\Release\AndroidRemote.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e035a37f-6b89-423d-b478-a1d7bbd1cce6}-AndroidRemote.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\process\AndroidRemote.dll</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items>
+ <SectionItem Guid="79d67e40-5ae0-4c16-a7a1-a93f45fad15d" Name="Welcome Screen" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>Welcome to the Extension Installer for [Name]</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Description">
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
+Click Next to continue or Cancel to exit Setup.</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Welcome Screen</PanelName>
+ <WizardButtonsEnum>NextCancel</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="18193bf3-6e40-4815-a472-5e126fde5a0d" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Description of section, shown in under section title</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items>
+ <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="">
+ <Params>
+ <Items />
+ </Params>
+ <ExecuteLocation>AfterPanelShow</ExecuteLocation>
+ </ActionItem>
+ </Items>
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="c8ccf7dc-f920-437f-b700-8850366ecd2c" Name="Setup Complete" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>The Extension Installer Wizard has successfully installed [Name].</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Show radio buttons">
+ <Value />
+ <ValueType>Bool</ValueType>
+ <Description>Use radiobutton in place of combobox</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Setup Complete</PanelName>
+ <WizardButtonsEnum>Finish</WizardButtonsEnum>
+ </SectionItem>
+ </Items>
+ </Sections>
+ <Dependencies>
+ <Items />
+ </Dependencies>
+ <GeneralInfo>
+ <Name>Android Remote</Name>
+ <Id>d29419c3-1176-48fd-bed5-599a4ec93b7b</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://forum.team-mediaportal.com/</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/webservice-mobile-access-537/plugin-android-remote-89895/</ForumPage>
+ <UpdateUrl />
+ <Version>
+ <Major>0</Major>
+ <Minor>1</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control.
+Gfx has been done by oddfella and some additional coding is from rolls1400.
+
+Have fun.</ExtensionDescription>
+ <VersionDescription>initial release</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation />
+ <ReleaseDate>2010-12-09T16:17:18.1693243+01:00</ReleaseDate>
+ <Tags>android,remote</Tags>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>The icon file of the package (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Server\AndroidRemote\bin\Release\AndroidRemote.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e035a37f-6b89-423d-b478-a1d7bbd1cce6}-AndroidRemote.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\process\AndroidRemote.dll</DestinationFilename>
+ </FileItem>
+ </Items>
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ <ProjectFilename>C:\AAA\AndroidRemote2\Release\AndroidRemote.xmp2</ProjectFilename>
+ </ProjectSettings>
+</PackageClass>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Release/AppsInstaller_icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Release/AppsInstaller_icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-12-09 15:11:53 UTC (rev 4024)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-12-10 08:51:46 UTC (rev 4025)
@@ -33,7 +33,8 @@
<ItemGroup>
<Reference Include="Core, Version=1.1.2.20593, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Databases, Version=1.1.2.20596, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -48,7 +49,8 @@
<Reference Include="System.Xml" />
<Reference Include="Utils, Version=2.2.7.20588, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
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.
|
|
From: <kro...@us...> - 2010-12-09 15:12:02
|
Revision: 4024
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4024&view=rev
Author: kroko_koenig
Date: 2010-12-09 15:11:53 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
new gfx and some layout changes
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/forward.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pause.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/play.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/rewind.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/stop.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
trunk/plugins/AndroidRemote/Release/main.jpg
trunk/plugins/AndroidRemote/Release/music.jpg
trunk/plugins/AndroidRemote/Release/nowplaying.jpg
trunk/plugins/AndroidRemote/Release/pictures.jpg
trunk/plugins/AndroidRemote/Release/remote.jpg
trunk/plugins/AndroidRemote/Release/settings.jpg
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/brush.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/channel_m.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/channel_p.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/down.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/exit.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/hibernate.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/home.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/info.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/left.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_music.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_now_playing.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_pictures.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_play.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_remote.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_settings.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_back.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_forw.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_video.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/menu.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/music.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/mute.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/now_playing.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pictures.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/power_off.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/remote.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/restart.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/right.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/select.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/settings.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/skip_back.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/skip_forward.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/suspend.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/up.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/video.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/volume_m.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/volume_p.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/wake_on_lan.png
trunk/plugins/AndroidRemote/Release/pictures_menu.jpg
trunk/plugins/AndroidRemote/Release/remote2.jpg
Removed Paths:
-------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/accept_icon.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back_icon.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/close_icon.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/down_icon.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/music_logo.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/next_icon.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/nowplaying_logo.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pictures_logo.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/remote_logo.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/up_icon.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/videos_logo.png
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-09 15:11:53 UTC (rev 4024)
@@ -11,136 +11,157 @@
public static final class attr {
}
public static final class drawable {
- public static final int accept_icon=0x7f020000;
- public static final int album=0x7f020001;
- public static final int album_off=0x7f020002;
- public static final int artist=0x7f020003;
- public static final int artist_off=0x7f020004;
- public static final int audio=0x7f020005;
- public static final int back=0x7f020006;
- public static final int back_icon=0x7f020007;
- public static final int border=0x7f020008;
- public static final int button_close_focus=0x7f020009;
- public static final int button_close_nofocus=0x7f02000a;
- public static final int button_hibernate_focus=0x7f02000b;
- public static final int button_hibernate_nofocus=0x7f02000c;
- public static final int button_restart_focus=0x7f02000d;
- public static final int button_restart_nofocus=0x7f02000e;
- public static final int button_shutdown_focus=0x7f02000f;
- public static final int button_shutdown_nofocus=0x7f020010;
- public static final int button_standby_focus=0x7f020011;
- public static final int button_standby_nofocus=0x7f020012;
- public static final int button_wakeup_focus=0x7f020013;
- public static final int button_wakeup_nofocus=0x7f020014;
- public static final int cdcover=0x7f020015;
- public static final int close_icon=0x7f020016;
- public static final int document=0x7f020017;
- public static final int down_icon=0x7f020018;
- public static final int folder=0x7f020019;
- public static final int folderback=0x7f02001a;
- public static final int foldertab=0x7f02001b;
- public static final int foldertab_off=0x7f02001c;
- public static final int forward=0x7f02001d;
- public static final int ic_tab=0x7f02001e;
- public static final int ic_tab1=0x7f02001f;
- public static final int ic_tab2=0x7f020020;
- public static final int ic_tab3=0x7f020021;
- public static final int ic_tab4=0x7f020022;
- public static final int icon=0x7f020023;
- public static final int music_logo=0x7f020024;
- public static final int next_icon=0x7f020025;
- public static final int nowplaying_logo=0x7f020026;
- public static final int pause=0x7f020027;
- public static final int picture=0x7f020028;
- public static final int pictures_logo=0x7f020029;
- public static final int play=0x7f02002a;
- public static final int remote_logo=0x7f02002b;
- public static final int rewind=0x7f02002c;
- public static final int song=0x7f02002d;
- public static final int song_off=0x7f02002e;
- public static final int splash=0x7f02002f;
- public static final int splash02=0x7f020030;
- public static final int stop=0x7f020031;
- public static final int up_icon=0x7f020032;
- public static final int videos_logo=0x7f020033;
+ public static final int album=0x7f020000;
+ public static final int album_off=0x7f020001;
+ public static final int artist=0x7f020002;
+ public static final int artist_off=0x7f020003;
+ public static final int audio=0x7f020004;
+ public static final int back=0x7f020005;
+ public static final int border=0x7f020006;
+ public static final int brush=0x7f020007;
+ public static final int cdcover=0x7f020008;
+ public static final int channel_m=0x7f020009;
+ public static final int channel_p=0x7f02000a;
+ public static final int document=0x7f02000b;
+ public static final int down=0x7f02000c;
+ public static final int exit=0x7f02000d;
+ public static final int folder=0x7f02000e;
+ public static final int folderback=0x7f02000f;
+ public static final int foldertab=0x7f020010;
+ public static final int foldertab_off=0x7f020011;
+ public static final int forward=0x7f020012;
+ public static final int hibernate=0x7f020013;
+ public static final int home=0x7f020014;
+ public static final int ic_tab=0x7f020015;
+ public static final int ic_tab1=0x7f020016;
+ public static final int ic_tab2=0x7f020017;
+ public static final int ic_tab3=0x7f020018;
+ public static final int ic_tab4=0x7f020019;
+ public static final int icon=0x7f02001a;
+ public static final int info=0x7f02001b;
+ public static final int left=0x7f02001c;
+ public static final int main_music=0x7f02001d;
+ public static final int main_now_playing=0x7f02001e;
+ public static final int main_pictures=0x7f02001f;
+ public static final int main_play=0x7f020020;
+ public static final int main_remote=0x7f020021;
+ public static final int main_settings=0x7f020022;
+ public static final int main_skp_back=0x7f020023;
+ public static final int main_skp_forw=0x7f020024;
+ public static final int main_video=0x7f020025;
+ public static final int menu=0x7f020026;
+ public static final int music=0x7f020027;
+ public static final int mute=0x7f020028;
+ public static final int now_playing=0x7f020029;
+ public static final int pause=0x7f02002a;
+ public static final int picture=0x7f02002b;
+ public static final int pictures=0x7f02002c;
+ public static final int play=0x7f02002d;
+ public static final int power_off=0x7f02002e;
+ public static final int remote=0x7f02002f;
+ public static final int restart=0x7f020030;
+ public static final int rewind=0x7f020031;
+ public static final int right=0x7f020032;
+ public static final int select=0x7f020033;
+ public static final int settings=0x7f020034;
+ public static final int skip_back=0x7f020035;
+ public static final int skip_forward=0x7f020036;
+ public static final int song=0x7f020037;
+ public static final int song_off=0x7f020038;
+ public static final int splash=0x7f020039;
+ public static final int splash02=0x7f02003a;
+ public static final int stop=0x7f02003b;
+ public static final int suspend=0x7f02003c;
+ public static final int up=0x7f02003d;
+ public static final int video=0x7f02003e;
+ public static final int volume_m=0x7f02003f;
+ public static final int volume_p=0x7f020040;
+ public static final int wake_on_lan=0x7f020041;
}
public static final class id {
- public static final int GridView01=0x7f060013;
- public static final int ImageView01=0x7f060015;
- public static final int LinearLayout01=0x7f060016;
- public static final int ListView01=0x7f060024;
- public static final int MainButton1=0x7f060005;
- public static final int MainButton2=0x7f060006;
- public static final int MainButton3=0x7f060007;
- public static final int MainButton4=0x7f060008;
- public static final int MainButton5=0x7f060009;
+ public static final int GridView01=0x7f060017;
+ public static final int ImageView01=0x7f060019;
+ public static final int LinearLayout01=0x7f06001a;
+ public static final int ListView01=0x7f060029;
+ public static final int TableLayout01=0x7f060005;
+ public static final int TableRow01=0x7f060006;
public static final int TextView01=0x7f060003;
public static final int TextView02=0x7f060004;
- public static final int btnBack=0x7f060038;
- public static final int btnChannelDown=0x7f06003d;
- public static final int btnChannelUp=0x7f06003a;
- public static final int btnDown=0x7f060037;
- public static final int btnExit=0x7f06003e;
- public static final int btnFBack=0x7f060026;
- public static final int btnFForw=0x7f060027;
- public static final int btnHibernate=0x7f060040;
- public static final int btnHome=0x7f06002e;
- public static final int btnInfo=0x7f060030;
- public static final int btnLeft=0x7f060032;
- public static final int btnMenu=0x7f060036;
- public static final int btnOk=0x7f060033;
- public static final int btnPause=0x7f06002b;
- public static final int btnPlay=0x7f06000c;
- public static final int btnRestart=0x7f060041;
- public static final int btnRight=0x7f060034;
- public static final int btnShutOff=0x7f060042;
- public static final int btnSkipBack=0x7f060029;
- public static final int btnSkipForw=0x7f06002c;
- public static final int btnStop=0x7f06002a;
- public static final int btnSuspend=0x7f06003f;
- public static final int btnUp=0x7f06002f;
- public static final int btnVolumeDown=0x7f06003c;
- public static final int btnVolumeMute=0x7f06003b;
- public static final int btnVolumeUp=0x7f060039;
- public static final int btnWakeOnLan=0x7f060043;
- public static final int full_text=0x7f060014;
+ public static final int btnBack=0x7f06003f;
+ public static final int btnChannelDown=0x7f060044;
+ public static final int btnChannelUp=0x7f060041;
+ public static final int btnDown=0x7f06003e;
+ public static final int btnExit=0x7f060045;
+ public static final int btnFBack=0x7f06002c;
+ public static final int btnFForw=0x7f06002e;
+ public static final int btnHibernate=0x7f060047;
+ public static final int btnHome=0x7f060035;
+ public static final int btnInfo=0x7f060037;
+ public static final int btnLeft=0x7f060039;
+ public static final int btnMenu=0x7f06003d;
+ public static final int btnOk=0x7f06003a;
+ public static final int btnPause=0x7f060032;
+ public static final int btnPlay=0x7f06002d;
+ public static final int btnRestart=0x7f060048;
+ public static final int btnRight=0x7f06003b;
+ public static final int btnShutOff=0x7f060049;
+ public static final int btnSkipBack=0x7f060030;
+ public static final int btnSkipForw=0x7f060033;
+ public static final int btnStop=0x7f060031;
+ public static final int btnSuspend=0x7f060046;
+ public static final int btnUp=0x7f060036;
+ public static final int btnVolumeDown=0x7f060043;
+ public static final int btnVolumeMute=0x7f060042;
+ public static final int btnVolumeUp=0x7f060040;
+ public static final int btnWakeOnLan=0x7f06004a;
+ public static final int btn_main_music=0x7f060008;
+ public static final int btn_main_now_playing=0x7f06000b;
+ public static final int btn_main_pictures=0x7f060007;
+ public static final int btn_main_play=0x7f06000f;
+ public static final int btn_main_remote=0x7f06000a;
+ public static final int btn_main_settings=0x7f06000c;
+ public static final int btn_main_skp_back=0x7f06000e;
+ public static final int btn_main_skp_forw=0x7f060010;
+ public static final int btn_main_video=0x7f060009;
+ public static final int full_text=0x7f060018;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
- public static final int list_album=0x7f06000f;
- public static final int list_artist=0x7f060010;
- public static final int list_result=0x7f060011;
- public static final int list_song=0x7f060012;
- public static final int music_grid=0x7f06000e;
- public static final int naviRemote_text=0x7f06000a;
- public static final int now_album=0x7f060018;
- public static final int now_artist=0x7f06001d;
- public static final int now_cd=0x7f060019;
- public static final int now_list=0x7f060023;
- public static final int now_next=0x7f060022;
- public static final int now_pause=0x7f060020;
- public static final int now_play=0x7f060021;
- public static final int now_playing=0x7f060017;
- public static final int now_playing_right=0x7f06001b;
- public static final int now_playing_t_left=0x7f06000b;
- public static final int now_prev=0x7f06001e;
- public static final int now_progress=0x7f06001a;
- public static final int now_stop=0x7f06001f;
- public static final int now_title=0x7f06001c;
- public static final int open=0x7f060049;
- public static final int rslide=0x7f06004c;
- public static final int save=0x7f060048;
- public static final int send=0x7f06004a;
- public static final int server_ip=0x7f060044;
- public static final int server_macid=0x7f060046;
- public static final int server_port=0x7f060045;
- public static final int slide=0x7f06004b;
- public static final int title=0x7f060047;
- public static final int widget0=0x7f06000d;
- public static final int widget00=0x7f060025;
- public static final int widget01=0x7f060028;
- public static final int widget02=0x7f06002d;
- public static final int widget03=0x7f060031;
- public static final int widget04=0x7f060035;
+ public static final int list_album=0x7f060013;
+ public static final int list_artist=0x7f060014;
+ public static final int list_result=0x7f060015;
+ public static final int list_song=0x7f060016;
+ public static final int main_now_playing=0x7f06000d;
+ public static final int music_grid=0x7f060012;
+ public static final int naviRemote_text=0x7f06002a;
+ public static final int now_album=0x7f06001c;
+ public static final int now_artist=0x7f060022;
+ public static final int now_cd=0x7f06001d;
+ public static final int now_list=0x7f060028;
+ public static final int now_next=0x7f060027;
+ public static final int now_pause=0x7f060025;
+ public static final int now_play=0x7f060026;
+ public static final int now_playing=0x7f06001b;
+ public static final int now_playing_right=0x7f060020;
+ public static final int now_playing_t_left=0x7f06001f;
+ public static final int now_prev=0x7f060023;
+ public static final int now_progress=0x7f06001e;
+ public static final int now_stop=0x7f060024;
+ public static final int now_title=0x7f060021;
+ public static final int open=0x7f060050;
+ public static final int rslide=0x7f060053;
+ public static final int save=0x7f06004f;
+ public static final int send=0x7f060051;
+ public static final int server_ip=0x7f06004b;
+ public static final int server_macid=0x7f06004d;
+ public static final int server_port=0x7f06004c;
+ public static final int slide=0x7f060052;
+ public static final int title=0x7f06004e;
+ public static final int widget0=0x7f060011;
+ public static final int widget00=0x7f06002b;
+ public static final int widget01=0x7f06002f;
+ public static final int widget02=0x7f060034;
+ public static final int widget03=0x7f060038;
+ public static final int widget04=0x7f06003c;
public static final int widget44=0x7f060000;
}
public static final class layout {
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/accept_icon.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back_icon.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/brush.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/brush.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/channel_m.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/channel_m.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/channel_p.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/channel_p.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/close_icon.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/down.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/down.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/down_icon.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/exit.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/forward.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/hibernate.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/hibernate.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/home.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/info.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/info.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/left.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/left.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_music.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_music.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_music.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/music" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/music" /> <!-- focused -->
+ <item android:drawable="@drawable/music" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_now_playing.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_now_playing.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_now_playing.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/now_playing" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/now_playing" /> <!-- focused -->
+ <item android:drawable="@drawable/now_playing" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_pictures.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_pictures.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_pictures.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/pictures" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/pictures" /> <!-- focused -->
+ <item android:drawable="@drawable/pictures" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_play.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_play.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_play.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/right" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/right" /> <!-- focused -->
+ <item android:drawable="@drawable/right" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_remote.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_remote.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_remote.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/remote" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/remote" /> <!-- focused -->
+ <item android:drawable="@drawable/remote" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_settings.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_settings.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_settings.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/settings" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/settings" /> <!-- focused -->
+ <item android:drawable="@drawable/settings" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_back.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_back.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_back.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/skip_back" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/skip_back" /> <!-- focused -->
+ <item android:drawable="@drawable/skip_back" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_forw.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_forw.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_skp_forw.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/skip_forward" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/skip_forward" /> <!-- focused -->
+ <item android:drawable="@drawable/skip_forward" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_video.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_video.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/main_video.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/video" /> <!-- pressed -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/video" /> <!-- focused -->
+ <item android:drawable="@drawable/video" /> <!-- default -->
+ </selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/menu.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/music.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/music.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/music_logo.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/mute.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/mute.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/next_icon.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/now_playing.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/now_playing.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/nowplaying_logo.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pause.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pictures.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pictures.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pictures_logo.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/play.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/power_off.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/power_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/remote.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/remote.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/remote_logo.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/restart.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/restart.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/rewind.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/right.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/right.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/select.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/select.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/settings.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/settings.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/skip_back.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/skip_back.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/skip_forward.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/skip_forward.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/stop.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/suspend.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/suspend.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/up.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/up.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/up_icon.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/video.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/video.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/videos_logo.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/volume_m.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/volume_m.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/volume_p.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/volume_p.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/wake_on_lan.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/wake_on_lan.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,59 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:background="@drawable/back"
- android:gravity="top">
+ android:layout_height="fill_parent" android:background="@drawable/brush">
- <Button android:id="@+id/MainButton1" android:layout_width="fill_parent"
- android:layout_height="70dip" android:background="@drawable/pictures_logo" />
+<TableLayout
+ android:id="@+id/TableLayout01"
+ xmlns:android="http://schemas.android.com/apk/res/android"
- <View android:layout_height="2dip" android:layout_width="fill_parent"
- android:background="#000" />
-
- <Button android:id="@+id/MainButton2" android:layout_width="fill_parent"
- android:layout_height="70dip" android:background="@drawable/music_logo" />
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
+
+
+<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <ImageButton android:src="@drawable/main_pictures" android:scaleType="fitXY"
+ android:layout_height="80dip" android:layout_width="80dip"
+ android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures">
+ </ImageButton>
+
+ <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip"
+ android:src="@drawable/main_music" android:id="@+id/btn_main_music">
+ </ImageButton>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="80dip" android:layout_width="80dip"
+ android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_video" android:id="@+id/btn_main_video">
+ </ImageButton>
+
+ <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_remote" android:id="@+id/btn_main_remote">
+ </ImageButton>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="80dip" android:layout_width="80dip"
+ android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_now_playing" android:id="@+id/btn_main_now_playing">
+ </ImageButton>
+
+ <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_settings" android:id="@+id/btn_main_settings">
+ </ImageButton>
+
+ </TableRow>
- <View android:layout_height="2dip" android:layout_width="fill_parent"
- android:background="#000" />
-
- <Button android:id="@+id/MainButton3" android:layout_width="fill_parent"
- android:layout_height="70dip" android:background="@drawable/videos_logo" />
+</TableLayout>
- <View android:layout_height="2dip" android:layout_width="fill_parent"
- android:background="#000" />
-
- <Button android:id="@+id/MainButton4" android:layout_width="fill_parent"
- android:layout_height="70dip" android:background="@drawable/remote_logo" />
-
- <View android:layout_height="2dip" android:layout_width="fill_parent"
- android:background="#000" />
-
- <Button android:id="@+id/MainButton5" android:layout_width="fill_parent"
- android:layout_height="70dip" android:background="@drawable/nowplaying_logo" />
-
- <TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
+ <TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="nothing playing"
- android:gravity="center_horizontal" android:background="#FFFFFFFF"
- android:textSize="15dip"
- android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
+ android:gravity="center_horizontal" android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing">
</TextView>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal" android:layout_width="fill_parent"
- android:background="#000" android:layout_height="50dip">
+ android:orientation="horizontal" android:background="#0FF0FFFF" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
- <TextView android:id="@+id/now_playing_t_left"
- android:layout_width="80dip" android:layout_height="50dip"
- android:textSize="12dip" android:textColor="#FF8080ff" android:text="00:00" />
+
- <Button android:id="@+id/btnPlay" android:layout_width="50dip"
- android:layout_height="50dip" android:text="FBW">
- </Button>
- <Button android:id="@+id/btnPlay" android:layout_width="50dip"
- android:layout_height="50dip" android:text="Play">
- </Button>
- <Button android:id="@+id/btnPlay" android:layout_width="50dip"
- android:layout_height="50dip" android:text="FFW">
- </Button>
- </LinearLayout>
-
+
+
+
+ <ImageButton android:src="@drawable/main_skp_back" android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_play" android:src="@drawable/main_play" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_skp_forw" android:src="@drawable/main_skp_forw" android:padding="2dip"></ImageButton>
+</LinearLayout>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,6 +1,6 @@
<AbsoluteLayout android:id="@+id/widget0"
android:layout_width="fill_parent" android:layout_height="wrap_content"
- android:background="@drawable/back" xmlns:android="http://schemas.android.com/apk/res/android">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<GridView android:layout_y="0dip" android:layout_x="0dip"
android:id="@+id/music_grid" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:columnWidth="90dp"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:background="@drawable/back"
android:layout_height="fill_parent">
<ListView android:id="@+id/list_album" android:layout_height="wrap_content"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:background="@drawable/back"
android:layout_height="fill_parent">
<ListView android:id="@+id/list_artist" android:layout_height="wrap_content"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:background="@drawable/back"
android:layout_height="fill_parent">
<ListView android:id="@+id/list_result" android:layout_height="wrap_content"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:background="@drawable/back"
android:layout_height="fill_parent">
<ListView android:id="@+id/list_song" android:layout_height="wrap_content"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -1,7 +1,7 @@
<LinearLayout android:id="@+id/LinearLayout01"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/back"
+ android:background="@drawable/brush"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/now_playing" android:layout_width="fill_parent"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-12-08 18:46:29 UTC (rev 4023)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-12-09 15:11:53 UTC (rev 4024)
@@ -4,13 +4,14 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
+ android:background="@drawable/brush"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="Remote 01"
- android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:gravity="center_horizontal" android:background="#FFA9A9A9"
android:textSize="15dip"
- android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:padding="5dip">
</TextView>
<LinearLayout
@@ -21,19 +22,18 @@
<Button android:id="@+id/btnFBack"
android:layout_width="80dip"
android:layout_height="60dip"
- android:text="FBack">
+ android:background="@drawable/rewind">
</Button>
<Button android:id="@+id/btnPlay"
android:layout_width="160dip"
android:layout_height="60dip"
- android:text="Play">
+ android:background="@drawable/play">
</Button>
<Button android:id="@+id/btnFForw"
android:layout_wi...
[truncated message content] |
|
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.
|
|
From: <kro...@us...> - 2010-12-08 17:25:28
|
Revision: 4022
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4022&view=rev
Author: kroko_koenig
Date: 2010-12-08 17:25:21 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
add playlist support
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-08 15:08:48 UTC (rev 4021)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-08 17:25:21 UTC (rev 4022)
@@ -40,6 +40,7 @@
using MediaPortal.Util;
using MediaPortal.Database;
using MediaPortal.Configuration;
+using MediaPortal.TagReader;
using MediaPortal.Player;
using MediaPortal.Playlists;
@@ -358,18 +359,6 @@
data.Add(child.Name, child.InnerText);
}
- //PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
- //PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
-
- //PlayListItem playlistItem = new PlayListItem();
- //playlistItem.Type = PlayListItem.PlayListItemType.Audio;
- //playlistItem.FileName = "c:\\mp3\\the-gossip-heavy-cross-full-length-hq--lyrics.mp3";
- //playlistItem.Description = "My Desc";
- //playlistItem.Duration = 1234;
-
- //playlistItem.MusicTag = null;
- //playList.Add(playlistItem);
-
if (data.ContainsKey("command"))
{
@@ -526,6 +515,73 @@
GUIGraphicsContext.OnAction(action);
}
#endregion
+
+ #region playlist
+ if (data["command"] == ("ADD_MUSIC"))
+ {
+ // add music
+ // parameter = filename,artist,title,duration
+
+ PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
+
+ bool found = false;
+ string fileName = data["filename"]; // TODO need to be converted to local name
+
+ foreach (PlayListItem item in playList)
+ {
+ if (item.FileName == fileName)
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ PlayListItem playlistItem = new PlayListItem();
+ playlistItem.Type = PlayListItem.PlayListItemType.Audio;
+ playlistItem.FileName = fileName;
+ playlistItem.Description = data["artist"] + " - " + data["title"];
+ playlistItem.Duration = 0;
+
+ MusicTag tag = new MusicTag();
+ tag.Artist = data["artist"];
+ tag.Title = data["title"];
+
+ tag.Duration = Convert.ToInt32(data["duration"]);
+ tag.FileName = fileName;
+
+ playlistItem.MusicTag = tag;
+ playList.Add(playlistItem);
+ }
+
+ }
+
+ if (data["command"] == ("REMOVE_PLAYLIST"))
+ {
+ // add music
+ // parameter = filename
+
+ PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
+
+ string fileName = data["filename"]; // TODO need to be converted to local name
+ playList.Remove(fileName);
+ }
+
+ if (data["command"] == ("CLEAR_PLAYLIST"))
+ {
+ // clear playlist
+ // parameter = none
+
+ PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
+
+ playList.Clear();
+ }
+
+ #endregion
}
}
}
@@ -1313,7 +1369,7 @@
msg += "<CurrentItem>" + currentSong.ToString() + "</CurrentItem>\r\n";
msg += "<TotalItem>" + list.Count.ToString() + "</TotalItem>\r\n";
- foreach (MediaPortal.Playlists.PlayListItem item in list)
+ foreach (PlayListItem item in list)
{
string desc = item.Description;
int duration = item.Duration;
@@ -1393,7 +1449,7 @@
if (Directory.Exists(key))
{
string[] files = Directory.GetFiles(key, "*.jpg", SearchOption.AllDirectories);
- foreach(string f in files)
+ foreach (string f in files)
{
allPicturesList.Add(f);
}
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.
|
|
From: <che...@us...> - 2010-12-08 15:08:54
|
Revision: 4021
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4021&view=rev
Author: chemelli_sf
Date: 2010-12-08 15:08:48 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
Removed GUIWindow.Window.WINDOW_VIRTUAL_WEB_KEYBOARD to pair MP code
Modified Paths:
--------------
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs 2010-12-08 14:50:44 UTC (rev 4020)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs 2010-12-08 15:08:48 UTC (rev 4021)
@@ -129,14 +129,12 @@
case (int) GUIWindow.Window.WINDOW_MUSIC_INFO:
case (int) GUIWindow.Window.WINDOW_OSD:
case (int) GUIWindow.Window.WINDOW_TOPBAR:
- //case (int)GUIWindow.Window.WINDOW_TOPBARHOME:
case (int) GUIWindow.Window.WINDOW_TVMSNOSD:
case (int) GUIWindow.Window.WINDOW_TVOSD:
case (int) GUIWindow.Window.WINDOW_TVZAPOSD:
case (int) GUIWindow.Window.WINDOW_VIDEO_ARTIST_INFO:
case (int) GUIWindow.Window.WINDOW_VIDEO_INFO:
case (int) GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD:
- case (int) GUIWindow.Window.WINDOW_VIRTUAL_WEB_KEYBOARD:
break;
default:
_windowsListFiltered.Add(GetFriendlyName(wnd.ToString()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-08 14:50:51
|
Revision: 4020
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4020&view=rev
Author: kroko_koenig
Date: 2010-12-08 14:50:44 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
using mp3 shares, random.jpg for all dirs
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Release/Android Server communication.docx
trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Release/Android Server communication.docx
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs 2010-12-08 13:35:27 UTC (rev 4019)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs 2010-12-08 14:50:44 UTC (rev 4020)
@@ -44,8 +44,6 @@
public static string Server = string.Empty;
public static string Port = string.Empty;
- public static string PicturePath = string.Empty;
- public static string MusicPath = string.Empty;
public static string VideoPath = string.Empty;
private Thread listen;
@@ -73,10 +71,6 @@
Server = xmlreader.GetValueAsString("android", "server", "192.168.0.30");
Port = xmlreader.GetValueAsString("android", "port", "8200");
- PicturePath = xmlreader.GetValueAsString("android", "pictures",
- Environment.GetFolderPath(Environment.SpecialFolder.MyPictures));
- MusicPath = xmlreader.GetValueAsString("android", "music",
- Environment.GetFolderPath(Environment.SpecialFolder.MyMusic));
VideoPath = xmlreader.GetValueAsString("android", "videos",
Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments));
}
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-08 13:35:27 UTC (rev 4019)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-08 14:50:44 UTC (rev 4020)
@@ -55,12 +55,13 @@
private byte[] buffer;
private static Bitmap actualCover = null;
- private static string[] listAllPictures = null;
private SQLiteClient sqlClient;
private VirtualDirectory virtualDirectory = new VirtualDirectory();
- private Dictionary<string, string> dirList = new Dictionary<string, string>();
+ private Dictionary<string, string> directoryList = new Dictionary<string, string>();
+ private static List<string> allPicturesList = null;
+
public Request(Socket Socket)
{
socket = Socket;
@@ -227,13 +228,13 @@
else if (req.StartsWith("/music"))
{
// handle pictures
- req = req.Replace("/music", "");
+ req = req.Substring(6);
if (req.StartsWith("/")) req = req.Substring(1);
if (req == "")
{
// root
- ReplyMusicDir(AndroidServer.MusicPath, "root");
+ ReplyMusicDir("");
}
else
{
@@ -241,12 +242,11 @@
if (req.EndsWith(".mp3"))
{
- string orgPath = AndroidServer.MusicPath + "\\" + req;
- ReplyMusicFile(orgPath, msgTyp);
+ ReplyMusicFile(req, msgTyp);
}
else
{
- ReplyMusicDir(AndroidServer.MusicPath + "\\" + req, req);
+ ReplyMusicDir(req);
}
}
}
@@ -556,8 +556,8 @@
private void ReplyPictureDir(string Request)
{
- GetPictureShare();
- string dir = GetLocalDir(Request);
+ directoryList = GetMpShare("pictures");
+ string dir = GetLocalDir(Request, directoryList);
if (Request == string.Empty)
{
@@ -574,7 +574,7 @@
msg += "<Directory>\r\n";
// folder
- foreach (string key in dirList.Keys)
+ foreach (string key in directoryList.Keys)
{
msg += "<Folder>" + HttpUtility.HtmlEncode(key) + "</Folder>\r\n";
}
@@ -633,8 +633,8 @@
}
private void ReplyPictureFile(string filePath)
{
- GetPictureShare();
- string dir = GetLocalDir(filePath);
+ directoryList = GetMpShare("pictures");
+ string dir = GetLocalDir(filePath, directoryList);
if (File.Exists(dir))
{
@@ -681,8 +681,8 @@
{
filePath = filePath.Replace(".thb", "");
- GetPictureShare();
- string dir = GetLocalDir(filePath);
+ directoryList = GetMpShare("pictures");
+ string dir = GetLocalDir(filePath, directoryList);
if (File.Exists(dir))
{
@@ -739,7 +739,7 @@
if (year != string.Empty)
{
msg += "<Item>\r\n";
- msg += "<Year>" + HttpUtility.HtmlEncode(year).Replace(" ","%20") + "</Year>\r\n";
+ msg += "<Year>" + HttpUtility.HtmlEncode(year).Replace(" ", "%20") + "</Year>\r\n";
msg += "</Item>\r\n";
}
}
@@ -941,10 +941,15 @@
}
}
- private void ReplyMusicDir(string dir, string request)
+ private void ReplyMusicDir(string Request)
{
- if (Directory.Exists(dir))
+ directoryList = GetMpShare("music");
+ string dir = GetLocalDir(Request, directoryList);
+
+ if (Request == string.Empty)
{
+ #region root shares
+
string msg = string.Empty;
// header
msg += "HTTP/1.0 200 Ok\r\n";
@@ -955,27 +960,61 @@
msg += "<?xml version=\"1.0\"?>\r\n";
msg += "<Directory>\r\n";
- string[] dirs = Directory.GetDirectories(dir, "*.*", SearchOption.TopDirectoryOnly);
- foreach (string f in dirs)
+ // folder
+ foreach (string key in directoryList.Keys)
{
- msg += "<Folder>" + HttpUtility.HtmlEncode(Path.GetFileName(f)) + "</Folder>\r\n";
+ msg += "<Folder>" + HttpUtility.HtmlEncode(key) + "</Folder>\r\n";
}
- string[] files = Directory.GetFiles(dir, "*.mp3", SearchOption.TopDirectoryOnly);
- foreach (string f in files)
- {
- string fName = Path.GetFileName(f);
- if ((fName.ToLower() != "folder.jpg") && (fName.ToLower() != "folder.png"))
- msg += "<File>" + HttpUtility.HtmlEncode(fName) + "</File>\r\n";
- }
msg += "</Directory>\r\n";
// send
sendMessage(socket, msg);
- AndroidServer.logDebug("Reply music dir");
+ AndroidServer.logDebug("Reply music root dir");
+
+ #endregion
}
else
{
- SendErrorURL(request);
+ #region reply dirs
+
+ if (Directory.Exists(dir))
+ {
+ string msg = string.Empty;
+ // header
+ msg += "HTTP/1.0 200 Ok\r\n";
+ msg += "Content-Type: application/xml; charset=utf-8; filename=info.xml" + "\r\n";
+ msg += "Proxy-Connection: close" + "\r\n";
+ msg += "\r\n";
+ // content
+ msg += "<?xml version=\"1.0\"?>\r\n";
+ msg += "<Directory>\r\n";
+
+ // folder
+ string[] dirs = Directory.GetDirectories(dir, "*.*", SearchOption.TopDirectoryOnly);
+ foreach (string f in dirs)
+ {
+ msg += "<Folder>" + HttpUtility.HtmlEncode(Path.GetFileName(f)) + "</Folder>\r\n";
+ }
+
+ //files
+ string[] files = Directory.GetFiles(dir, "*.mp3", SearchOption.TopDirectoryOnly);
+ foreach (string f in files)
+ {
+ string fName = Path.GetFileName(f);
+ msg += "<File>" + HttpUtility.HtmlEncode(fName) + "</File>\r\n";
+ }
+ msg += "</Directory>\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply music dir");
+ }
+ else
+ {
+ // dir does not exist
+ SendErrorURL(Request);
+ }
+
+ #endregion
}
}
private void ReplyMusicFile(string Filename, string Mode)
@@ -1344,15 +1383,30 @@
private void ReplyRandomPicture()
{
- if (listAllPictures == null)
- listAllPictures = Directory.GetFiles(AndroidServer.PicturePath, "*.jpg", SearchOption.AllDirectories);
+ if (allPicturesList == null)
+ {
+ allPicturesList = new List<string>();
+ directoryList = GetMpShare("pictures");
- if (listAllPictures.Length > 0)
+ foreach (string key in directoryList.Values)
+ {
+ if (Directory.Exists(key))
+ {
+ string[] files = Directory.GetFiles(key, "*.jpg", SearchOption.AllDirectories);
+ foreach(string f in files)
+ {
+ allPicturesList.Add(f);
+ }
+ }
+ }
+ }
+
+ if (allPicturesList.Count > 0)
{
Random rnd = new Random();
- int x = rnd.Next(listAllPictures.Length);
+ int x = rnd.Next(allPicturesList.Count);
- Bitmap bit = (Bitmap)Bitmap.FromFile(listAllPictures[x]);
+ Bitmap bit = (Bitmap)Bitmap.FromFile(allPicturesList[x]);
byte[] b;
if ((bit.Width > 600) || (bit.Height > 600))
@@ -1383,7 +1437,7 @@
}
else
{
- SendServerError(listAllPictures[x], "ReplyRandomPictureFile");
+ SendServerError(allPicturesList[x], "ReplyRandomPictureFile");
}
}
else
@@ -1684,8 +1738,10 @@
}
}
- private void GetPictureShare()
+ private Dictionary<string, string> GetMpShare(string Share)
{
+ Dictionary<string, string> list = new Dictionary<string, string>();
+
#region read virtual dir
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
{
@@ -1699,9 +1755,9 @@
string shareType = String.Format("sharetype{0}", i);
Share share = new Share();
- share.Path = xmlreader.GetValueAsString("pictures", sharePath, string.Empty);
- share.Name = xmlreader.GetValueAsString("pictures", shareName, string.Empty);
- share.IsFtpShare = xmlreader.GetValueAsBool("pictures", shareType, false);
+ share.Path = xmlreader.GetValueAsString(Share, sharePath, string.Empty);
+ share.Name = xmlreader.GetValueAsString(Share, shareName, string.Empty);
+ share.IsFtpShare = xmlreader.GetValueAsBool(Share, shareType, false);
if (share.Path.Length > 0)
{
@@ -1709,7 +1765,7 @@
{
if (!share.IsFtpShare)
{
- dirList.Add(share.Name, share.Path);
+ list.Add(share.Name, share.Path);
}
}
}
@@ -1718,10 +1774,12 @@
break;
}
}
+
+ return list;
}
#endregion
}
- private string GetLocalDir(string Request)
+ private string GetLocalDir(string Request, Dictionary<string, string> List)
{
string folder = string.Empty;
string baseFolder = string.Empty;
@@ -1738,7 +1796,7 @@
}
string dir = string.Empty;
- foreach (KeyValuePair<string, string> pair in dirList)
+ foreach (KeyValuePair<string, string> pair in List)
{
if (pair.Key.ToLower() == (baseFolder.ToLower()))
{
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.
|
|
From: <kro...@us...> - 2010-12-08 13:35:34
|
Revision: 4019
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4019&view=rev
Author: kroko_koenig
Date: 2010-12-08 13:35:27 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
removed the gesture code for pictures, add a readme
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-08 13:35:27 UTC (rev 4019)
@@ -15,11 +15,11 @@
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
- <activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
+ <activity android:launchMode="singleInstance" android:name=".Remote_01"></activity>
+ <activity android:launchMode="singleInstance" android:name=".Remote_02"></activity>
<activity android:name=".pictures" android:launchMode="singleInstance"></activity>
<activity android:name=".picturesfullscreen" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicDir" android:launchMode="singleInstance"></activity>
+ <activity android:launchMode="singleInstance" android:name=".musicDir"></activity>
<activity android:name=".setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaylist" android:launchMode="singleInstance"></activity>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-08 13:35:27 UTC (rev 4019)
@@ -65,10 +65,10 @@
public static final int videos_logo=0x7f020033;
}
public static final class id {
- public static final int GridView01=0x7f060010;
- public static final int ImageView01=0x7f060012;
- public static final int LinearLayout01=0x7f060013;
- public static final int ListView01=0x7f060022;
+ public static final int GridView01=0x7f060013;
+ public static final int ImageView01=0x7f060015;
+ public static final int LinearLayout01=0x7f060016;
+ public static final int ListView01=0x7f060024;
public static final int MainButton1=0x7f060005;
public static final int MainButton2=0x7f060006;
public static final int MainButton3=0x7f060007;
@@ -81,7 +81,7 @@
public static final int btnChannelUp=0x7f06003a;
public static final int btnDown=0x7f060037;
public static final int btnExit=0x7f06003e;
- public static final int btnFBack=0x7f060025;
+ public static final int btnFBack=0x7f060026;
public static final int btnFForw=0x7f060027;
public static final int btnHibernate=0x7f060040;
public static final int btnHome=0x7f06002e;
@@ -90,7 +90,7 @@
public static final int btnMenu=0x7f060036;
public static final int btnOk=0x7f060033;
public static final int btnPause=0x7f06002b;
- public static final int btnPlay=0x7f060026;
+ public static final int btnPlay=0x7f06000c;
public static final int btnRestart=0x7f060041;
public static final int btnRight=0x7f060034;
public static final int btnShutOff=0x7f060042;
@@ -103,38 +103,40 @@
public static final int btnVolumeMute=0x7f06003b;
public static final int btnVolumeUp=0x7f060039;
public static final int btnWakeOnLan=0x7f060043;
- public static final int full_text=0x7f060011;
+ public static final int full_text=0x7f060014;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
- public static final int list_album=0x7f06000c;
- public static final int list_artist=0x7f06000d;
- public static final int list_result=0x7f06000e;
- public static final int list_song=0x7f06000f;
- public static final int music_grid=0x7f06000b;
- public static final int naviRemote_text=0x7f060023;
- public static final int now_album=0x7f060015;
- public static final int now_artist=0x7f06001b;
- public static final int now_cd=0x7f060016;
- public static final int now_list=0x7f060021;
- public static final int now_next=0x7f060020;
- public static final int now_pause=0x7f06001e;
- public static final int now_play=0x7f06001f;
- public static final int now_playing=0x7f060014;
- public static final int now_playing_right=0x7f060019;
- public static final int now_playing_t_left=0x7f060018;
- public static final int now_prev=0x7f06001c;
- public static final int now_progress=0x7f060017;
- public static final int now_stop=0x7f06001d;
- public static final int now_title=0x7f06001a;
+ public static final int list_album=0x7f06000f;
+ public static final int list_artist=0x7f060010;
+ public static final int list_result=0x7f060011;
+ public static final int list_song=0x7f060012;
+ public static final int music_grid=0x7f06000e;
+ public static final int naviRemote_text=0x7f06000a;
+ public static final int now_album=0x7f060018;
+ public static final int now_artist=0x7f06001d;
+ public static final int now_cd=0x7f060019;
+ public static final int now_list=0x7f060023;
+ public static final int now_next=0x7f060022;
+ public static final int now_pause=0x7f060020;
+ public static final int now_play=0x7f060021;
+ public static final int now_playing=0x7f060017;
+ public static final int now_playing_right=0x7f06001b;
+ public static final int now_playing_t_left=0x7f06000b;
+ public static final int now_prev=0x7f06001e;
+ public static final int now_progress=0x7f06001a;
+ public static final int now_stop=0x7f06001f;
+ public static final int now_title=0x7f06001c;
public static final int open=0x7f060049;
+ public static final int rslide=0x7f06004c;
public static final int save=0x7f060048;
public static final int send=0x7f06004a;
public static final int server_ip=0x7f060044;
public static final int server_macid=0x7f060046;
public static final int server_port=0x7f060045;
+ public static final int slide=0x7f06004b;
public static final int title=0x7f060047;
- public static final int widget0=0x7f06000a;
- public static final int widget00=0x7f060024;
+ public static final int widget0=0x7f06000d;
+ public static final int widget00=0x7f060025;
public static final int widget01=0x7f060028;
public static final int widget02=0x7f06002d;
public static final int widget03=0x7f060031;
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2010-12-08 13:35:27 UTC (rev 4019)
@@ -0,0 +1,22 @@
+Pictures section
+----------------
+
+implemented:
+
+browse folders (MP shares)
+display thumbs
+
+
+save to sd
+open browser
+send picture
+slide show
+random slide show
+
+wishes:
+
+gesture control for pictures (swipe)
+save files from Android to MP
+
+Music section
+-------------
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-12-08 13:35:27 UTC (rev 4019)
@@ -1,19 +1,20 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:background="@drawable/back">
+ android:layout_height="fill_parent" android:background="@drawable/back"
+ android:gravity="top">
- <Button android:id="@+id/MainButton1" android:layout_width="fill_parent"
+ <Button android:id="@+id/MainButton1" android:layout_width="fill_parent"
android:layout_height="70dip" android:background="@drawable/pictures_logo" />
<View android:layout_height="2dip" android:layout_width="fill_parent"
android:background="#000" />
-
+
<Button android:id="@+id/MainButton2" android:layout_width="fill_parent"
android:layout_height="70dip" android:background="@drawable/music_logo" />
<View android:layout_height="2dip" android:layout_width="fill_parent"
android:background="#000" />
-
+
<Button android:id="@+id/MainButton3" android:layout_width="fill_parent"
android:layout_height="70dip" android:background="@drawable/videos_logo" />
@@ -22,14 +23,37 @@
<Button android:id="@+id/MainButton4" android:layout_width="fill_parent"
android:layout_height="70dip" android:background="@drawable/remote_logo" />
-
+
<View android:layout_height="2dip" android:layout_width="fill_parent"
android:background="#000" />
- <Button android:id="@+id/MainButton5" android:layout_width="fill_parent"
+ <Button android:id="@+id/MainButton5" android:layout_width="fill_parent"
android:layout_height="70dip" android:background="@drawable/nowplaying_logo" />
+
+ <TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="nothing playing"
+ android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
+ </TextView>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:background="#000" android:layout_height="50dip">
- <View android:layout_height="2dip" android:layout_width="fill_parent"
- android:background="#000" />
+ <TextView android:id="@+id/now_playing_t_left"
+ android:layout_width="80dip" android:layout_height="50dip"
+ android:textSize="12dip" android:textColor="#FF8080ff" android:text="00:00" />
+
+ <Button android:id="@+id/btnPlay" android:layout_width="50dip"
+ android:layout_height="50dip" android:text="FBW">
+ </Button>
+ <Button android:id="@+id/btnPlay" android:layout_width="50dip"
+ android:layout_height="50dip" android:text="Play">
+ </Button>
+ <Button android:id="@+id/btnPlay" android:layout_width="50dip"
+ android:layout_height="50dip" android:text="FFW">
+ </Button>
+ </LinearLayout>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml 2010-12-08 13:35:27 UTC (rev 4019)
@@ -6,4 +6,7 @@
android:title="Open in browser" />
<item android:id="@+id/send"
android:title="Send Picture" />
+ <item android:id="@+id/slide"
+ android:title="Slide show" android:checked="false" android:checkable="true"/>
+ <item android:title="Random slide show" android:id="@+id/rslide" android:checked="false" android:checkable="true"/>
</menu>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-08 13:35:27 UTC (rev 4019)
@@ -37,12 +37,12 @@
public class main extends Activity {
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
+
SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
MODE_PRIVATE);
@@ -110,6 +110,7 @@
startActivityForResult(myIntent, 0);
}
});
+
}
@Override
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-08 13:35:27 UTC (rev 4019)
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import android.app.Activity;
import android.content.Context;
-import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-08 13:35:27 UTC (rev 4019)
@@ -26,7 +26,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-
import mediaportal.remote.R;
import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
@@ -38,27 +37,18 @@
import android.os.Handler;
import android.util.Log;
import android.view.ContextMenu;
-import android.view.GestureDetector;
-import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.ContextMenu.ContextMenuInfo;
-import android.view.GestureDetector.OnGestureListener;
-import android.view.MotionEvent;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
-public class picturesfullscreen extends Activity implements OnGestureListener {
+public class picturesfullscreen extends Activity {
- private static final int SWIPE_MIN_DISTANCE = 120;
- private static final int SWIPE_MAX_OFF_PATH = 250;
- private static final int SWIPE_THRESHOLD_VELOCITY = 200;
-
- private GestureDetector gestureScanner;
private Handler mHandler = new Handler();
private boolean slideShow;
@@ -68,69 +58,35 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
requestWindowFeature(Window.FEATURE_NO_TITLE);
- getWindow().setFlags
- (WindowManager.LayoutParams.FLAG_FULLSCREEN,
- WindowManager.LayoutParams.FLAG_FULLSCREEN);
- setContentView(R.layout.picturesfullscreen);
-
- //ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
- //registerForContextMenu(imagev);
-
- gestureScanner = new GestureDetector(this);
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ setContentView(R.layout.picturesfullscreen);
- setPicture();
- Toast.makeText(picturesfullscreen .this, "left/right swipe possible",
- Toast.LENGTH_SHORT).show();
+ ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+ registerForContextMenu(imagev);
+ setPicture();
}
private void setPicture() {
ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
DirItems item = pictures.pictureList.get(pictures.selectedPicture);
- if (!item.isFolder)
- {
+ if (!item.isFolder) {
httpHandler http = new httpHandler();
String file = "http://" + Settings.Server + ":" + Settings.Port
+ "/pictures/";
file += pictures.actualDir + item.File;
item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
imagev.setImageBitmap(item.Picture);
-
+
TextView txt = (TextView) findViewById(R.id.full_text);
txt.setText(item.File);
}
}
@Override
- public boolean onCreateOptionsMenu(Menu menu) {
- menu.add(0, 101, 0, "Slide show");
- menu.add(0, 102, 1, "Random slide show");
- menu.add(0, 103, 2, "Stop slide show");
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case 101:
- slideShow = true;
- randomShow = false;
- return true;
- case 102:
- slideShow = true;
- randomShow = true;
- return true;
- case 103:
- slideShow = false;
- randomShow = false;
- return true;
- }
- return true;
- }
-
- @Override
public void onStart() {
super.onStart();
@@ -142,25 +98,26 @@
public void run() {
if (slideShow) {
- if(!randomShow)
- {
- int max = pictures.pictureList.size();
+ if (!randomShow) {
+ int max = pictures.pictureList.size();
- if (pictures.selectedPicture < max - 1)
- pictures.selectedPicture++;
- else
- pictures.selectedPicture = 0;
- setPicture();
- }
- else
- {
- String req = "http://" + Settings.Server + ":" + Settings.Port +"/random/pictures/random.jpg";
+ if (pictures.selectedPicture < max - 1)
+ pictures.selectedPicture++;
+ else
+ pictures.selectedPicture = 0;
+ setPicture();
+ } else {
+ String req = "http://" + Settings.Server + ":"
+ + Settings.Port + "/random/pictures/random.jpg";
httpHandler handler = new httpHandler();
-
+
Bitmap pic = handler.DownloadImage(req);
-
+
ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
imagev.setImageBitmap(pic);
+
+ TextView txt = (TextView) findViewById(R.id.full_text);
+ txt.setText("Random slide show");
}
}
@@ -174,165 +131,131 @@
mHandler.removeCallbacks(mUpdateTimeTask);
}
- @Override
- public boolean onTouchEvent(MotionEvent me) {
- return gestureScanner.onTouchEvent(me);
- }
-
+ public void onCreateContextMenu(ContextMenu menu, View v,
+ ContextMenuInfo menuInfo) {
+ super.onCreateContextMenu(menu, v, menuInfo);
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.picturefullscreenmenu, menu);
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
- float velocityY) {
- try {
+ if (slideShow) {
+ if (randomShow) {
+ MenuItem item = menu.findItem(R.id.rslide);
+ item.setChecked(slideShow);
+ } else {
+ MenuItem item = menu.findItem(R.id.slide);
+ item.setChecked(slideShow);
+ }
+ }
- int max = pictures.pictureList.size();
+ }
- if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
- return false;
- // right to left swipe
- if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
- && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
- if (pictures.selectedPicture < max - 1) {
- pictures.selectedPicture++;
- setPicture();
- } else
- Toast.makeText(picturesfullscreen.this, "reached end +",
- Toast.LENGTH_SHORT).show();
+ String title = (String) item.getTitle();
- } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
- && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-
- if (pictures.selectedPicture > 0) {
- pictures.selectedPicture--;
- setPicture();
- } else
- Toast.makeText(picturesfullscreen.this, "reached end -",
- Toast.LENGTH_SHORT).show();
-
+ if (title.compareTo("Save to sd card") == 0) {
+ SavetoSDCard();
+ return true;
+ } else if (title.compareTo("Open in browser") == 0) {
+ OpenURL();
+ return true;
+ } else if (title.compareTo("Send Picture") == 0) {
+ SendPicture();
+ return true;
+ } else if (title.compareTo("Slide show") == 0) {
+ if ((slideShow == false) || (slideShow && randomShow)) {
+ slideShow = true;
+ randomShow = false;
+ } else {
+ slideShow = false;
}
- } catch (Exception e) {
- // nothing
+ return true;
+ } else if (title.compareTo("Random slide show") == 0) {
+ if ((slideShow == false) || (slideShow && !randomShow)) {
+ slideShow = true;
+ randomShow = true;
+ } else {
+ slideShow = false;
+ }
+ return true;
}
return false;
}
- public boolean onDown(MotionEvent arg0) {
- return false;
+ // ****************
+ // Menu Functions
+ // ******************
+ private void OpenURL() {
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+ String file = "http://" + Settings.Server + ":" + Settings.Port
+ + "/pictures/";
+ file += pictures.actualDir + item.File;
+ String url = file.replaceAll(" ", "%20");
+ Intent i = new Intent(Intent.ACTION_VIEW);
+ i.setData(Uri.parse(url));
+ startActivity(i);
}
- public void onLongPress(MotionEvent arg0) {
- }
+ private void SavetoSDCard() {
+ try {
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+ Bitmap bMap = item.Picture;
+ File fPath = Environment.getExternalStorageDirectory();
+ OutputStream outStream = null;
+ try {
- public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
- float arg3) {
- return false;
- }
+ outStream = new FileOutputStream(fPath + "/"
+ + item.File.toString());
- public void onShowPress(MotionEvent arg0) {
- }
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString()
+ + " |||| " + e.getLocalizedMessage().toString());
+ }
+ bMap.compress(Bitmap.CompressFormat.JPEG, 100, outStream);
+ try {
+ outStream.flush();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString()
+ + " |||| " + e.getLocalizedMessage().toString());
+ }
+ try {
+ outStream.close();
- public boolean onSingleTapUp(MotionEvent arg0) {
- return false;
+ Toast.makeText(picturesfullscreen.this, "File saved.",
+ Toast.LENGTH_SHORT).show();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString()
+ + " |||| " + e.getLocalizedMessage().toString());
+ }
+ } catch (Exception e) {
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString()
+ + " |||| " + e.getLocalizedMessage().toString());
+ // e.printStackTrace();
+ }
+
}
-
- public void onCreateContextMenu(ContextMenu menu, View v,
- ContextMenuInfo menuInfo) {
- super.onCreateContextMenu(menu, v, menuInfo);
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.picturefullscreenmenu, menu);
- }
-
- @Override
- public boolean onContextItemSelected(MenuItem item) {
- if(item.getTitle()=="Save to sd card"){
- SavetoSDCard();
- }
- else if(item.getTitle()=="Open in browser"){
- OpenURL();
- }
- else if(item.getTitle()=="Send Picture"){
- SendPicture();
- }
- else {
- return false;
- }
- return false;
- }
-
-
- //****************
- //Menu Functions
- //******************
- private void OpenURL(){
- DirItems item = pictures.pictureList.get(pictures.selectedPicture);
- String file = "http://" + Settings.Server + ":" + Settings.Port
- + "/pictures/";
- file += pictures.actualDir + item.File;
- String url = file.replaceAll(" ", "%20");
- Intent i = new Intent(Intent.ACTION_VIEW);
- i.setData(Uri.parse(url));
- startActivity(i);
- }
-
- private void SavetoSDCard(){
- try{
- DirItems item = pictures.pictureList.get(pictures.selectedPicture);
- Bitmap bMap = item.Picture;
- File fPath = Environment.getExternalStorageDirectory();
- OutputStream outStream = null;
- try {
-
- outStream = new FileOutputStream(fPath + "/" + item.File.toString());
-
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
- }
- bMap.compress(Bitmap.CompressFormat.JPEG, 100, outStream);
- try {
- outStream.flush();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
- }
- try {
- outStream.close();
-
- Toast.makeText(picturesfullscreen.this, "File saved.",
- Toast.LENGTH_SHORT).show();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
- }
- }
- catch (Exception e)
- {
- Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
- //e.printStackTrace();
- }
-
- }
-
-
-
- private void SendPicture(){
- try
- {
+ private void SendPicture() {
+ try {
DirItems item = pictures.pictureList.get(pictures.selectedPicture);
- Intent picMessageIntent = new Intent(android.content.Intent.ACTION_SEND);
- picMessageIntent.setType("image/jpeg");
+ Intent picMessageIntent = new Intent(
+ android.content.Intent.ACTION_SEND);
+ picMessageIntent.setType("image/jpeg");
picMessageIntent.putExtra(Intent.EXTRA_STREAM, item.Picture);
- startActivity(Intent.createChooser(picMessageIntent,"Send picture using:"));
+ startActivity(Intent.createChooser(picMessageIntent,
+ "Send picture using:"));
+ } catch (Exception e) {
+ Log.e("Debug", "SendPicture " + e.getMessage().toString()
+ + " |||| " + e.getLocalizedMessage().toString());
+ // e.printStackTrace();
}
- catch (Exception e)
- {
- Log.e("Debug", "SendPicture " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
- //e.printStackTrace();
- }
- }
-
+ }
+
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-12-07 21:55:14 UTC (rev 4018)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-12-08 13:35:27 UTC (rev 4019)
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E508BE47-8031-4202-9FD2-404732F86696}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -37,7 +37,8 @@
</Reference>
<Reference Include="Databases, Version=1.1.2.20596, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
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.
|
|
From: <Rol...@us...> - 2010-12-07 21:55:20
|
Revision: 4018
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4018&view=rev
Author: Rollsroyc3
Date: 2010-12-07 21:55:14 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
added contextmenu to picturefullscreen.java
made picturefullscreen actually fullscreen.
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-07 13:21:51 UTC (rev 4017)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-07 21:55:14 UTC (rev 4018)
@@ -65,78 +65,81 @@
public static final int videos_logo=0x7f020033;
}
public static final class id {
- public static final int GridView01=0x7f050010;
- public static final int ImageView01=0x7f050012;
- public static final int LinearLayout01=0x7f050013;
- public static final int ListView01=0x7f050022;
- public static final int MainButton1=0x7f050005;
- public static final int MainButton2=0x7f050006;
- public static final int MainButton3=0x7f050007;
- public static final int MainButton4=0x7f050008;
- public static final int MainButton5=0x7f050009;
- public static final int TextView01=0x7f050003;
- public static final int TextView02=0x7f050004;
- public static final int btnBack=0x7f050038;
- public static final int btnChannelDown=0x7f05003d;
- public static final int btnChannelUp=0x7f05003a;
- public static final int btnDown=0x7f050037;
- public static final int btnExit=0x7f05003e;
- public static final int btnFBack=0x7f050025;
- public static final int btnFForw=0x7f050027;
- public static final int btnHibernate=0x7f050040;
- public static final int btnHome=0x7f05002e;
- public static final int btnInfo=0x7f050030;
- public static final int btnLeft=0x7f050032;
- public static final int btnMenu=0x7f050036;
- public static final int btnOk=0x7f050033;
- public static final int btnPause=0x7f05002b;
- public static final int btnPlay=0x7f050026;
- public static final int btnRestart=0x7f050041;
- public static final int btnRight=0x7f050034;
- public static final int btnShutOff=0x7f050042;
- public static final int btnSkipBack=0x7f050029;
- public static final int btnSkipForw=0x7f05002c;
- public static final int btnStop=0x7f05002a;
- public static final int btnSuspend=0x7f05003f;
- public static final int btnUp=0x7f05002f;
- public static final int btnVolumeDown=0x7f05003c;
- public static final int btnVolumeMute=0x7f05003b;
- public static final int btnVolumeUp=0x7f050039;
- public static final int btnWakeOnLan=0x7f050043;
- public static final int full_text=0x7f050011;
- public static final int icon_image=0x7f050001;
- public static final int icon_text=0x7f050002;
- public static final int list_album=0x7f05000c;
- public static final int list_artist=0x7f05000d;
- public static final int list_result=0x7f05000e;
- public static final int list_song=0x7f05000f;
- public static final int music_grid=0x7f05000b;
- public static final int naviRemote_text=0x7f050023;
- public static final int now_album=0x7f050015;
- public static final int now_artist=0x7f05001b;
- public static final int now_cd=0x7f050016;
- public static final int now_list=0x7f050021;
- public static final int now_next=0x7f050020;
- public static final int now_pause=0x7f05001e;
- public static final int now_play=0x7f05001f;
- public static final int now_playing=0x7f050014;
- public static final int now_playing_right=0x7f050019;
- public static final int now_playing_t_left=0x7f050018;
- public static final int now_prev=0x7f05001c;
- public static final int now_progress=0x7f050017;
- public static final int now_stop=0x7f05001d;
- public static final int now_title=0x7f05001a;
- public static final int server_ip=0x7f050044;
- public static final int server_macid=0x7f050046;
- public static final int server_port=0x7f050045;
- public static final int title=0x7f050047;
- public static final int widget0=0x7f05000a;
- public static final int widget00=0x7f050024;
- public static final int widget01=0x7f050028;
- public static final int widget02=0x7f05002d;
- public static final int widget03=0x7f050031;
- public static final int widget04=0x7f050035;
- public static final int widget44=0x7f050000;
+ public static final int GridView01=0x7f060010;
+ public static final int ImageView01=0x7f060012;
+ public static final int LinearLayout01=0x7f060013;
+ public static final int ListView01=0x7f060022;
+ public static final int MainButton1=0x7f060005;
+ public static final int MainButton2=0x7f060006;
+ public static final int MainButton3=0x7f060007;
+ public static final int MainButton4=0x7f060008;
+ public static final int MainButton5=0x7f060009;
+ public static final int TextView01=0x7f060003;
+ public static final int TextView02=0x7f060004;
+ public static final int btnBack=0x7f060038;
+ public static final int btnChannelDown=0x7f06003d;
+ public static final int btnChannelUp=0x7f06003a;
+ public static final int btnDown=0x7f060037;
+ public static final int btnExit=0x7f06003e;
+ public static final int btnFBack=0x7f060025;
+ public static final int btnFForw=0x7f060027;
+ public static final int btnHibernate=0x7f060040;
+ public static final int btnHome=0x7f06002e;
+ public static final int btnInfo=0x7f060030;
+ public static final int btnLeft=0x7f060032;
+ public static final int btnMenu=0x7f060036;
+ public static final int btnOk=0x7f060033;
+ public static final int btnPause=0x7f06002b;
+ public static final int btnPlay=0x7f060026;
+ public static final int btnRestart=0x7f060041;
+ public static final int btnRight=0x7f060034;
+ public static final int btnShutOff=0x7f060042;
+ public static final int btnSkipBack=0x7f060029;
+ public static final int btnSkipForw=0x7f06002c;
+ public static final int btnStop=0x7f06002a;
+ public static final int btnSuspend=0x7f06003f;
+ public static final int btnUp=0x7f06002f;
+ public static final int btnVolumeDown=0x7f06003c;
+ public static final int btnVolumeMute=0x7f06003b;
+ public static final int btnVolumeUp=0x7f060039;
+ public static final int btnWakeOnLan=0x7f060043;
+ public static final int full_text=0x7f060011;
+ public static final int icon_image=0x7f060001;
+ public static final int icon_text=0x7f060002;
+ public static final int list_album=0x7f06000c;
+ public static final int list_artist=0x7f06000d;
+ public static final int list_result=0x7f06000e;
+ public static final int list_song=0x7f06000f;
+ public static final int music_grid=0x7f06000b;
+ public static final int naviRemote_text=0x7f060023;
+ public static final int now_album=0x7f060015;
+ public static final int now_artist=0x7f06001b;
+ public static final int now_cd=0x7f060016;
+ public static final int now_list=0x7f060021;
+ public static final int now_next=0x7f060020;
+ public static final int now_pause=0x7f06001e;
+ public static final int now_play=0x7f06001f;
+ public static final int now_playing=0x7f060014;
+ public static final int now_playing_right=0x7f060019;
+ public static final int now_playing_t_left=0x7f060018;
+ public static final int now_prev=0x7f06001c;
+ public static final int now_progress=0x7f060017;
+ public static final int now_stop=0x7f06001d;
+ public static final int now_title=0x7f06001a;
+ public static final int open=0x7f060049;
+ public static final int save=0x7f060048;
+ public static final int send=0x7f06004a;
+ public static final int server_ip=0x7f060044;
+ public static final int server_macid=0x7f060046;
+ public static final int server_port=0x7f060045;
+ public static final int title=0x7f060047;
+ public static final int widget0=0x7f06000a;
+ public static final int widget00=0x7f060024;
+ public static final int widget01=0x7f060028;
+ public static final int widget02=0x7f06002d;
+ public static final int widget03=0x7f060031;
+ public static final int widget04=0x7f060035;
+ public static final int widget44=0x7f060000;
}
public static final class layout {
public static final int icon=0x7f030000;
@@ -158,6 +161,9 @@
public static final int splash=0x7f030010;
public static final int title=0x7f030011;
}
+ public static final class menu {
+ public static final int picturefullscreenmenu=0x7f050000;
+ }
public static final class string {
public static final int app_name=0x7f040000;
}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/menu/picturefullscreenmenu.xml 2010-12-07 21:55:14 UTC (rev 4018)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/save"
+ android:title="Save to sd card" />
+ <item android:id="@+id/open"
+ android:title="Open in browser" />
+ <item android:id="@+id/send"
+ android:title="Send Picture" />
+</menu>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-07 13:21:51 UTC (rev 4017)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-07 21:55:14 UTC (rev 4018)
@@ -21,16 +21,26 @@
package mediaportal.remote;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
import mediaportal.remote.R;
import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.net.Uri;
import android.os.Bundle;
+import android.os.Environment;
import android.os.Handler;
+import android.util.Log;
import android.view.ContextMenu;
import android.view.GestureDetector;
import android.view.Menu;
+import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
@@ -64,17 +74,16 @@
(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.picturesfullscreen);
-
- setContentView(R.layout.picturesfullscreen);
-
+
+ //ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+ //registerForContextMenu(imagev);
+
gestureScanner = new GestureDetector(this);
setPicture();
Toast.makeText(picturesfullscreen .this, "left/right swipe possible",
Toast.LENGTH_SHORT).show();
- // ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
- // registerForContextMenu(imagev);
}
private void setPicture() {
@@ -83,14 +92,14 @@
if (!item.isFolder)
{
httpHandler http = new httpHandler();
- String file = "http://" + Settings.Server + ":" + Settings.Port
- + "/pictures/";
- file += pictures.actualDir + item.File;
- item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
- imagev.setImageBitmap(item.Picture);
-
- TextView txt = (TextView) findViewById(R.id.full_text);
- txt.setText(item.File);
+ String file = "http://" + Settings.Server + ":" + Settings.Port
+ + "/pictures/";
+ file += pictures.actualDir + item.File;
+ item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
+ imagev.setImageBitmap(item.Picture);
+
+ TextView txt = (TextView) findViewById(R.id.full_text);
+ txt.setText(item.File);
}
}
@@ -169,6 +178,7 @@
public boolean onTouchEvent(MotionEvent me) {
return gestureScanner.onTouchEvent(me);
}
+
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
float velocityY) {
@@ -207,7 +217,7 @@
}
public boolean onDown(MotionEvent arg0) {
- return true;
+ return false;
}
public void onLongPress(MotionEvent arg0) {
@@ -224,4 +234,105 @@
public boolean onSingleTapUp(MotionEvent arg0) {
return false;
}
+
+
+ public void onCreateContextMenu(ContextMenu menu, View v,
+ ContextMenuInfo menuInfo) {
+ super.onCreateContextMenu(menu, v, menuInfo);
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.picturefullscreenmenu, menu);
+ }
+
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
+ if(item.getTitle()=="Save to sd card"){
+ SavetoSDCard();
+ }
+ else if(item.getTitle()=="Open in browser"){
+ OpenURL();
+ }
+ else if(item.getTitle()=="Send Picture"){
+ SendPicture();
+ }
+ else {
+ return false;
+ }
+ return false;
+ }
+
+
+ //****************
+ //Menu Functions
+ //******************
+ private void OpenURL(){
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+ String file = "http://" + Settings.Server + ":" + Settings.Port
+ + "/pictures/";
+ file += pictures.actualDir + item.File;
+ String url = file.replaceAll(" ", "%20");
+ Intent i = new Intent(Intent.ACTION_VIEW);
+ i.setData(Uri.parse(url));
+ startActivity(i);
+ }
+
+ private void SavetoSDCard(){
+ try{
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+ Bitmap bMap = item.Picture;
+ File fPath = Environment.getExternalStorageDirectory();
+ OutputStream outStream = null;
+ try {
+
+ outStream = new FileOutputStream(fPath + "/" + item.File.toString());
+
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
+ }
+ bMap.compress(Bitmap.CompressFormat.JPEG, 100, outStream);
+ try {
+ outStream.flush();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
+ }
+ try {
+ outStream.close();
+
+ Toast.makeText(picturesfullscreen.this, "File saved.",
+ Toast.LENGTH_SHORT).show();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
+ }
+ }
+ catch (Exception e)
+ {
+ Log.e("Debug", "SavetoSDCard " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
+ //e.printStackTrace();
+ }
+
+ }
+
+
+
+ private void SendPicture(){
+ try
+ {
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+ Intent picMessageIntent = new Intent(android.content.Intent.ACTION_SEND);
+ picMessageIntent.setType("image/jpeg");
+ picMessageIntent.putExtra(Intent.EXTRA_STREAM, item.Picture);
+ startActivity(Intent.createChooser(picMessageIntent,"Send picture using:"));
+ }
+ catch (Exception e)
+ {
+ Log.e("Debug", "SendPicture " + e.getMessage().toString() + " |||| " + e.getLocalizedMessage().toString() );
+ //e.printStackTrace();
+ }
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-07 13:21:57
|
Revision: 4017
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4017&view=rev
Author: chemelli_sf
Date: 2010-12-07 13:21:51 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
Released 2.0.0.7RC
Modified Paths:
--------------
trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2
trunk/plugins/WorldMap/Installer/update.xml
Added Paths:
-----------
trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.7Rc.mpe1
Removed Paths:
-------------
trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.6Beta.mpe1
Modified: trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2
===================================================================
--- trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2 2010-12-07 10:30:21 UTC (rev 4016)
+++ trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2 2010-12-07 13:21:51 UTC (rev 4017)
@@ -318,14 +318,14 @@
<Major>2</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>6</Revision>
+ <Revision>7</Revision>
</Version>
<ExtensionDescription>Browse the whole world via your remote and watch Road maps, Satellite images or a Hybrid image from Google maps or Microsoft Bing.
</ExtensionDescription>
<VersionDescription />
- <DevelopmentStatus>Beta</DevelopmentStatus>
- <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/MyWorldmap_v[Version][DevelopmentStatus].mpe1</OnlineLocation>
- <ReleaseDate>2010-08-21T15:10:05.4736949+02:00</ReleaseDate>
+ <DevelopmentStatus>Rc</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.7Rc.mpe1</OnlineLocation>
+ <ReleaseDate>2010-12-07T14:17:45</ReleaseDate>
<Tags />
<Location>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\Installer\MyWorldmap_v[Version][DevelopmentStatus].mpe1</Location>
<Params>
@@ -336,7 +336,7 @@
<Description>The icon file of the package (jpg,png,bmp)</Description>
</SectionParam>
<SectionParam Name="Online Icon">
- <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/globe-compass.ico
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/globe-compass.ico
</Value>
<ValueType>String</ValueType>
<Description>The icon file of the package stored online (jpg,png,bmp)</Description>
@@ -528,7 +528,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>globe-compass.ico</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{01daa89b-9e2a-4fcc-8d1b-502e5f86d553}-globe-compass.ico</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{08846990-daa0-4eb2-9cf6-bcf3ab83916b}-globe-compass.ico</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Deleted: trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.6Beta.mpe1
===================================================================
(Binary files differ)
Added: trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.7Rc.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.7Rc.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/WorldMap/Installer/update.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/update.xml 2010-12-07 10:30:21 UTC (rev 4016)
+++ trunk/plugins/WorldMap/Installer/update.xml 2010-12-07 13:21:51 UTC (rev 4017)
@@ -66,7 +66,7 @@
<Description>The icon file of the package (jpg,png,bmp)</Description>
</SectionParam>
<SectionParam Name="Online Icon">
- <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/globe-compass.ico
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/globe-compass.ico
</Value>
<ValueType>String</ValueType>
<Description>The icon file of the package stored online (jpg,png,bmp)</Description>
@@ -98,5 +98,102 @@
<FolderGroups />
</ProjectSettings>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Languages">
+ <DisplayName>Languages</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Languages</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Bin">
+ <DisplayName>Bin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Bin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items />
+ </Dependencies>
+ <GeneralInfo>
+ <Name>MyWorldMap</Name>
+ <Id>e310d391-d250-449e-9425-e0555da60291</Id>
+ <Author>LKuech & Chemelli</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage />
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>7</Revision>
+ </Version>
+ <ExtensionDescription>Browse the whole world via your remote and watch Road maps, Satellite images or a Hybrid image from Google maps or Microsoft Bing.
+</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Rc</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.7Rc.mpe1</OnlineLocation>
+ <ReleaseDate>2010-12-07T14:17:45</ReleaseDate>
+ <Tags />
+ <Location>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\Installer\MyWorldmap_v[Version][DevelopmentStatus].mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <Value>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\Installer\globe-compass.ico</Value>
+ <ValueType>File</ValueType>
+ <Description>The icon file of the package (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Online Icon">
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/globe-compass.ico
+</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-07 10:30:29
|
Revision: 4016
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4016&view=rev
Author: chemelli_sf
Date: 2010-12-07 10:30:21 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
Updated MPEI package
Modified Paths:
--------------
trunk/plugins/ItalyLogos/package/ItalyLogos.xmp2
trunk/plugins/ItalyLogos/update.xml
Added Paths:
-----------
trunk/plugins/ItalyLogos/ItalyLogos v.1.0.0.3.mpe1
Removed Paths:
-------------
trunk/plugins/ItalyLogos/ItalyLogos v.1.0.0.2.mpe1
Deleted: trunk/plugins/ItalyLogos/ItalyLogos v.1.0.0.2.mpe1
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/ItalyLogos v.1.0.0.3.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/ItalyLogos v.1.0.0.3.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/package/ItalyLogos.xmp2
===================================================================
--- trunk/plugins/ItalyLogos/package/ItalyLogos.xmp2 2010-12-06 23:01:55 UTC (rev 4015)
+++ trunk/plugins/ItalyLogos/package/ItalyLogos.xmp2 2010-12-07 10:30:21 UTC (rev 4016)
@@ -5378,6 +5378,825 @@
<ZipFileName>Installer{CopyFile}\{f13714e8-1b05-44c6-92eb-a59f7a2e211b}-rmf fm.png</ZipFileName>
<DestinationFilename>%Thumbs%\Radio\rmf fm.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\7 gold.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{de339f3b-abb8-4c33-9287-dd93dcce9652}-7 gold.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\7 gold.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\antenna 3 nord est.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b2239183-486c-4c8f-b2d4-d3ae2cce9363}-antenna 3 nord est.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\antenna 3 nord est.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\antenna 3 nord est.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5117a20f-ff98-463d-9efe-ea4d4240976a}-antenna 3 nord est.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\antenna 3 nord est.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\antenna 3 nord est.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{943cdab8-2c96-4731-a2a4-5498ba0ac893}-antenna 3 nord est.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\antenna 3 nord est.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\antenna 3 nord est.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6c08bab4-2b1a-4db1-81a3-3d09bd54adff}-antenna 3 nord est.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\antenna 3 nord est.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale italia (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9ef0a235-e41f-4ff0-826e-3add694febc7}-canale italia (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale italia (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale italia due (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2248e7a1-e72e-443c-aac1-ce3eebc4392d}-canale italia due (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale italia due (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale italia due.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{dd244f00-3d8c-4dd2-88ea-32f69dbaa1bf}-canale italia due.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale italia due.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale italia uno (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b12282fa-1a44-459f-b812-5f7e35f5a2d9}-canale italia uno (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale italia uno (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale italia uno.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e0d6d22e-e859-4de6-ad34-42cc324e18d8}-canale italia uno.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale italia uno.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale5 +1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{40aee71a-0e59-401d-92a6-a8c8e5042798}-canale5 +1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale5 +1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale5 HD.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{210df49b-efba-4428-a867-7c886ed28f80}-canale5 HD.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale5 HD.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\canale5.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9613ba3d-1325-48ad-8d48-75bc8dd66e7d}-canale5.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\canale5.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema +1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0d5c0640-275e-468d-ac0e-024ca1f6a46e}-cinema +1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema +1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema +24 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a118bf45-10c5-44b3-b99f-3330e3ef6cd7}-cinema +24 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema +24 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema +24.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2a3263c2-dd8d-47d9-90a8-8b67280e8b37}-cinema +24.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema +24.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema 1 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6db69d46-54e4-4925-838e-9838d2123e26}-cinema 1 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema 1 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema 1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b63325b0-1f45-4c2d-891d-45e64cb21546}-cinema 1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema 1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema hits.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d6faf119-2613-4254-b5f6-b28f02444739}-cinema hits.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema hits.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\cinema max.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0aaa4107-0164-453e-b5bb-3f4c89316162}-cinema max.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\cinema max.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\comedy central.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{50d37562-fadd-4e2e-aa19-8aabd3b6f4d1}-comedy central.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\comedy central.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\france 24.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{03ae3d2b-6279-4f7a-8b53-0e3fc9818701}-france 24.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\france 24.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\frisbee.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f8f56485-7c67-4b39-af69-dc4df05cf655}-frisbee.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\frisbee.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\italia1 +1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{831f9cf7-e291-4674-94aa-30ad042e8c53}-italia1 +1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\italia1 +1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\italia1 HD.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ecff0d5c-ff92-4917-97db-5c7143da2bba}-italia1 HD.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\italia1 HD.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\italia1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{08337f7d-fa9f-45e4-9714-7322bfa22d07}-italia1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\italia1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\la 5.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{43f3ccc5-716f-483c-962d-6360172cb538}-la 5.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\la 5.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\la 8.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5ec77441-767e-4eb5-bb93-41cc09168be2}-la 8.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\la 8.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\la 9.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{30f95d2f-81ad-498a-8e65-87480ece8af4}-la 9.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\la 9.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\la5 (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{011cc4ec-cec7-48cc-81dd-a271c4a1d16e}-la5 (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\la5 (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\la5.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{abbe759d-ffd3-4d12-abef-2af5c5c3fc6e}-la5.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\la5.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mediaset extra.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e7a672c0-5f9e-4a5d-baa3-3dbda9374a69}-mediaset extra.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mediaset extra.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mtv (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8c0bae5e-d0f4-4df4-a8ab-19348c1ab98c}-mtv (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mtv (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mtv .png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8062ea40-ea65-4c74-afea-bd5979f8c86f}-mtv .png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mtv .png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mtv on demand.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{07e6f3ce-89f7-44b5-9c5c-12fa72121210}-mtv on demand.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mtv on demand.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mtv+ (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{36c7ab54-189d-4db3-a9d8-c4953855ff30}-mtv+ (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mtv+ (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mtv+ (2).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0136acf1-ef92-4bd4-a3b2-1fa6fa5eeccd}-mtv+ (2).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mtv+ (2).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mtv+.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2171219b-c3c8-492d-8e5e-a9c9f6010e89}-mtv+.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mtv+.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\mya+1 premium.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2424fd02-2d26-4b94-b97e-e40d1f4d145e}-mya+1 premium.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\mya+1 premium.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 1 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2524e4ff-7a6a-43e0-a1b0-ca31c6f473aa}-primafila 1 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 1 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0c3046bc-7f3d-4035-944e-e09cc502a958}-primafila 1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 10.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{014cec9e-24d2-4c4f-9a95-653a960310b2}-primafila 10.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 10.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 11.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{4096540f-72c8-4185-89ec-c6c17e25da62}-primafila 11.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 11.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 12.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{601cc631-1218-4e41-8273-06d434c1c50b}-primafila 12.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 12.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 13.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{480100cc-55f0-400e-9ffd-8830c19e785f}-primafila 13.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 13.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 14.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0e919f39-f48d-4872-8840-d35e2b20b90a}-primafila 14.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 14.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 15.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2b7673ba-4cba-48ae-ac45-4359ed1b0770}-primafila 15.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 15.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 16.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b4b78c47-9edf-493a-9c85-7c0ab1492a3f}-primafila 16.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 16.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 17.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7a416536-c5e3-499e-861f-e101b969edd5}-primafila 17.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 17.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 18.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d044143b-fda8-4528-a0ef-ae1f74ba5b3b}-primafila 18.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 18.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 19.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{dea7031c-ae05-4aa5-82c4-11ff36d2cd79}-primafila 19.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 19.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 2.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e55c8157-7e6d-4a5f-89d9-0be74406cb26}-primafila 2.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 2.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 20.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b6853cda-e01a-4353-83a5-5061aafa7fc0}-primafila 20.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 20.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 21.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{18557a28-8910-483a-b9bf-3d07b05f1e1b}-primafila 21.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 21.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 22.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5bc2bc29-b9d4-416c-b9ca-8f9b3eb07b69}-primafila 22.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 22.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 23.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{edf9164a-ea10-4994-a5b3-4e32f86ee43d}-primafila 23.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 23.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 24.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ac97d1f2-dfbd-49e1-bf0a-63a1e8de7b8c}-primafila 24.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 24.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 25.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d9cd41ad-3f6b-4186-8ff6-5090de1a9495}-primafila 25.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 25.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 26.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{782eb14c-5dd1-4c1c-9dbc-50002d73c378}-primafila 26.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 26.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 27.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6c40f4a2-93d6-458f-9319-42a1c60ef549}-primafila 27.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 27.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 28.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2889f34c-51ef-4df8-879e-8eac7f754b76}-primafila 28.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 28.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 29.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f1e5657d-a323-4fb5-af8a-606856ead095}-primafila 29.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 29.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 3 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{84df8578-2c29-44c1-b52f-3c90e5eb4c43}-primafila 3 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 3 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 3.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a2299ec1-bdc2-4854-bee3-3d564c57bcd5}-primafila 3.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 3.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 30.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{abeb0e00-f153-4d00-b64b-c718df27b2a0}-primafila 30.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 30.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 31.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{47db304d-11f6-4ee3-94f3-93c3d3a04b86}-primafila 31.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 31.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 32.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{80d6334f-ce75-41a0-b9df-32ec2ac8888e}-primafila 32.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 32.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 33.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{06cdb4fb-cd0e-4a1c-8ea5-e76bee2c31d2}-primafila 33.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 33.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 34.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cf460904-9526-4d54-8e69-f65795cd8d65}-primafila 34.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 34.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 35.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b2da0d6c-76b9-4819-9ad3-108cfc679fa2}-primafila 35.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 35.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 36.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{76dde26e-71e9-4d26-b747-57e484b6a439}-primafila 36.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 36.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 37.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9b1bbda2-dfee-48ef-bcf8-22ad621979c3}-primafila 37.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 37.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 38.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d1935140-5779-4d2c-a260-46e7056676e6}-primafila 38.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 38.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 39.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{fa53d101-c33d-4599-a4ee-56835ec97af5}-primafila 39.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 39.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 4.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8cf098b3-23bd-4007-a0c4-04ee1ed7d3ce}-primafila 4.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 4.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 40.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1218e1ef-8057-4487-b705-64e13969413f}-primafila 40.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 40.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 5 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{194dfa59-28bb-44b8-ba01-ffff0f2f5711}-primafila 5 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 5 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 5.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9583fe11-205a-4411-9409-0b51acafa031}-primafila 5.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 5.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 6.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6e614e16-ce14-4d41-9526-0988f87a173f}-primafila 6.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 6.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 7 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{06025ee0-fd2e-41cc-84d0-b8c126ed4881}-primafila 7 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 7 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 7.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e7daecc1-6ff0-4f2b-a6c6-e39305992a9b}-primafila 7.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 7.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 8.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0e8ae68b-2414-4277-9045-b43e23a00540}-primafila 8.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 8.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 9 hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{4164411d-8862-4964-9fbb-f786b1cef5b5}-primafila 9 hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 9 hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila 9.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6e8ce763-5b97-44b6-bfd1-32ae6db327e0}-primafila 9.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila 9.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\primafila.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{11f0dae1-d410-4891-a076-4b7ad05d8c4e}-primafila.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\primafila.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\qvc.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{abc3282e-16a0-4ec6-af8a-8e3b1a02969b}-qvc.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\qvc.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai 3 tgr veneto.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6e7e5ade-bf8d-49f7-bc1c-7a9368cce4f4}-rai 3 tgr veneto.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai 3 tgr veneto.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai 5.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{101e72e8-10aa-4f0c-9259-ab46a5e0a3c1}-rai 5.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai 5.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai hd.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2e9ec9bb-bb4f-4f46-85dd-316c8f76fcca}-rai hd.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai hd.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai radio1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{bc019790-35bf-44e0-a6e4-29a4ab0f40ca}-rai radio1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai radio1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai radio2.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9ade54d3-1903-44f1-9938-a179b9ca960d}-rai radio2.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai radio2.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai radio3.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3319b775-80d7-4339-8a12-e42e45e1cacd}-rai radio3.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai radio3.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rai sport 1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{920f6e86-56e9-438d-b3d3-60f85b1b7aa9}-rai sport 1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rai sport 1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\real time.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{73a06141-b7c6-4591-903d-39516c6438cd}-real time.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\real time.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\rete4.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3795d26c-5378-4cea-9ba7-9a9a89479384}-rete4.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\rete4.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\sky music.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1293ecda-be56-4d0e-b301-1b6d08a3dddb}-sky music.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\sky music.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\sky play.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{38f263f8-51f4-4cfd-988e-671c74dcedda}-sky play.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\sky play.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\sky radio.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8d6bb2c8-b042-4d9f-9269-c3f00a65cbb9}-sky radio.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\sky radio.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\sky sport24.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{93883462-b4fb-4d32-b0fe-e6b44f3511a2}-sky sport24.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\sky sport24.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\teleregione.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8c4ac07a-3660-4346-9ce5-142eeb99cb8d}-teleregione.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\teleregione.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\Thumbs.db</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{91b9d2ca-5343-4cab-913f-78730c130388}-Thumbs.db</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\Thumbs.db</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tlc telecampione.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{dc87e11a-1ea2-4dd5-a9fb-847b7be76f6e}-tlc telecampione.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tlc telecampione.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 canale 55 (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{54a53c79-6c9f-4242-9bac-5a210a2593d8}-tv7 canale 55 (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 canale 55 (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 canale 55 (2).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cd71d4c9-68fb-4563-9815-d03431beb67b}-tv7 canale 55 (2).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 canale 55 (2).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 canale 55 (3).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c4fb6bdc-4632-48bf-a609-aada4eaf0969}-tv7 canale 55 (3).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 canale 55 (3).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 canale55.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d60c9bf6-5258-416d-abb4-3889b26080b2}-tv7 canale55.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 canale55.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 triveneta net (1).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{acded112-6a79-4ce8-86f3-e90735f5ef47}-tv7 triveneta net (1).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 triveneta net (1).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 triveneta net (2).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{dfc8d8e2-1532-4381-be92-188c35029394}-tv7 triveneta net (2).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 triveneta net (2).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 triveneta net (3).png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cd0ce2ac-5b72-4c1b-8a0d-5351e4adce10}-tv7 triveneta net (3).png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 triveneta net (3).png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\tv7 triveneta net.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0c0056d2-8cc9-43e2-a89c-d640cc4f43ad}-tv7 triveneta net.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\tv7 triveneta net.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\videoitalia.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{80f109d4-f101-4c23-8629-0ce0bfd2d4ad}-videoitalia.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\videoitalia.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\Radio\radio 1.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7bbc3617-91bf-4b1f-a81b-9ebcd6f199ae}-radio 1.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\Radio\radio 1.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\Radio\radio 2.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{84e1de5f-3b19-4364-95cb-39e5f575f232}-radio 2.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\Radio\radio 2.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\Radio\radio 3.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7cf1d875-989f-4be9-8b62-3e5ddccb6122}-radio 3.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\Radio\radio 3.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\Radio\rnw-8.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9aad6010-4826-47a0-afb5-8c0b72864b59}-rnw-8.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\Radio\rnw-8.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\Radio\rnw-9.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7b7b2a84-93b2-4cba-a284-faac17d5f00c}-rnw-9.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\Radio\rnw-9.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\Radio\Thumbs.db</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1f18c8d5-f09f-4fc0-85a1-fb755e2c9bab}-Thumbs.db</ZipFileName>
+ <DestinationFilename>%Thumbs%\Radio\Thumbs.db</DestinationFilename>
+ </FileItem>
</Items>
</Files>
</GroupItem>
@@ -5501,28 +6320,22 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>2</Revision>
+ <Revision>3</Revision>
</Version>
- <ExtensionDescription>This package will copy all TV and Radio logos for Italian stations broacasted on:
-
-
-
-
-
+ <ExtensionDescription>This package will copy all TV and Radio logos for Italian stations broacasted on Analog,
DVB-T
+ and
-Analog
-
-
13°E Hotbird
</ExtensionDescription>
- <VersionDescription />
+ <VersionDescription>Some logos updates
+</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/ItalyLogos/ItalyLogos v.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2010-08-21T19:14:51</ReleaseDate>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/ItalyLogos/ItalyLogos v.1.0.0.3.mpe1</OnlineLocation>
+ <ReleaseDate>2010-12-06T19:14:51</ReleaseDate>
<Tags>logos</Tags>
<Location>..\ItalyLogos v.[Version].mpe1</Location>
<Params>
@@ -10928,11 +11741,830 @@
<ZipFileName>Installer{CopyFile}\{f13714e8-1b05-44c6-92eb-a59f7a2e211b}-rmf fm.png</ZipFileName>
<DestinationFilename>%Thumbs%\Radio\rmf fm.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\7 gold.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{de339f3b-abb8-4c33-9287-dd93dcce9652}-7 gold.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\7 gold.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\antenna 3 nord est.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b2239183-486c-4c8f-b2d4-d3ae2cce9363}-antenna 3 nord est.png</ZipFileName>
+ <DestinationFilename>%Thumbs%\TV\logos\antenna 3 nord est.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\logos\TV\logos\antenna 3 nord est.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5117a20f-ff98...
[truncated message content] |
|
From: <Rol...@us...> - 2010-12-06 23:02:02
|
Revision: 4015
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4015&view=rev
Author: Rollsroyc3
Date: 2010-12-06 23:01:55 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.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/httpHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-06 23:01:55 UTC (rev 4015)
@@ -15,19 +15,19 @@
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".remote_01" android:launchMode="singleInstance"></activity>
- <activity android:name=".remote_02" android:launchMode="singleInstance"></activity>
+ <activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
+ <activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
<activity android:name=".pictures" android:launchMode="singleInstance"></activity>
<activity android:name=".picturesfullscreen" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicdir" android:launchMode="singleInstance"></activity>
+ <activity android:name=".MusicDir" android:launchMode="singleInstance"></activity>
<activity android:name=".setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaylist" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicartist" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicalbum" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicsong" android:launchMode="singleInstance"></activity>
- <activity android:name=".musictab" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicresults" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicArtist" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicAlbum" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicSong" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicTab" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicResults" android:launchMode="singleInstance"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -4,16 +4,16 @@
import android.media.MediaPlayer;
-public class mediaplayercontrol {
+public class MediaPlayerControl {
- private static mediaplayercontrol instance;
+ private static MediaPlayerControl instance;
private static MediaPlayer mp;
- public static mediaplayercontrol getinstance() {
+ public static MediaPlayerControl getinstance() {
if (mp == null)
mp = new MediaPlayer();
if (instance == null)
- instance = new mediaplayercontrol();
+ instance = new MediaPlayerControl();
return instance;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -40,11 +40,11 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
-public class musicdir extends Activity {
+public class MusicDir extends Activity {
private Handler mHandler = new Handler();
private String actualDir = "";
- private static ArrayList<receivedirectoryxmlhandler.DirItems> musicList;
+ private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> musicList;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -55,7 +55,7 @@
mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(musicdir.this));
+ gridview.setAdapter(new ImageAdapter2(MusicDir.this));
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
@@ -116,11 +116,11 @@
Log.d("update music dir", "do update folder : " + actualDir);
- receivedirhandler h = receivedirhandler.getinstance();
+ ReceiveDirHandler h = ReceiveDirHandler.getinstance();
musicList = h.getMusicDir(actualDir);
if (musicList.size() == 0) {
- Toast.makeText(musicdir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
} else {
GridView gridview = (GridView) findViewById(R.id.music_grid);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -32,12 +32,12 @@
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
-public class postwebserver {
+public class PostWebserver {
public String httpServer = "";
public String httpPort = "";
- public postwebserver(String Server, String Port) {
+ public PostWebserver(String Server, String Port) {
httpServer = Server;
httpPort = Port;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -24,17 +24,17 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
-import mediaportal.remote.receivedbxmlhandler.DbItems;
+import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
-public class receivedbhandler {
+public class ReceiveDbHandler {
- private static receivedbhandler instance;
+ private static ReceiveDbHandler instance;
public int selectedMusic;
- public static receivedbhandler getinstance() {
+ public static ReceiveDbHandler getinstance() {
if (instance == null)
- instance = new receivedbhandler();
+ instance = new ReceiveDbHandler();
return instance;
}
@@ -56,8 +56,8 @@
private ArrayList<DbItems> fetchData(String Data) {
- receivedbxmlhandler handler = new receivedbxmlhandler();
- receivehandler hand = new receivehandler(handler);
+ ReceiveDbXmlHandler handler = new ReceiveDbXmlHandler();
+ ReceiveHandler hand = new ReceiveHandler(handler);
try {
Data = URLEncoder.encode(Data, "UTF-8");
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -27,7 +27,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class receivedbxmlhandler extends DefaultHandler {
+public class ReceiveDbXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -22,16 +22,16 @@
package mediaportal.remote;
import java.util.ArrayList;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
-public class receivedirhandler {
+public class ReceiveDirHandler {
- private static receivedirhandler instance;
+ private static ReceiveDirHandler instance;
private static String actualDir;
- public static receivedirhandler getinstance() {
+ public static ReceiveDirHandler getinstance() {
if (instance == null)
- instance = new receivedirhandler();
+ instance = new ReceiveDirHandler();
return instance;
}
@@ -60,8 +60,8 @@
private ArrayList<DirItems> fetchData(String Data) {
- receivedirectoryxmlhandler handler = new receivedirectoryxmlhandler();
- receivehandler hand = new receivehandler(handler);
+ ReceiveDirectoryXmlHandler handler = new ReceiveDirectoryXmlHandler();
+ ReceiveHandler hand = new ReceiveHandler(handler);
hand.readValues(Data);
return handler.DirList;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -28,7 +28,7 @@
import android.graphics.Bitmap;
-public class receivedirectoryxmlhandler extends DefaultHandler {
+public class ReceiveDirectoryXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -34,11 +34,11 @@
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-public class receivehandler {
+public class ReceiveHandler {
private org.xml.sax.ContentHandler _handler;
- public receivehandler(org.xml.sax.ContentHandler Handler) {
+ public ReceiveHandler(org.xml.sax.ContentHandler Handler) {
_handler = Handler;
}
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-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -37,7 +37,7 @@
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
-public class remote_01 extends Activity implements OnGestureListener {
+public class Remote_01 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private String HttpServer = "";
@@ -177,7 +177,7 @@
public void PostCommand(String button) {
- postwebserver post = new postwebserver(HttpServer, HttpPort);
+ PostWebserver post = new PostWebserver(HttpServer, HttpPort);
AssetManager assetManager = getAssets();
String xml = "";
@@ -210,7 +210,7 @@
// right to left swipe
if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, remote_02.class);
+ Intent myIntent = new Intent(this, Remote_02.class);
startActivityForResult(myIntent, 0);
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
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-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -35,7 +35,7 @@
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
-public class remote_02 extends Activity implements OnGestureListener {
+public class Remote_02 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private String HttpServer = "";
@@ -134,7 +134,7 @@
public void PostCommand(String button) {
- postwebserver post = new postwebserver(HttpServer, HttpPort);
+ PostWebserver post = new PostWebserver(HttpServer, HttpPort);
AssetManager assetManager = getAssets();
String xml = "";
@@ -171,7 +171,7 @@
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, remote_01.class);
+ Intent myIntent = new Intent(this, Remote_01.class);
startActivityForResult(myIntent, 0);
}
} catch (Exception e) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -17,11 +17,11 @@
import android.graphics.BitmapFactory;
import android.os.Environment;
-public class httphandler {
+public class httpHandler {
String extStorageDirectory;
- public httphandler() {
+ public httpHandler() {
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -64,7 +64,7 @@
Button btnMusic = (Button) findViewById(R.id.MainButton2);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), musictab.class);
+ Intent myIntent = new Intent(view.getContext(), musicTab.class);
startActivityForResult(myIntent, 0);
}
});
@@ -97,7 +97,7 @@
Button btnRemote = (Button) findViewById(R.id.MainButton4);
btnRemote.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), remote_01.class);
+ Intent myIntent = new Intent(view.getContext(), Remote_01.class);
startActivityForResult(myIntent, 0);
}
});
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -39,18 +39,18 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicalbum extends Activity {
+public class musicAlbum extends Activity {
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> albumList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> albumList;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_album);
ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.setAdapter(new EfficientAdapter(musicalbum.this));
+ l1.setAdapter(new EfficientAdapter(musicAlbum.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -83,11 +83,11 @@
Log.d("update album", "do update");
- receivedbhandler handler = receivedbhandler.getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
albumList = handler.GetAlbums();
if (albumList.size() == 0) {
- Toast.makeText(musicalbum.this, "TIME OUT SERVER",
+ Toast.makeText(musicAlbum.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -134,7 +134,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = albumList.get(position);
+ ReceiveDbXmlHandler.DbItems item = albumList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Album + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -39,19 +39,19 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicartist extends Activity{
+public class musicArtist extends Activity{
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> artistList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> artistList;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_artist);
ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.setAdapter(new EfficientAdapter(musicartist.this));
+ l1.setAdapter(new EfficientAdapter(musicArtist.this));
l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
{
@@ -59,9 +59,9 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- receivedbxmlhandler.DbItems item = artistList.get(arg2);
- musicresults.Select = item.Artist;
- Intent myIntent = new Intent(arg1.getContext(), musicresults.class);
+ ReceiveDbXmlHandler.DbItems item = artistList.get(arg2);
+ musicResults.Select = item.Artist;
+ Intent myIntent = new Intent(arg1.getContext(), musicResults.class);
startActivityForResult(myIntent, 0);
}
}
@@ -89,11 +89,11 @@
Log.d("update artist", "do update");
- receivedbhandler handler = receivedbhandler .getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler .getinstance();
artistList = handler.GetArtist();
if (artistList.size() == 0) {
- Toast.makeText(musicartist.this, "TIME OUT SERVER",
+ Toast.makeText(musicArtist.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -138,7 +138,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = artistList.get(position);
+ ReceiveDbXmlHandler.DbItems item = artistList.get(position);
holder.text.setText(String.valueOf(position +1));
holder.text2.setText(item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -40,12 +40,12 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicresults extends Activity {
+public class musicResults extends Activity {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> itemList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> itemList;
public static String Select = "";
@@ -54,7 +54,7 @@
setContentView(R.layout.music_results);
ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.setAdapter(new EfficientAdapter(musicresults.this));
+ l1.setAdapter(new EfficientAdapter(musicResults.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -80,9 +80,9 @@
if (x == -1)
x = 0;
if (itemList.size() > 0) {
- receivedbxmlhandler.DbItems itm = itemList.get(x);
+ ReceiveDbXmlHandler.DbItems itm = itemList.get(x);
- httphandler http = new httphandler();
+ httpHandler http = new httpHandler();
http.DownloadFile();
}
x = 1;
@@ -112,11 +112,11 @@
Log.d("update search", "do update");
- receivedbhandler handler = receivedbhandler.getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
itemList = handler.GetSongsByArtist(Select);
if (itemList.size() == 0) {
- Toast.makeText(musicresults.this, "TIME OUT SERVER",
+ Toast.makeText(musicResults.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -163,7 +163,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = itemList.get(position);
+ ReceiveDbXmlHandler.DbItems item = itemList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -39,11 +39,11 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicsong extends Activity {
+public class musicSong extends Activity {
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> songList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> songList;
public static String Select = "";
@@ -52,7 +52,7 @@
setContentView(R.layout.music_song);
ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.setAdapter(new EfficientAdapter(musicsong.this));
+ l1.setAdapter(new EfficientAdapter(musicSong.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -63,7 +63,7 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- mediaplayercontrol mp = mediaplayercontrol.getinstance();
+ MediaPlayerControl mp = MediaPlayerControl.getinstance();
mp.Play("http://" + Settings.Server + ":" + Settings.Port + "/music/" + "song-marianne-plays-on-piano-sense-and-sensibilit.mp3");
}
});
@@ -87,11 +87,11 @@
Log.d("update song", "do update");
- receivedbhandler handler = receivedbhandler.getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
songList = handler.GetSongs();
if (songList.size() == 0) {
- Toast.makeText(musicsong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
+ Toast.makeText(musicSong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
.show();
}
@@ -138,7 +138,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = songList.get(position);
+ ReceiveDbXmlHandler.DbItems item = songList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -27,7 +27,7 @@
import android.os.Bundle;
import android.widget.TabHost;
-public class musictab extends TabActivity {
+public class musicTab extends TabActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.musictab);
@@ -38,7 +38,7 @@
Intent intent; // Reusable Intent for each tab
// Create an Intent to launch an Activity for the tab (to be reused)
- intent = new Intent().setClass(this, musicartist.class);
+ intent = new Intent().setClass(this, musicArtist.class);
// Initialize a TabSpec for each tab and add it to the TabHost
spec = tabHost.newTabSpec("artists")
.setIndicator("Artists", res.getDrawable(R.drawable.ic_tab1))
@@ -46,19 +46,19 @@
tabHost.addTab(spec);
// Do the same for the other tabs
- intent = new Intent().setClass(this, musicalbum.class);
+ intent = new Intent().setClass(this, musicAlbum.class);
spec = tabHost.newTabSpec("albums")
.setIndicator("Albums", res.getDrawable(R.drawable.ic_tab2))
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, musicsong.class);
+ intent = new Intent().setClass(this, musicSong.class);
spec = tabHost.newTabSpec("songs")
.setIndicator("Songs", res.getDrawable(R.drawable.ic_tab3))
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, musicdir.class);
+ intent = new Intent().setClass(this, MusicDir.class);
spec = tabHost.newTabSpec("music")
.setIndicator("Music", res.getDrawable(R.drawable.ic_tab4))
.setContent(intent);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -149,7 +149,7 @@
if (nowplayinghandler.Cover.equals("True")) {
if (!lastTitle.equals(nowplayinghandler.Title)) {
- httphandler h = new httphandler();
+ httpHandler h = new httpHandler();
Bitmap bitmap = h.DownloadImage("http://" + HttpServer + ":"
+ HttpPort + "/nowplaying/cover");
if (bitmap != null) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -4,7 +4,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class nowplayingxmlhandler extends DefaultHandler {
+public class nowplayingXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -93,7 +93,7 @@
e.printStackTrace();
}
- nowplayingxmlhandler handler = new nowplayingxmlhandler();
+ nowplayingXmlHandler handler = new nowplayingXmlHandler();
reader.setContentHandler(handler);
try {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -4,7 +4,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class nowplaylistxmlhandler extends DefaultHandler {
+public class nowplaylistXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
nowplaylisthandler.PlayListItem item = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -95,7 +95,7 @@
e.printStackTrace();
}
- nowplaylistxmlhandler handler = new nowplaylistxmlhandler();
+ nowplaylistXmlHandler handler = new nowplaylistXmlHandler();
reader.setContentHandler(handler);
try {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
@@ -47,7 +47,7 @@
private Handler mHandler = new Handler();
public static String actualDir = "";
- public static ArrayList<receivedirectoryxmlhandler.DirItems> pictureList;
+ public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
public static int selectedPicture;
@Override
@@ -125,7 +125,7 @@
Log.d("update pictures", "do update folder : " + actualDir);
- receivedirhandler h = receivedirhandler.getinstance();
+ ReceiveDirHandler h = ReceiveDirHandler.getinstance();
pictureList = h.getPictureDir(actualDir);
if (pictureList.size() == 0) {
@@ -198,7 +198,7 @@
iv.setTag(pic);
} else {
- httphandler http = new httphandler();
+ httpHandler http = new httpHandler();
String file = "http://" + Settings.Server + ":"
+ Settings.Port + "/pictures/";
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -22,7 +22,7 @@
package mediaportal.remote;
import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -82,7 +82,7 @@
DirItems item = pictures.pictureList.get(pictures.selectedPicture);
if (!item.isFolder)
{
- httphandler http = new httphandler();
+ httpHandler http = new httpHandler();
String file = "http://" + Settings.Server + ":" + Settings.Port
+ "/pictures/";
file += pictures.actualDir + item.File;
@@ -146,7 +146,7 @@
else
{
String req = "http://" + Settings.Server + ":" + Settings.Port +"/random/pictures/random.jpg";
- httphandler handler = new httphandler();
+ httpHandler handler = new httpHandler();
Bitmap pic = handler.DownloadImage(req);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-06 18:45:35
|
Revision: 4014
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4014&view=rev
Author: chemelli_sf
Date: 2010-12-06 18:45:27 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
New/renamed logos
Modified Paths:
--------------
trunk/plugins/ItalyLogos/logos/TV/logos/cnn intl..png
trunk/plugins/ItalyLogos/logos/TV/logos/deakids.png
trunk/plugins/ItalyLogos/logos/TV/logos/fantasy.png
trunk/plugins/ItalyLogos/logos/TV/logos/fx.png
trunk/plugins/ItalyLogos/logos/TV/logos/hip hop tv.png
trunk/plugins/ItalyLogos/logos/TV/logos/marcopolo.png
trunk/plugins/ItalyLogos/logos/TV/logos/matchmusic.png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv gold.png
trunk/plugins/ItalyLogos/logos/TV/logos/music box.png
trunk/plugins/ItalyLogos/logos/TV/logos/natgeo wild.png
trunk/plugins/ItalyLogos/logos/TV/logos/natgeoadventur.png
trunk/plugins/ItalyLogos/logos/TV/logos/premium emotion.png
trunk/plugins/ItalyLogos/logos/TV/logos/premium energy.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai scuola.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky meteo24.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky sport 1.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky sport 2.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky sport 3.png
trunk/plugins/ItalyLogos/logos/TV/logos/yacht & sail.png
Added Paths:
-----------
trunk/plugins/ItalyLogos/logos/Radio/radio 1.png
trunk/plugins/ItalyLogos/logos/Radio/radio 2.png
trunk/plugins/ItalyLogos/logos/Radio/radio 3.png
trunk/plugins/ItalyLogos/logos/Radio/rnw-8.png
trunk/plugins/ItalyLogos/logos/Radio/rnw-9.png
trunk/plugins/ItalyLogos/logos/TV/logos/7 gold.png
trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
trunk/plugins/ItalyLogos/logos/TV/logos/canale italia (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/canale italia due (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/canale italia due.png
trunk/plugins/ItalyLogos/logos/TV/logos/canale italia uno (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/canale italia uno.png
trunk/plugins/ItalyLogos/logos/TV/logos/canale5 +1.png
trunk/plugins/ItalyLogos/logos/TV/logos/canale5 HD.png
trunk/plugins/ItalyLogos/logos/TV/logos/canale5.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema +1.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema +24 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema +24.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema 1 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema 1.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema hits.png
trunk/plugins/ItalyLogos/logos/TV/logos/cinema max.png
trunk/plugins/ItalyLogos/logos/TV/logos/comedy central.png
trunk/plugins/ItalyLogos/logos/TV/logos/france 24.png
trunk/plugins/ItalyLogos/logos/TV/logos/frisbee.png
trunk/plugins/ItalyLogos/logos/TV/logos/italia1 +1.png
trunk/plugins/ItalyLogos/logos/TV/logos/italia1 HD.png
trunk/plugins/ItalyLogos/logos/TV/logos/italia1.png
trunk/plugins/ItalyLogos/logos/TV/logos/la 5.png
trunk/plugins/ItalyLogos/logos/TV/logos/la 8.png
trunk/plugins/ItalyLogos/logos/TV/logos/la 9.png
trunk/plugins/ItalyLogos/logos/TV/logos/la5 (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/la5.png
trunk/plugins/ItalyLogos/logos/TV/logos/mediaset extra.png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv .png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv on demand.png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv+ (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv+ (2).png
trunk/plugins/ItalyLogos/logos/TV/logos/mtv+.png
trunk/plugins/ItalyLogos/logos/TV/logos/mya+1 premium.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 1 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 1.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 10.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 11.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 12.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 13.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 14.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 15.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 16.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 17.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 18.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 19.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 2.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 20.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 21.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 22.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 23.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 24.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 25.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 26.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 27.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 28.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 29.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 3 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 3.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 30.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 31.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 32.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 33.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 34.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 35.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 36.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 37.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 38.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 39.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 4.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 40.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 5 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 5.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 6.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 7 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 7.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 8.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 9 hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila 9.png
trunk/plugins/ItalyLogos/logos/TV/logos/primafila.png
trunk/plugins/ItalyLogos/logos/TV/logos/qvc.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai 3 tgr veneto.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai 5.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai hd.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai radio1.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai radio2.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai radio3.png
trunk/plugins/ItalyLogos/logos/TV/logos/rai sport 1.png
trunk/plugins/ItalyLogos/logos/TV/logos/real time.png
trunk/plugins/ItalyLogos/logos/TV/logos/rete4.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky music.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky play.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky radio.png
trunk/plugins/ItalyLogos/logos/TV/logos/sky sport24.png
trunk/plugins/ItalyLogos/logos/TV/logos/teleregione.png
trunk/plugins/ItalyLogos/logos/TV/logos/tlc telecampione.png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (2).png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (3).png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale55.png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (1).png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (2).png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (3).png
trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net.png
trunk/plugins/ItalyLogos/logos/TV/logos/videoitalia.png
Added: trunk/plugins/ItalyLogos/logos/Radio/radio 1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/Radio/radio 1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/Radio/radio 2.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/Radio/radio 2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/Radio/radio 3.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/Radio/radio 3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/Radio/rnw-8.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/Radio/rnw-8.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/Radio/rnw-9.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/Radio/rnw-9.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/7 gold.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/7 gold.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/antenna 3 nord est.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia due (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia due (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia due.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia due.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia uno (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia uno (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia uno.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale italia uno.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale5 +1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale5 +1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale5 HD.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale5 HD.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/canale5.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/canale5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema +1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema +1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema +24 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema +24 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema +24.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema +24.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema 1 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema 1 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema 1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema 1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema hits.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema hits.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/cinema max.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/cinema max.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/cnn intl..png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/comedy central.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/comedy central.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/deakids.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/fantasy.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/france 24.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/france 24.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/frisbee.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/frisbee.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/fx.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/hip hop tv.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/italia1 +1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/italia1 +1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/italia1 HD.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/italia1 HD.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/italia1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/italia1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/la 5.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/la 5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/la 8.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/la 8.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/la 9.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/la 9.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/la5 (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/la5 (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/la5.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/la5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/marcopolo.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/matchmusic.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mediaset extra.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mediaset extra.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mtv (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mtv (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mtv .png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mtv .png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/mtv gold.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mtv on demand.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mtv on demand.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mtv+ (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mtv+ (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mtv+ (2).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mtv+ (2).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mtv+.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mtv+.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/music box.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/mya+1 premium.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/mya+1 premium.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/natgeo wild.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/natgeoadventur.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/premium emotion.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/premium energy.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 1 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 1 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 10.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 10.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 11.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 11.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 12.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 12.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 13.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 13.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 14.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 14.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 15.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 15.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 16.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 17.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 17.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 18.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 18.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 19.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 19.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 2.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 20.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 20.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 21.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 21.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 22.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 22.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 23.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 23.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 24.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 24.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 25.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 25.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 26.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 26.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 27.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 27.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 28.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 28.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 29.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 29.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 3 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 3 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 3.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 30.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 30.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 31.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 31.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 32.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 33.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 33.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 34.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 34.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 35.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 35.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 36.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 36.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 37.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 37.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 38.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 38.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 39.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 39.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 4.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 4.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 40.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 40.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 5 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 5 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 5.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 6.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 6.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 7 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 7 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 7.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 7.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 8.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 8.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 9 hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 9 hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 9.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila 9.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/primafila.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/primafila.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/qvc.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/qvc.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai 3 tgr veneto.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai 3 tgr veneto.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai 5.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai 5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai hd.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai hd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai radio1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai radio1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai radio2.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai radio2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai radio3.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai radio3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/rai scuola.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rai sport 1.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rai sport 1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/real time.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/real time.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/rete4.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/rete4.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/sky meteo24.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/sky music.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/sky music.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/sky play.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/sky play.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/sky radio.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/sky radio.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/sky sport 1.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/sky sport 2.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/sky sport 3.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ItalyLogos/logos/TV/logos/sky sport24.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/sky sport24.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/teleregione.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/teleregione.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tlc telecampione.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tlc telecampione.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (2).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (2).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (3).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale 55 (3).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale55.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 canale55.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (1).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (1).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (2).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (2).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (3).png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net (3).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/tv7 triveneta net.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/ItalyLogos/logos/TV/logos/videoitalia.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/ItalyLogos/logos/TV/logos/videoitalia.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/ItalyLogos/logos/TV/logos/yacht & sail.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Rol...@us...> - 2010-12-06 12:55:25
|
Revision: 4013
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4013&view=rev
Author: Rollsroyc3
Date: 2010-12-06 12:55:15 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.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/Settings.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,44 @@
+package mediaportal.remote;
+
+import java.io.IOException;
+
+import android.media.MediaPlayer;
+
+public class mediaplayercontrol {
+
+ private static mediaplayercontrol instance;
+ private static MediaPlayer mp;
+
+ public static mediaplayercontrol getinstance() {
+ if (mp == null)
+ mp = new MediaPlayer();
+ if (instance == null)
+ instance = new mediaplayercontrol();
+ return instance;
+ }
+
+ public void Stop()
+ {
+ mp.stop();
+ }
+ public void Play(String Path)
+ {
+
+ try {
+// mp.stop();
+
+ mp.setDataSource(Path);
+ mp.prepare();
+ mp.start();
+ } catch (IllegalStateException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.util.ArrayList;
+import mediaportal.remote.R;
+import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Toast;
+
+public class musicdir extends Activity {
+
+ private Handler mHandler = new Handler();
+ private String actualDir = "";
+ private static ArrayList<receivedirectoryxmlhandler.DirItems> musicList;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music);
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+
+ GridView gridview = (GridView) findViewById(R.id.music_grid);
+ gridview.setAdapter(new ImageAdapter2(musicdir.this));
+ gridview.setOnItemClickListener(new OnItemClickListener() {
+ public void onItemClick(AdapterView<?> parent, View v,
+ int position, long id) {
+
+ // TextView tv = (TextView) v.findViewById(R.id.icon_text);
+ // ImageView
+ ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+ musicItem music = (musicItem) iv.getTag();
+
+ if (music.typ == "item") {
+ // Picturesfullscreen.selectedPicture = position - 1;
+ // Intent myIntent = new Intent(MusicDir.this,
+ // Picturesfullscreen.class);
+ // startActivityForResult(myIntent, 0);
+ }
+
+ if (music.typ == "folder") {
+ actualDir += music.title + "/";
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 0);
+ }
+
+ if (music.typ == "oneup") {
+ if (actualDir.endsWith("/"))
+ actualDir = actualDir.substring(0,
+ actualDir.length() - 1);
+
+ int x = actualDir.lastIndexOf("/");
+ if (x >= 0) {
+ actualDir = actualDir.substring(0, x + 1);
+ } else
+ actualDir = "";
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 0);
+ }
+
+ }
+ });
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ // mHandler.removeCallbacks(mUpdateTimeTask);
+ // mHandler.postDelayed(mUpdateTimeTask, 100);
+ }
+
+ private Runnable mUpdateTimeTask = new Runnable() {
+ public void run() {
+ update();
+ }
+ };
+
+ private void update() {
+
+ Log.d("update music dir", "do update folder : " + actualDir);
+
+ receivedirhandler h = receivedirhandler.getinstance();
+ musicList = h.getMusicDir(actualDir);
+
+ if (musicList.size() == 0) {
+ Toast.makeText(musicdir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ .show();
+ } else {
+ GridView gridview = (GridView) findViewById(R.id.music_grid);
+ gridview.invalidateViews();
+ }
+ }
+
+ public class ImageAdapter2 extends BaseAdapter {
+ private Context mContext;
+ public static final int ACTIVITY_CREATE = 10;
+
+ public ImageAdapter2(Context c) {
+ mContext = c;
+ }
+
+ public int getCount() {
+ if (musicList != null)
+ return musicList.size() + 1;
+ else
+ return 0;
+ }
+
+ public Object getItem(int position) {
+ return null;
+ }
+
+ public long getItemId(int position) {
+ return 0;
+ }
+
+ // @Override
+ // create a new ImageView for each item referenced by the Adapter
+ public View getView(int position, View convertView, ViewGroup parent) {
+ View v;
+ if (convertView == null) { // if it's not recycled, initialize some
+ // attributes
+
+ if (position > 0) {
+ position = position - 1;
+
+ DirItems item1 = musicList.get(position);
+
+ String txtName = item1.File;
+ Boolean isFolder = item1.isFolder;
+
+ LayoutInflater li = LayoutInflater.from(mContext);
+ v = li.inflate(R.layout.icon, null);
+
+ TextView tv = (TextView) v.findViewById(R.id.icon_text);
+ tv.setText(txtName);
+
+ ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+
+ if (isFolder) {
+ iv.setImageResource(R.drawable.folder);
+ musicItem item = new musicItem();
+ item.title = txtName;
+ item.typ = "folder";
+ iv.setTag(item);
+ } else {
+ iv.setImageResource(R.drawable.audio);
+ musicItem item = new musicItem();
+ item.title = txtName;
+ item.typ = "item";
+ iv.setTag(item);
+ }
+ } else {
+ LayoutInflater li = LayoutInflater.from(mContext);
+ v = li.inflate(R.layout.icon, null);
+
+ TextView tv = (TextView) v.findViewById(R.id.icon_text);
+ tv.setText("..");
+
+ ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+ iv.setImageResource(R.drawable.folderback);
+ musicItem item = new musicItem();
+ item.title = "..";
+ item.typ = "oneup";
+ iv.setTag(item);
+ }
+
+ } else {
+ v = convertView;
+ }
+
+ return v;
+ }
+ }
+
+ public class musicItem {
+ public String title;
+ public String typ;
+ }
+
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.IOException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+
+public class postwebserver {
+
+ public String httpServer = "";
+ public String httpPort = "";
+
+ public postwebserver(String Server, String Port) {
+ httpServer = Server;
+ httpPort = Port;
+ }
+
+ public boolean Post(String Data) {
+
+ boolean result = false;
+ try {
+ HttpParams httpParameters = new BasicHttpParams();
+ HttpConnectionParams.setConnectionTimeout(httpParameters, 5000);
+ HttpConnectionParams.setSoTimeout(httpParameters, 5000);
+
+ DefaultHttpClient httpclient = new DefaultHttpClient(httpParameters);
+ HttpPost httppost = new HttpPost("http://" + httpServer + ":"
+ + httpPort);
+
+ StringEntity se = new StringEntity(Data, "UTF-8");
+ se.setContentType("application/atom+xml");
+
+ httppost.setEntity(se);
+
+ @SuppressWarnings("unused")
+ HttpResponse response;
+ response = httpclient.execute(httppost);
+
+ result = true;
+ } catch (ClientProtocolException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return result;
+ }
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import mediaportal.remote.receivedbxmlhandler.DbItems;
+
+public class receivedbhandler {
+
+ private static receivedbhandler instance;
+
+ public int selectedMusic;
+
+ public static receivedbhandler getinstance() {
+ if (instance == null)
+ instance = new receivedbhandler();
+ return instance;
+ }
+
+ public ArrayList<DbItems> GetAlbums() {
+ return fetchData("album.xml");
+ }
+
+ public ArrayList<DbItems> GetArtist() {
+ return fetchData("artist.xml");
+ }
+
+ public ArrayList<DbItems> GetSongs() {
+ return fetchData("song.xml");
+ }
+
+ public ArrayList<DbItems> GetSongsByArtist(String Artist) {
+ return fetchData("song.xml?artist=" + Artist);
+ }
+
+ private ArrayList<DbItems> fetchData(String Data) {
+
+ receivedbxmlhandler handler = new receivedbxmlhandler();
+ receivehandler hand = new receivehandler(handler);
+
+ try {
+ Data = URLEncoder.encode(Data, "UTF-8");
+ } catch (UnsupportedEncodingException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ hand.readValues("/db_music/" + Data);
+ return handler.DbList;
+ }
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.util.ArrayList;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class receivedbxmlhandler extends DefaultHandler {
+ Boolean currentElement = false;
+ String currentValue = null;
+
+ public ArrayList<DbItems> DbList = new ArrayList<DbItems>();
+
+ public static class DbItems
+ {
+ public String Title = "";
+ public String Artist= "";
+ public String Album= "";
+ public String AlbumArtist= "";
+ public String Track= "";
+ public String Rating= "";
+ public String Filename= "";
+ }
+ private DbItems currentDbItem;
+
+ /**
+ * Called when tag starts ( example:- <name>AndroidPeople</name> -- <name> )
+ */
+ @Override
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) throws SAXException {
+ currentElement = true;
+
+ currentValue = "";
+ if (localName == "Database")DbList = new ArrayList<DbItems>();
+ if (localName == "Item")currentDbItem = new DbItems();
+ }
+
+ /**
+ * Called when tag closing ( example:- <name>AndroidPeople</name> -- </name> )
+ */
+ @Override
+ public void endElement(String uri, String localName, String qName)
+ throws SAXException {
+
+ currentElement = false;
+
+ /** set value */
+ if (localName == "Artist") {currentDbItem.Artist =currentValue;}
+ if (localName == "Title") {currentDbItem.Title =currentValue;}
+ if (localName == "Album") {currentDbItem.Album =currentValue;}
+ if (localName == "AlbumArtist") {currentDbItem.AlbumArtist =currentValue;}
+ if (localName == "Track") {currentDbItem.Track =currentValue;}
+ if (localName == "Rating") {currentDbItem.Rating =currentValue;}
+ if (localName == "Filename") {currentDbItem.Filename =currentValue;}
+
+ if (localName == "Item")DbList.add(currentDbItem);
+ }
+
+ /**
+ * Called to get tag characters ( example:- <name>AndroidPeople</name> -- to get
+ * AndroidPeople Character )
+ */
+ @Override
+ public void characters(char[] ch, int start, int length)
+ throws SAXException {
+ if (currentElement) {
+ currentValue = new String(ch, start, length);
+ currentElement = false;
+ }
+
+ }
+
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.util.ArrayList;
+import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+
+public class receivedirhandler {
+
+ private static receivedirhandler instance;
+ private static String actualDir;
+
+ public static receivedirhandler getinstance() {
+ if (instance == null)
+ instance = new receivedirhandler();
+ return instance;
+ }
+
+ public ArrayList<DirItems> getMusicDir(String Dir) {
+
+ return fetchData("/music/" + Dir);
+ }
+
+ public ArrayList<DirItems> getPictureDir(String Dir) {
+
+ return fetchData("/pictures/" + Dir);
+ }
+
+ public ArrayList<DirItems> gotodir(String dir) {
+ actualDir += "/" + dir;
+ return fetchData(actualDir);
+ }
+
+ public ArrayList<DirItems> oneup() {
+ int x = actualDir.lastIndexOf("/");
+ if (x >= 0) {
+ actualDir = actualDir.substring(0, x);
+ }
+ return fetchData(actualDir);
+ }
+
+ private ArrayList<DirItems> fetchData(String Data) {
+
+ receivedirectoryxmlhandler handler = new receivedirectoryxmlhandler();
+ receivehandler hand = new receivehandler(handler);
+ hand.readValues(Data);
+
+ return handler.DirList;
+ }
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.util.ArrayList;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import android.graphics.Bitmap;
+
+public class receivedirectoryxmlhandler extends DefaultHandler {
+ Boolean currentElement = false;
+ String currentValue = null;
+
+ public ArrayList<DirItems> DirList = new ArrayList<DirItems>();
+
+ public static class DirItems
+ {
+ public boolean isFolder = false;
+ public String File= "";
+ public Bitmap Picture = null;
+ }
+ private DirItems currentdirItem;
+
+ /**
+ * Called when tag starts ( example:- <name>AndroidPeople</name> -- <name> )
+ */
+ @Override
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) throws SAXException {
+ currentElement = true;
+
+ currentValue = "";
+ if (localName == "Directory") {DirList = new ArrayList<DirItems>(); }
+ if (localName == "Folder") {currentdirItem = new DirItems(); }
+ if (localName == "File") {currentdirItem = new DirItems(); }
+ }
+
+ /**
+ * Called when tag closing ( example:- <name>AndroidPeople</name> -- </name> )
+ */
+ @Override
+ public void endElement(String uri, String localName, String qName)
+ throws SAXException {
+
+ currentElement = false;
+
+ /** set value */
+ if (localName == "Folder") {
+ currentdirItem.isFolder = true;
+ currentdirItem.File = currentValue;
+ DirList.add(currentdirItem);
+ }
+ if (localName == "File") {
+ currentdirItem.isFolder = false;
+ currentdirItem.File = currentValue;
+ DirList.add(currentdirItem);
+ }
+ }
+
+ /**
+ * Called to get tag characters ( example:- <name>AndroidPeople</name> -- to get
+ * AndroidPeople Character )
+ */
+ @Override
+ public void characters(char[] ch, int start, int length)
+ throws SAXException {
+ if (currentElement) {
+ currentValue = new String(ch, start, length);
+ currentElement = false;
+ }
+
+ }
+
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+public class receivehandler {
+
+ private org.xml.sax.ContentHandler _handler;
+
+ public receivehandler(org.xml.sax.ContentHandler Handler) {
+ _handler = Handler;
+ }
+
+ public void readValues(String Url)
+ {
+ String fileUrl = "http://" + Settings.Server + ":" + Settings.Port + Url;
+
+ URL myFileUrl = null;
+ try {
+ myFileUrl = new URL(fileUrl);
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ try {
+ HttpURLConnection conn = (HttpURLConnection) myFileUrl
+ .openConnection();
+ conn.setConnectTimeout(5000);
+ conn.setReadTimeout(10000);
+ conn.setDoInput(true);
+ conn.connect();
+
+ InputStream is = conn.getInputStream();
+
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ SAXParser sp = null;
+ try {
+ sp = spf.newSAXParser();
+ } catch (ParserConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ XMLReader reader = null;
+ try {
+ reader = sp.getXMLReader();
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ reader.setContentHandler((org.xml.sax.ContentHandler) _handler);
+ try {
+ reader.parse(new InputSource(is));
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ is.close();
+ sp.reset();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+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;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.GestureDetector.OnGestureListener;
+import android.widget.Button;
+
+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;
+ private static final int SWIPE_MAX_OFF_PATH = 250;
+ private static final int SWIPE_THRESHOLD_VELOCITY = 200;
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ 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) {
+ PostCommand("previousMenu");
+ }
+ });
+
+ Button menu = (Button) findViewById(R.id.btnMenu);
+ menu.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("contextMenu");
+ }
+ });
+
+ Button home = (Button) findViewById(R.id.btnHome);
+ home.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("parentDir");
+ }
+ });
+
+ Button info = (Button) findViewById(R.id.btnInfo);
+ info.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("showInfo");
+ }
+ });
+
+ Button left = (Button) findViewById(R.id.btnLeft);
+ left.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("moveLeft");
+ }
+ });
+
+ Button right = (Button) findViewById(R.id.btnRight);
+ right.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("moveRight");
+ }
+ });
+
+ Button up = (Button) findViewById(R.id.btnUp);
+ up.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("moveUp");
+ }
+ });
+
+ Button down = (Button) findViewById(R.id.btnDown);
+ down.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("moveDown");
+ }
+ });
+
+ Button ok = (Button) findViewById(R.id.btnOk);
+ ok.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("selectItem");
+ }
+ });
+
+ Button play = (Button) findViewById(R.id.btnPlay);
+ play.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("play");
+ }
+ });
+
+ Button pause = (Button) findViewById(R.id.btnPause);
+ pause.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("pause");
+ }
+ });
+
+ Button stop = (Button) findViewById(R.id.btnStop);
+ stop.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("stop");
+ }
+ });
+
+ Button skipForw = (Button) findViewById(R.id.btnSkipForw);
+ skipForw.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("nextItem");
+ }
+ });
+
+ Button skipBack = (Button) findViewById(R.id.btnSkipBack);
+ skipBack.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("prevItem");
+ }
+ });
+
+ Button fForw = (Button) findViewById(R.id.btnFForw);
+ fForw.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("forward");
+ }
+ });
+
+ Button fBackw = (Button) findViewById(R.id.btnFBack);
+ fBackw.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("rewind");
+ }
+ });
+ }
+
+ public void PostCommand(String button) {
+
+ postwebserver post = new postwebserver(HttpServer, HttpPort);
+
+ AssetManager assetManager = getAssets();
+ String xml = "";
+
+ try {
+ InputStream inputStream = null;
+ inputStream = assetManager.open("cmd_" + button + ".xml");
+
+ int x = inputStream.read();
+
+ while (x != -1) {
+ xml = xml + (char) x;
+ x = inputStream.read();
+ }
+ post.Post(xml);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent me) {
+ return gestureScanner.onTouchEvent(me);
+ }
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+ float velocityY) {
+ try {
+ if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
+ return false;
+ // right to left swipe
+ if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+ Intent myIntent = new Intent(this, remote_02.class);
+ startActivityForResult(myIntent, 0);
+
+ } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+
+ }
+ } catch (Exception e) {
+ // nothing
+ }
+ return false;
+ }
+
+ public boolean onDown(MotionEvent arg0) {
+ return true;
+ }
+ public void onLongPress(MotionEvent arg0) {
+ }
+ public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
+ float arg3) {
+ return false;
+ }
+ public void onShowPress(MotionEvent arg0) {
+ }
+ public boolean onSingleTapUp(MotionEvent arg0) {
+ return false;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+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;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.GestureDetector.OnGestureListener;
+import android.widget.Button;
+
+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;
+ private static final int SWIPE_MAX_OFF_PATH = 250;
+ private static final int SWIPE_THRESHOLD_VELOCITY = 200;
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.remote02);
+
+ 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) {
+ PostCommand("volumeUp");
+ }
+ });
+ Button btnVolumeDown = (Button) findViewById(R.id.btnVolumeDown);
+ btnVolumeDown.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("volumeDown");
+ }
+ });
+ Button btnVolumeMute = (Button) findViewById(R.id.btnVolumeMute);
+ btnVolumeMute.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("volumeMute");
+ }
+ });
+
+ Button btnChannelUp = (Button) findViewById(R.id.btnChannelUp);
+ btnChannelUp.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("nextChannel");
+ }
+ });
+ Button btnChannelDown = (Button) findViewById(R.id.btnChannelDown);
+ btnChannelDown.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("prevChannel");
+ }
+ });
+
+ Button btnExit = (Button) findViewById(R.id.btnExit);
+ btnExit.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("exit");
+ }
+ });
+ Button btnSuspend = (Button) findViewById(R.id.btnSuspend);
+ btnSuspend.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("suspend");
+ }
+ });
+ Button btnHibernate = (Button) findViewById(R.id.btnHibernate);
+ btnHibernate.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("hibernate");
+ }
+ });
+ Button btnRestart = (Button) findViewById(R.id.btnRestart);
+ btnRestart.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("restart");
+ }
+ });
+ Button btnShutOff = (Button) findViewById(R.id.btnShutOff);
+ btnShutOff.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("shutoff");
+ }
+ });
+
+ Button btnWakeOnLan = (Button) findViewById(R.id.btnWakeOnLan);
+ btnWakeOnLan.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("wakeonlan");
+ }
+ });
+ }
+
+
+ public void PostCommand(String button) {
+
+ postwebserver post = new postwebserver(HttpServer, HttpPort);
+
+ AssetManager assetManager = getAssets();
+ String xml = "";
+
+ try {
+ InputStream inputStream = null;
+ inputStream = assetManager.open("cmd_" + button + ".xml");
+
+ int x = inputStream.read();
+
+ while (x != -1) {
+ xml = xml + (char) x;
+ x = inputStream.read();
+ }
+ post.Post(xml);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent me) {
+ return gestureScanner.onTouchEvent(me);
+ }
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+ float velocityY) {
+ try {
+ if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
+ return false;
+ // right to left swipe
+ if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+
+
+ } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
+ && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
+ Intent myIntent = new Intent(this, remote_01.class);
+ startActivityForResult(myIntent, 0);
+ }
+ } catch (Exception e) {
+ // nothing
+ }
+ return false;
+ }
+
+ public boolean onDown(MotionEvent arg0) {
+ return true;
+ }
+ public void onLongPress(MotionEvent arg0) {
+ }
+ public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
+ float arg3) {
+ return false;
+ }
+ public void onShowPress(MotionEvent arg0) {
+ }
+ public boolean onSingleTapUp(MotionEvent arg0) {
+ return false;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+public class Settings{
+
+ public static String Server = "192.168.0.30";
+ public static String Port = "8200";
+ public static String MacId = "11-22-33-44-55-66";
+
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,116 @@
+package mediaportal.remote;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.apache.http.util.ByteArrayBuffer;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Environment;
+
+public class httphandler {
+
+ String extStorageDirectory;
+
+ public httphandler() {
+
+ }
+
+ public InputStream openHttpConnection(String urlStr) {
+ InputStream in = null;
+ int resCode = -1;
+
+ try {
+ URL url = new URL(urlStr);
+ URLConnection urlConn = url.openConnection();
+
+ if (!(urlConn instanceof HttpURLConnection)) {
+ throw new IOException("URL is not an Http URL");
+ }
+
+ HttpURLConnection httpConn = (HttpURLConnection) urlConn;
+ httpConn.setAllowUserInteraction(false);
+ httpConn.setInstanceFollowRedirects(true);
+ httpConn.setRequestMethod("GET");
+ httpConn.connect();
+ resCode = httpConn.getResponseCode();
+
+ if (resCode == HttpURLConnection.HTTP_OK) {
+ in = httpConn.getInputStream();
+ }
+
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return in;
+ }
+
+ public Bitmap DownloadImage(String urlStr) {
+
+ final String url = urlStr;
+ Bitmap bitmap = null;
+
+ InputStream in = null;
+
+ try {
+ in = openHttpConnection(url);
+ bitmap = BitmapFactory.decodeStream(in);
+ if (in != null)
+ in.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+
+ return bitmap;
+ }
+
+ public void DownloadFile() {
+ extStorageDirectory = Environment.getExternalStorageDirectory()
+ .toString();
+
+ try {
+ InputStream in = openHttpConnection("http://"+ Settings.Server + ":" + Settings.Port +
+ "/music/Clementi_Sonatina_Op.36_No.1_Movement_1.mp3");
+
+ // BufferedInputStream bis = new BufferedInputStream(in);
+ ByteArrayBuffer baf = new ByteArrayBuffer(50);
+ //int current = 0;
+
+ byte[] bb = new byte[1024];
+ int l = in.read(bb, 0, 1024);
+
+ while (l > -0) {
+ baf.append(bb, 0, l);
+ l = in.read(bb, 0, 1024);
+ }
+
+ OutputStream outStream = null;
+ File file = new File(extStorageDirectory, "test.mp3");
+
+ outStream = new FileOutputStream(file);
+ outStream.write(baf.toByteArray());
+ outStream.flush();
+ outStream.close();
+
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.io.IOException;
+
+import mediaportal.remote.R;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.media.MediaPlayer;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.*;
+
+public class main extends Activity {
+
+ private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
+ MODE_PRIVATE);
+
+ Settings.Server = settings.getString("Server", "192.168.0.30");
+ Settings.Port = settings.getString("Port", "8200");
+ Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
+
+ Toast.makeText(getBaseContext(), "Press 'menu' for settings",
+ Toast.LENGTH_LONG).show();
+
+ Button btnPictures = (Button) findViewById(R.id.MainButton1);
+ btnPictures.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ Intent myIntent = new Intent(view.getContext(), pictures.class);
+ startActivityForResult(myIntent, 0);
+ }
+ });
+
+ Button btnMusic = (Button) findViewById(R.id.MainButton2);
+ btnMusic.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ Intent myIntent = new Intent(view.getContext(), musictab.class);
+ startActivityForResult(myIntent, 0);
+ }
+ });
+
+ Button btnVideo = (Button) findViewById(R.id.MainButton3);
+ btnVideo.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ MediaPlayer mp = new MediaPlayer();
+ try {
+ String p = "http://"
+ + Settings.Server
+ + ":"
+ + Settings.Port
+ + "/music/"
+ + "laserkraft_3d_-_nein_mann.mp3";
+ mp.setDataSource(p);
+ mp.prepare();
+ mp.start();
+ } catch (IllegalStateException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+ });
+
+ Button btnRemote = (Button) findViewById(R.id.MainButton4);
+ btnRemote.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ Intent myIntent = new Intent(view.getContext(), remote_01.class);
+ startActivityForResult(myIntent, 0);
+ }
+ });
+
+ Button btnNowPlaying = (Button) findViewById(R.id.MainButton5);
+ btnNowPlaying.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ Intent myIntent = new Intent(view.getContext(),
+ nowplaying.class);
+ startActivityForResult(myIntent, 0);
+ }
+ });
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ menu.add(0, 111, 0, "Settings");
+ menu.add(0, 112, 0, "Exit");
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case 111:
+ Intent myIntent = new Intent(this, setup.class);
+ startActivityForResult(myIntent, 0);
+ return true;
+ case 112:
+ this.finish();
+ return true;
+ }
+ return true;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.util.ArrayList;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class musicalbum extends Activity {
+
+ private Handler mHandler = new Handler();
+
+ private static ArrayList<receivedbxmlhandler.DbItems> albumList;
+
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_album);
+
+ ListView l1 = (ListView) findViewById(R.id.list_album);
+ l1.setAdapter(new EfficientAdapter(musicalbum.this));
+
+ ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
+ l1.setDivider(divcolor);
+ l1.setDividerHeight(2);
+
+ l1.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+ public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
+ int arg2, long arg3) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+ });
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+ }
+
+ private Runnable mUpdateTimeTask = new Runnable() {
+ public void run() {
+ update();
+ }
+ };
+
+ private void update() {
+
+ Log.d("update album", "do update");
+
+ receivedbhandler handler = receivedbhandler.getinstance();
+ albumList = handler.GetAlbums();
+
+ if (albumList.size() == 0) {
+ Toast.makeText(musicalbum.this, "TIME OUT SERVER",
+ Toast.LENGTH_LONG).show();
+ }
+
+ ListView l1 = (ListView) findViewById(R.id.list_album);
+ l1.invalidateViews();
+ }
+
+ private static class EfficientAdapter extends BaseAdapter {
+
+ private LayoutInflater mInflater;
+
+ public EfficientAdapter(Context context) {
+ mInflater = LayoutInflater.from(context);
+ }
+
+ public int getCount() {
+ if (albumList != null)
+ return albumList.size();
+ else
+ return 0;
+ }
+
+ public Object getItem(int position) {
+ return position;
+ }
+
+ public long getItemId(int position) {
+ return position;
+ }
+
+ public View getView(int position, View convertView, ViewGroup parent) {
+ ViewHolder holder;
+
+ if (convertView == null) {
+ convertView = mInflater.inflate(R.layout.list_item, null);
+ holder = new ViewHolder();
+ holder.text = (TextView) convertView
+ .findViewById(R.id.TextView01);
+ holder.text2 = (TextView) convertView
+ .findViewById(R.id.TextView02);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ receivedbxmlhandler.DbItems item = albumList.get(position);
+
+ holder.text.setText(String.valueOf(position + 1));
+ holder.text2.setText(item.Album + " - " + item.Artist);
+
+ convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
+ : Color.LTGRAY);
+
+ return convertView;
+ }
+
+ static class ViewHolder {
+ TextView text;
+ TextView text2;
+ }
+ }
+
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 12:55:15 UTC (rev 4013)
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package mediaportal.remote;
+
+import java.util.ArrayList;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class musicartist extends Activity{
+
+ public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+ private Handler mHandler = new Handler();
+
+ private static ArrayList<receivedbxmlhandler.DbItems> artistList;
+
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_artist);
+
+ ListView l1 = (ListView) findViewById(R.id.list_artist);
+ l1.setAdapter(new EfficientAdapter(musicartist.this));
+
+ l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
+ {
+ //@override
+ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+ long arg3) {
+
+ receivedbxmlhandler.DbItems item = artistList.get(arg2);
+ musicresults.Select = item.Artist;
+ Intent myIntent = new Intent(arg1.getContext(), musicresults.class);
+ startActivityForResult(myIntent, 0);
+ }
+ }
+ );
+
+ ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
+ l1.setDivider(divcolor);
+ l1.setDividerHeight(2);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+ }
+ private Runnable mUpdateTimeTask = new Runnable() {
+ public void run() {
+ update();
+ }
+ };
+
+ private void update() {
+
+ Log.d("update artist", "do update");
+
+ receivedbhandler handler = receivedbhandler .getinstance();
+ artistList = handler.GetArtist();
+
+ if (artistList.size() == 0) {
+ Toast.makeText(musicartist.this, "TIME OUT SERVER",
+ Toast.LENGTH_LONG).show();
+ }
+
+ ListView l1 = (ListView) findViewById(R.id.list_artist);
+ l1.invalidateViews();
+ }
+
+ private static class EfficientAdapter extends BaseAdapter {
+
+ private LayoutInflater mInflater;
+
+ ...
[truncated message content] |
|
From: <Rol...@us...> - 2010-12-06 12:49:18
|
Revision: 4012
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4012&view=rev
Author: Rollsroyc3
Date: 2010-12-06 12:49:11 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-12-06 12:47:28 UTC (rev 4011)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-12-06 12:49:11 UTC (rev 4012)
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E508BE47-8031-4202-9FD2-404732F86696}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -31,14 +31,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.1.1.11854, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.1.2.20593, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=1.1.1.11856, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Databases, Version=1.1.2.20596, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -46,9 +45,9 @@
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.7.11849, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.2.7.20588, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-06 12:47:28 UTC (rev 4011)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-06 12:49:11 UTC (rev 4012)
@@ -739,7 +739,7 @@
if (year != string.Empty)
{
msg += "<Item>\r\n";
- msg += "<Year>" + HttpUtility.HtmlEncode(year) + "</Year>\r\n";
+ msg += "<Year>" + HttpUtility.HtmlEncode(year).Replace(" ","%20") + "</Year>\r\n";
msg += "</Item>\r\n";
}
}
@@ -770,7 +770,7 @@
if (year != string.Empty)
{
msg += "<Item>\r\n";
- msg += "<Month>" + HttpUtility.HtmlEncode(year) + "</Month>\r\n";
+ msg += "<Month>" + HttpUtility.HtmlEncode(year).Replace(" ", "%20") + "</Month>\r\n";
msg += "</Item>\r\n";
}
}
@@ -802,7 +802,7 @@
if (year != string.Empty)
{
msg += "<Item>\r\n";
- msg += "<Day>" + HttpUtility.HtmlEncode(year) + "</Day>\r\n";
+ msg += "<Day>" + HttpUtility.HtmlEncode(year).Replace(" ", "%20") + "</Day>\r\n";
msg += "</Item>\r\n";
}
}
@@ -838,7 +838,7 @@
{
msg += "<Item>\r\n";
msg += "<ID>" + HttpUtility.HtmlEncode(item[0]) + "</ID>\r\n";
- msg += "<Name>" + HttpUtility.HtmlEncode(item[1]) + "</Name>\r\n";
+ msg += "<Name>" + HttpUtility.HtmlEncode(item[1]).Replace(" ", "%20") + "</Name>\r\n";
msg += "</Item>\r\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Rol...@us...> - 2010-12-06 12:47:36
|
Revision: 4011
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4011&view=rev
Author: Rollsroyc3
Date: 2010-12-06 12:47:28 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Removed Paths:
-------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.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/Settings.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,44 +0,0 @@
-package mediaportal.remote;
-
-import java.io.IOException;
-
-import android.media.MediaPlayer;
-
-public class mediaplayercontrol {
-
- private static mediaplayercontrol instance;
- private static MediaPlayer mp;
-
- public static mediaplayercontrol getinstance() {
- if (mp == null)
- mp = new MediaPlayer();
- if (instance == null)
- instance = new mediaplayercontrol();
- return instance;
- }
-
- public void Stop()
- {
- mp.stop();
- }
- public void Play(String Path)
- {
-
- try {
-// mp.stop();
-
- mp.setDataSource(Path);
- mp.prepare();
- mp.start();
- } catch (IllegalStateException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
- }
-
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.util.ArrayList;
-import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Toast;
-
-public class musicdir extends Activity {
-
- private Handler mHandler = new Handler();
- private String actualDir = "";
- private static ArrayList<receivedirectoryxmlhandler.DirItems> musicList;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music);
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
-
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(musicdir.this));
- gridview.setOnItemClickListener(new OnItemClickListener() {
- public void onItemClick(AdapterView<?> parent, View v,
- int position, long id) {
-
- // TextView tv = (TextView) v.findViewById(R.id.icon_text);
- // ImageView
- ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
- musicItem music = (musicItem) iv.getTag();
-
- if (music.typ == "item") {
- // Picturesfullscreen.selectedPicture = position - 1;
- // Intent myIntent = new Intent(MusicDir.this,
- // Picturesfullscreen.class);
- // startActivityForResult(myIntent, 0);
- }
-
- if (music.typ == "folder") {
- actualDir += music.title + "/";
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 0);
- }
-
- if (music.typ == "oneup") {
- if (actualDir.endsWith("/"))
- actualDir = actualDir.substring(0,
- actualDir.length() - 1);
-
- int x = actualDir.lastIndexOf("/");
- if (x >= 0) {
- actualDir = actualDir.substring(0, x + 1);
- } else
- actualDir = "";
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 0);
- }
-
- }
- });
- }
-
- @Override
- public void onStart() {
- super.onStart();
-
- // mHandler.removeCallbacks(mUpdateTimeTask);
- // mHandler.postDelayed(mUpdateTimeTask, 100);
- }
-
- private Runnable mUpdateTimeTask = new Runnable() {
- public void run() {
- update();
- }
- };
-
- private void update() {
-
- Log.d("update music dir", "do update folder : " + actualDir);
-
- receivedirhandler h = receivedirhandler.getinstance();
- musicList = h.getMusicDir(actualDir);
-
- if (musicList.size() == 0) {
- Toast.makeText(musicdir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
- .show();
- } else {
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.invalidateViews();
- }
- }
-
- public class ImageAdapter2 extends BaseAdapter {
- private Context mContext;
- public static final int ACTIVITY_CREATE = 10;
-
- public ImageAdapter2(Context c) {
- mContext = c;
- }
-
- public int getCount() {
- if (musicList != null)
- return musicList.size() + 1;
- else
- return 0;
- }
-
- public Object getItem(int position) {
- return null;
- }
-
- public long getItemId(int position) {
- return 0;
- }
-
- // @Override
- // create a new ImageView for each item referenced by the Adapter
- public View getView(int position, View convertView, ViewGroup parent) {
- View v;
- if (convertView == null) { // if it's not recycled, initialize some
- // attributes
-
- if (position > 0) {
- position = position - 1;
-
- DirItems item1 = musicList.get(position);
-
- String txtName = item1.File;
- Boolean isFolder = item1.isFolder;
-
- LayoutInflater li = LayoutInflater.from(mContext);
- v = li.inflate(R.layout.icon, null);
-
- TextView tv = (TextView) v.findViewById(R.id.icon_text);
- tv.setText(txtName);
-
- ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
-
- if (isFolder) {
- iv.setImageResource(R.drawable.folder);
- musicItem item = new musicItem();
- item.title = txtName;
- item.typ = "folder";
- iv.setTag(item);
- } else {
- iv.setImageResource(R.drawable.audio);
- musicItem item = new musicItem();
- item.title = txtName;
- item.typ = "item";
- iv.setTag(item);
- }
- } else {
- LayoutInflater li = LayoutInflater.from(mContext);
- v = li.inflate(R.layout.icon, null);
-
- TextView tv = (TextView) v.findViewById(R.id.icon_text);
- tv.setText("..");
-
- ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
- iv.setImageResource(R.drawable.folderback);
- musicItem item = new musicItem();
- item.title = "..";
- item.typ = "oneup";
- iv.setTag(item);
- }
-
- } else {
- v = convertView;
- }
-
- return v;
- }
- }
-
- public class musicItem {
- public String title;
- public String typ;
- }
-
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.io.IOException;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-
-public class postwebserver {
-
- public String httpServer = "";
- public String httpPort = "";
-
- public postwebserver(String Server, String Port) {
- httpServer = Server;
- httpPort = Port;
- }
-
- public boolean Post(String Data) {
-
- boolean result = false;
- try {
- HttpParams httpParameters = new BasicHttpParams();
- HttpConnectionParams.setConnectionTimeout(httpParameters, 5000);
- HttpConnectionParams.setSoTimeout(httpParameters, 5000);
-
- DefaultHttpClient httpclient = new DefaultHttpClient(httpParameters);
- HttpPost httppost = new HttpPost("http://" + httpServer + ":"
- + httpPort);
-
- StringEntity se = new StringEntity(Data, "UTF-8");
- se.setContentType("application/atom+xml");
-
- httppost.setEntity(se);
-
- @SuppressWarnings("unused")
- HttpResponse response;
- response = httpclient.execute(httppost);
-
- result = true;
- } catch (ClientProtocolException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return result;
- }
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import mediaportal.remote.receivedbxmlhandler.DbItems;
-
-public class receivedbhandler {
-
- private static receivedbhandler instance;
-
- public int selectedMusic;
-
- public static receivedbhandler getinstance() {
- if (instance == null)
- instance = new receivedbhandler();
- return instance;
- }
-
- public ArrayList<DbItems> GetAlbums() {
- return fetchData("album.xml");
- }
-
- public ArrayList<DbItems> GetArtist() {
- return fetchData("artist.xml");
- }
-
- public ArrayList<DbItems> GetSongs() {
- return fetchData("song.xml");
- }
-
- public ArrayList<DbItems> GetSongsByArtist(String Artist) {
- return fetchData("song.xml?artist=" + Artist);
- }
-
- private ArrayList<DbItems> fetchData(String Data) {
-
- receivedbxmlhandler handler = new receivedbxmlhandler();
- receivehandler hand = new receivehandler(handler);
-
- try {
- Data = URLEncoder.encode(Data, "UTF-8");
- } catch (UnsupportedEncodingException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- hand.readValues("/db_music/" + Data);
- return handler.DbList;
- }
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.util.ArrayList;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class receivedbxmlhandler extends DefaultHandler {
- Boolean currentElement = false;
- String currentValue = null;
-
- public ArrayList<DbItems> DbList = new ArrayList<DbItems>();
-
- public static class DbItems
- {
- public String Title = "";
- public String Artist= "";
- public String Album= "";
- public String AlbumArtist= "";
- public String Track= "";
- public String Rating= "";
- public String Filename= "";
- }
- private DbItems currentDbItem;
-
- /**
- * Called when tag starts ( example:- <name>AndroidPeople</name> -- <name> )
- */
- @Override
- public void startElement(String uri, String localName, String qName,
- Attributes attributes) throws SAXException {
- currentElement = true;
-
- currentValue = "";
- if (localName == "Database")DbList = new ArrayList<DbItems>();
- if (localName == "Item")currentDbItem = new DbItems();
- }
-
- /**
- * Called when tag closing ( example:- <name>AndroidPeople</name> -- </name> )
- */
- @Override
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
-
- currentElement = false;
-
- /** set value */
- if (localName == "Artist") {currentDbItem.Artist =currentValue;}
- if (localName == "Title") {currentDbItem.Title =currentValue;}
- if (localName == "Album") {currentDbItem.Album =currentValue;}
- if (localName == "AlbumArtist") {currentDbItem.AlbumArtist =currentValue;}
- if (localName == "Track") {currentDbItem.Track =currentValue;}
- if (localName == "Rating") {currentDbItem.Rating =currentValue;}
- if (localName == "Filename") {currentDbItem.Filename =currentValue;}
-
- if (localName == "Item")DbList.add(currentDbItem);
- }
-
- /**
- * Called to get tag characters ( example:- <name>AndroidPeople</name> -- to get
- * AndroidPeople Character )
- */
- @Override
- public void characters(char[] ch, int start, int length)
- throws SAXException {
- if (currentElement) {
- currentValue = new String(ch, start, length);
- currentElement = false;
- }
-
- }
-
-}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.util.ArrayList;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
-
-public class receivedirhandler {
-
- private static receivedirhandler instance;
- private static String actualDir;
-
- public static receivedirhandler getinstance() {
- if (instance == null)
- instance = new receivedirhandler();
- return instance;
- }
-
- public ArrayList<DirItems> getMusicDir(String Dir) {
-
- return fetchData("/music/" + Dir);
- }
-
- public ArrayList<DirItems> getPictureDir(String Dir) {
-
- return fetchData("/pictures/" + Dir);
- }
-
- public ArrayList<DirItems> gotodir(String dir) {
- actualDir += "/" + dir;
- return fetchData(actualDir);
- }
-
- public ArrayList<DirItems> oneup() {
- int x = actualDir.lastIndexOf("/");
- if (x >= 0) {
- actualDir = actualDir.substring(0, x);
- }
- return fetchData(actualDir);
- }
-
- private ArrayList<DirItems> fetchData(String Data) {
-
- receivedirectoryxmlhandler handler = new receivedirectoryxmlhandler();
- receivehandler hand = new receivehandler(handler);
- hand.readValues(Data);
-
- return handler.DirList;
- }
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.util.ArrayList;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import android.graphics.Bitmap;
-
-public class receivedirectoryxmlhandler extends DefaultHandler {
- Boolean currentElement = false;
- String currentValue = null;
-
- public ArrayList<DirItems> DirList = new ArrayList<DirItems>();
-
- public static class DirItems
- {
- public boolean isFolder = false;
- public String File= "";
- public Bitmap Picture = null;
- }
- private DirItems currentdirItem;
-
- /**
- * Called when tag starts ( example:- <name>AndroidPeople</name> -- <name> )
- */
- @Override
- public void startElement(String uri, String localName, String qName,
- Attributes attributes) throws SAXException {
- currentElement = true;
-
- currentValue = "";
- if (localName == "Directory") {DirList = new ArrayList<DirItems>(); }
- if (localName == "Folder") {currentdirItem = new DirItems(); }
- if (localName == "File") {currentdirItem = new DirItems(); }
- }
-
- /**
- * Called when tag closing ( example:- <name>AndroidPeople</name> -- </name> )
- */
- @Override
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
-
- currentElement = false;
-
- /** set value */
- if (localName == "Folder") {
- currentdirItem.isFolder = true;
- currentdirItem.File = currentValue;
- DirList.add(currentdirItem);
- }
- if (localName == "File") {
- currentdirItem.isFolder = false;
- currentdirItem.File = currentValue;
- DirList.add(currentdirItem);
- }
- }
-
- /**
- * Called to get tag characters ( example:- <name>AndroidPeople</name> -- to get
- * AndroidPeople Character )
- */
- @Override
- public void characters(char[] ch, int start, int length)
- throws SAXException {
- if (currentElement) {
- currentValue = new String(ch, start, length);
- currentElement = false;
- }
-
- }
-
-}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-public class receivehandler {
-
- private org.xml.sax.ContentHandler _handler;
-
- public receivehandler(org.xml.sax.ContentHandler Handler) {
- _handler = Handler;
- }
-
- public void readValues(String Url)
- {
- String fileUrl = "http://" + Settings.Server + ":" + Settings.Port + Url;
-
- URL myFileUrl = null;
- try {
- myFileUrl = new URL(fileUrl);
- } catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- try {
- HttpURLConnection conn = (HttpURLConnection) myFileUrl
- .openConnection();
- conn.setConnectTimeout(5000);
- conn.setReadTimeout(10000);
- conn.setDoInput(true);
- conn.connect();
-
- InputStream is = conn.getInputStream();
-
- SAXParserFactory spf = SAXParserFactory.newInstance();
- SAXParser sp = null;
- try {
- sp = spf.newSAXParser();
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- XMLReader reader = null;
- try {
- reader = sp.getXMLReader();
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- reader.setContentHandler((org.xml.sax.ContentHandler) _handler);
- try {
- reader.parse(new InputSource(is));
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- is.close();
- sp.reset();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
- }
-
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-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;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.GestureDetector.OnGestureListener;
-import android.widget.Button;
-
-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;
- private static final int SWIPE_MAX_OFF_PATH = 250;
- private static final int SWIPE_THRESHOLD_VELOCITY = 200;
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- 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) {
- PostCommand("previousMenu");
- }
- });
-
- Button menu = (Button) findViewById(R.id.btnMenu);
- menu.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("contextMenu");
- }
- });
-
- Button home = (Button) findViewById(R.id.btnHome);
- home.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("parentDir");
- }
- });
-
- Button info = (Button) findViewById(R.id.btnInfo);
- info.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("showInfo");
- }
- });
-
- Button left = (Button) findViewById(R.id.btnLeft);
- left.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("moveLeft");
- }
- });
-
- Button right = (Button) findViewById(R.id.btnRight);
- right.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("moveRight");
- }
- });
-
- Button up = (Button) findViewById(R.id.btnUp);
- up.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("moveUp");
- }
- });
-
- Button down = (Button) findViewById(R.id.btnDown);
- down.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("moveDown");
- }
- });
-
- Button ok = (Button) findViewById(R.id.btnOk);
- ok.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("selectItem");
- }
- });
-
- Button play = (Button) findViewById(R.id.btnPlay);
- play.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("play");
- }
- });
-
- Button pause = (Button) findViewById(R.id.btnPause);
- pause.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("pause");
- }
- });
-
- Button stop = (Button) findViewById(R.id.btnStop);
- stop.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("stop");
- }
- });
-
- Button skipForw = (Button) findViewById(R.id.btnSkipForw);
- skipForw.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("nextItem");
- }
- });
-
- Button skipBack = (Button) findViewById(R.id.btnSkipBack);
- skipBack.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("prevItem");
- }
- });
-
- Button fForw = (Button) findViewById(R.id.btnFForw);
- fForw.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("forward");
- }
- });
-
- Button fBackw = (Button) findViewById(R.id.btnFBack);
- fBackw.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("rewind");
- }
- });
- }
-
- public void PostCommand(String button) {
-
- postwebserver post = new postwebserver(HttpServer, HttpPort);
-
- AssetManager assetManager = getAssets();
- String xml = "";
-
- try {
- InputStream inputStream = null;
- inputStream = assetManager.open("cmd_" + button + ".xml");
-
- int x = inputStream.read();
-
- while (x != -1) {
- xml = xml + (char) x;
- x = inputStream.read();
- }
- post.Post(xml);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent me) {
- return gestureScanner.onTouchEvent(me);
- }
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
- float velocityY) {
- try {
- if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
- return false;
- // right to left swipe
- if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
- && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, remote_02.class);
- startActivityForResult(myIntent, 0);
-
- } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
- && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-
- }
- } catch (Exception e) {
- // nothing
- }
- return false;
- }
-
- public boolean onDown(MotionEvent arg0) {
- return true;
- }
- public void onLongPress(MotionEvent arg0) {
- }
- public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
- float arg3) {
- return false;
- }
- public void onShowPress(MotionEvent arg0) {
- }
- public boolean onSingleTapUp(MotionEvent arg0) {
- return false;
- }
-}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.io.IOException;
-import java.io.InputStream;
-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;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.GestureDetector.OnGestureListener;
-import android.widget.Button;
-
-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;
- private static final int SWIPE_MAX_OFF_PATH = 250;
- private static final int SWIPE_THRESHOLD_VELOCITY = 200;
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.remote02);
-
- 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) {
- PostCommand("volumeUp");
- }
- });
- Button btnVolumeDown = (Button) findViewById(R.id.btnVolumeDown);
- btnVolumeDown.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("volumeDown");
- }
- });
- Button btnVolumeMute = (Button) findViewById(R.id.btnVolumeMute);
- btnVolumeMute.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("volumeMute");
- }
- });
-
- Button btnChannelUp = (Button) findViewById(R.id.btnChannelUp);
- btnChannelUp.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("nextChannel");
- }
- });
- Button btnChannelDown = (Button) findViewById(R.id.btnChannelDown);
- btnChannelDown.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("prevChannel");
- }
- });
-
- Button btnExit = (Button) findViewById(R.id.btnExit);
- btnExit.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("exit");
- }
- });
- Button btnSuspend = (Button) findViewById(R.id.btnSuspend);
- btnSuspend.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("suspend");
- }
- });
- Button btnHibernate = (Button) findViewById(R.id.btnHibernate);
- btnHibernate.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("hibernate");
- }
- });
- Button btnRestart = (Button) findViewById(R.id.btnRestart);
- btnRestart.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("restart");
- }
- });
- Button btnShutOff = (Button) findViewById(R.id.btnShutOff);
- btnShutOff.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("shutoff");
- }
- });
-
- Button btnWakeOnLan = (Button) findViewById(R.id.btnWakeOnLan);
- btnWakeOnLan.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- PostCommand("wakeonlan");
- }
- });
- }
-
-
- public void PostCommand(String button) {
-
- postwebserver post = new postwebserver(HttpServer, HttpPort);
-
- AssetManager assetManager = getAssets();
- String xml = "";
-
- try {
- InputStream inputStream = null;
- inputStream = assetManager.open("cmd_" + button + ".xml");
-
- int x = inputStream.read();
-
- while (x != -1) {
- xml = xml + (char) x;
- x = inputStream.read();
- }
- post.Post(xml);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent me) {
- return gestureScanner.onTouchEvent(me);
- }
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
- float velocityY) {
- try {
- if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
- return false;
- // right to left swipe
- if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
- && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-
-
- } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
- && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, remote_01.class);
- startActivityForResult(myIntent, 0);
- }
- } catch (Exception e) {
- // nothing
- }
- return false;
- }
-
- public boolean onDown(MotionEvent arg0) {
- return true;
- }
- public void onLongPress(MotionEvent arg0) {
- }
- public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
- float arg3) {
- return false;
- }
- public void onShowPress(MotionEvent arg0) {
- }
- public boolean onSingleTapUp(MotionEvent arg0) {
- return false;
- }
-}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-public class Settings{
-
- public static String Server = "192.168.0.30";
- public static String Port = "8200";
- public static String MacId = "11-22-33-44-55-66";
-
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,116 +0,0 @@
-package mediaportal.remote;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.http.util.ByteArrayBuffer;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Environment;
-
-public class httphandler {
-
- String extStorageDirectory;
-
- public httphandler() {
-
- }
-
- public InputStream openHttpConnection(String urlStr) {
- InputStream in = null;
- int resCode = -1;
-
- try {
- URL url = new URL(urlStr);
- URLConnection urlConn = url.openConnection();
-
- if (!(urlConn instanceof HttpURLConnection)) {
- throw new IOException("URL is not an Http URL");
- }
-
- HttpURLConnection httpConn = (HttpURLConnection) urlConn;
- httpConn.setAllowUserInteraction(false);
- httpConn.setInstanceFollowRedirects(true);
- httpConn.setRequestMethod("GET");
- httpConn.connect();
- resCode = httpConn.getResponseCode();
-
- if (resCode == HttpURLConnection.HTTP_OK) {
- in = httpConn.getInputStream();
- }
-
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return in;
- }
-
- public Bitmap DownloadImage(String urlStr) {
-
- final String url = urlStr;
- Bitmap bitmap = null;
-
- InputStream in = null;
-
- try {
- in = openHttpConnection(url);
- bitmap = BitmapFactory.decodeStream(in);
- if (in != null)
- in.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
-
- return bitmap;
- }
-
- public void DownloadFile() {
- extStorageDirectory = Environment.getExternalStorageDirectory()
- .toString();
-
- try {
- InputStream in = openHttpConnection("http://"+ Settings.Server + ":" + Settings.Port +
- "/music/Clementi_Sonatina_Op.36_No.1_Movement_1.mp3");
-
- // BufferedInputStream bis = new BufferedInputStream(in);
- ByteArrayBuffer baf = new ByteArrayBuffer(50);
- //int current = 0;
-
- byte[] bb = new byte[1024];
- int l = in.read(bb, 0, 1024);
-
- while (l > -0) {
- baf.append(bb, 0, l);
- l = in.read(bb, 0, 1024);
- }
-
- OutputStream outStream = null;
- File file = new File(extStorageDirectory, "test.mp3");
-
- outStream = new FileOutputStream(file);
- outStream.write(baf.toByteArray());
- outStream.flush();
- outStream.close();
-
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.io.IOException;
-
-import mediaportal.remote.R;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.media.MediaPlayer;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.*;
-
-public class main extends Activity {
-
- private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
- MODE_PRIVATE);
-
- Settings.Server = settings.getString("Server", "192.168.0.30");
- Settings.Port = settings.getString("Port", "8200");
- Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
-
- Toast.makeText(getBaseContext(), "Press 'menu' for settings",
- Toast.LENGTH_LONG).show();
-
- Button btnPictures = (Button) findViewById(R.id.MainButton1);
- btnPictures.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), pictures.class);
- startActivityForResult(myIntent, 0);
- }
- });
-
- Button btnMusic = (Button) findViewById(R.id.MainButton2);
- btnMusic.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), musictab.class);
- startActivityForResult(myIntent, 0);
- }
- });
-
- Button btnVideo = (Button) findViewById(R.id.MainButton3);
- btnVideo.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- MediaPlayer mp = new MediaPlayer();
- try {
- String p = "http://"
- + Settings.Server
- + ":"
- + Settings.Port
- + "/music/"
- + "laserkraft_3d_-_nein_mann.mp3";
- mp.setDataSource(p);
- mp.prepare();
- mp.start();
- } catch (IllegalStateException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
- });
-
- Button btnRemote = (Button) findViewById(R.id.MainButton4);
- btnRemote.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), remote_01.class);
- startActivityForResult(myIntent, 0);
- }
- });
-
- Button btnNowPlaying = (Button) findViewById(R.id.MainButton5);
- btnNowPlaying.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(),
- nowplaying.class);
- startActivityForResult(myIntent, 0);
- }
- });
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- menu.add(0, 111, 0, "Settings");
- menu.add(0, 112, 0, "Exit");
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case 111:
- Intent myIntent = new Intent(this, setup.class);
- startActivityForResult(myIntent, 0);
- return true;
- case 112:
- this.finish();
- return true;
- }
- return true;
- }
-}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.util.ArrayList;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class musicalbum extends Activity {
-
- private Handler mHandler = new Handler();
-
- private static ArrayList<receivedbxmlhandler.DbItems> albumList;
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_album);
-
- ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.setAdapter(new EfficientAdapter(musicalbum.this));
-
- ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
- l1.setDivider(divcolor);
- l1.setDividerHeight(2);
-
- l1.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
- public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
- int arg2, long arg3) {
- // TODO Auto-generated method stub
- return false;
- }
- });
- }
-
- @Override
- public void onStart() {
- super.onStart();
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
- }
-
- private Runnable mUpdateTimeTask = new Runnable() {
- public void run() {
- update();
- }
- };
-
- private void update() {
-
- Log.d("update album", "do update");
-
- receivedbhandler handler = receivedbhandler.getinstance();
- albumList = handler.GetAlbums();
-
- if (albumList.size() == 0) {
- Toast.makeText(musicalbum.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
- }
-
- ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.invalidateViews();
- }
-
- private static class EfficientAdapter extends BaseAdapter {
-
- private LayoutInflater mInflater;
-
- public EfficientAdapter(Context context) {
- mInflater = LayoutInflater.from(context);
- }
-
- public int getCount() {
- if (albumList != null)
- return albumList.size();
- else
- return 0;
- }
-
- public Object getItem(int position) {
- return position;
- }
-
- public long getItemId(int position) {
- return position;
- }
-
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder holder;
-
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.list_item, null);
- holder = new ViewHolder();
- holder.text = (TextView) convertView
- .findViewById(R.id.TextView01);
- holder.text2 = (TextView) convertView
- .findViewById(R.id.TextView02);
-
- convertView.setTag(holder);
- } else {
- holder = (ViewHolder) convertView.getTag();
- }
-
- receivedbxmlhandler.DbItems item = albumList.get(position);
-
- holder.text.setText(String.valueOf(position + 1));
- holder.text2.setText(item.Album + " - " + item.Artist);
-
- convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
- : Color.LTGRAY);
-
- return convertView;
- }
-
- static class ViewHolder {
- TextView text;
- TextView text2;
- }
- }
-
-}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 12:45:19 UTC (rev 4010)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 12:47:28 UTC (rev 4011)
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-package mediaportal.remote;
-
-import java.util.ArrayList;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class musicartist extends Activity{
-
- public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
- private Handler mHandler = new Handler();
-
- private static ArrayList<receivedbxmlhandler.DbItems> artistList;
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_artist);
-
- ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.setAdapter(new EfficientAdapter(musicartist.this));
-
- l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
- {
- //@override
- public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
- long arg3) {
-
- receivedbxmlhandler.DbItems item = artistList.get(arg2);
- musicresults.Select = item.Artist;
- Intent myIntent = new Intent(arg1.getContext(), musicresults.class);
- startActivityForResult(myIntent, 0);
- }
- }
- );
-
- ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
- l1.setDivider(divcolor);
- l1.setDividerHeight(2);
- }
-
- @Override
- public void onStart() {
- super.onStart();
-
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
- }
- private Runnable mUpdateTimeTask = new Runnable() {
- public void run() {
- update();
- }
- };
-
- private void update() {
-
- Log.d("update artist", "do update");
-
- receivedbhandler handler = receivedbhandler .getinstance();
- artistList = handler.GetArtist();
-
- if (artistList.size() == 0) {
- Toast.makeText(musicartist.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
- }
-
- ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.invalidateViews();
- }
-
- private static class Efficie...
[truncated message content] |
|
From: <rol...@us...> - 2010-12-06 12:45:26
|
Revision: 4010
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4010&view=rev
Author: rollsroyc3
Date: 2010-12-06 12:45:19 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
updated filenames and references to lowercase, few small fixes in pictures
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.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/httpHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-06 12:45:19 UTC (rev 4010)
@@ -3,31 +3,31 @@
package="mediaportal.remote" android:versionCode="1"
android:versionName="1.0">
<application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar" android:debuggable="true">
- <activity android:name=".Splash" android:label="@string/app_name" android:launchMode="singleInstance">
+ <activity android:name=".splash" android:label="@string/app_name" android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:label="@string/app_name" android:name=".Main" android:launchMode="singleInstance">
+ <activity android:label="@string/app_name" android:name=".main" android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.DEFAULT" />
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
- <activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
- <activity android:name=".Pictures" android:launchMode="singleInstance"></activity>
- <activity android:name=".Picturesfullscreen" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicDir" android:launchMode="singleInstance"></activity>
- <activity android:name=".Setup" android:launchMode="singleInstance"></activity>
+ <activity android:name=".remote_01" android:launchMode="singleInstance"></activity>
+ <activity android:name=".remote_02" android:launchMode="singleInstance"></activity>
+ <activity android:name=".pictures" android:launchMode="singleInstance"></activity>
+ <activity android:name=".picturesfullscreen" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicdir" android:launchMode="singleInstance"></activity>
+ <activity android:name=".setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaylist" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicArtist" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicAlbum" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicSong" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicTab" android:launchMode="singleInstance"></activity>
- <activity android:name=".MusicResults" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicartist" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicalbum" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicsong" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musictab" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicresults" android:launchMode="singleInstance"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -4,16 +4,16 @@
import android.media.MediaPlayer;
-public class MediaPlayerControl {
+public class mediaplayercontrol {
- private static MediaPlayerControl instance;
+ private static mediaplayercontrol instance;
private static MediaPlayer mp;
- public static MediaPlayerControl getinstance() {
+ public static mediaplayercontrol getinstance() {
if (mp == null)
mp = new MediaPlayer();
if (instance == null)
- instance = new MediaPlayerControl();
+ instance = new mediaplayercontrol();
return instance;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import mediaportal.remote.R;
-import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
+import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -40,11 +40,11 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
-public class MusicDir extends Activity {
+public class musicdir extends Activity {
private Handler mHandler = new Handler();
private String actualDir = "";
- private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> musicList;
+ private static ArrayList<receivedirectoryxmlhandler.DirItems> musicList;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -55,7 +55,7 @@
mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(MusicDir.this));
+ gridview.setAdapter(new ImageAdapter2(musicdir.this));
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
@@ -116,11 +116,11 @@
Log.d("update music dir", "do update folder : " + actualDir);
- ReceiveDirHandler h = ReceiveDirHandler.getinstance();
+ receivedirhandler h = receivedirhandler.getinstance();
musicList = h.getMusicDir(actualDir);
if (musicList.size() == 0) {
- Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ Toast.makeText(musicdir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
} else {
GridView gridview = (GridView) findViewById(R.id.music_grid);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -32,12 +32,12 @@
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
-public class PostWebserver {
+public class postwebserver {
public String httpServer = "";
public String httpPort = "";
- public PostWebserver(String Server, String Port) {
+ public postwebserver(String Server, String Port) {
httpServer = Server;
httpPort = Port;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -24,17 +24,17 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
-import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
+import mediaportal.remote.receivedbxmlhandler.DbItems;
-public class ReceiveDbHandler {
+public class receivedbhandler {
- private static ReceiveDbHandler instance;
+ private static receivedbhandler instance;
public int selectedMusic;
- public static ReceiveDbHandler getinstance() {
+ public static receivedbhandler getinstance() {
if (instance == null)
- instance = new ReceiveDbHandler();
+ instance = new receivedbhandler();
return instance;
}
@@ -56,8 +56,8 @@
private ArrayList<DbItems> fetchData(String Data) {
- ReceiveDbXmlHandler handler = new ReceiveDbXmlHandler();
- ReceiveHandler hand = new ReceiveHandler(handler);
+ receivedbxmlhandler handler = new receivedbxmlhandler();
+ receivehandler hand = new receivehandler(handler);
try {
Data = URLEncoder.encode(Data, "UTF-8");
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -27,7 +27,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class ReceiveDbXmlHandler extends DefaultHandler {
+public class receivedbxmlhandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -22,16 +22,16 @@
package mediaportal.remote;
import java.util.ArrayList;
-import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
+import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
-public class ReceiveDirHandler {
+public class receivedirhandler {
- private static ReceiveDirHandler instance;
+ private static receivedirhandler instance;
private static String actualDir;
- public static ReceiveDirHandler getinstance() {
+ public static receivedirhandler getinstance() {
if (instance == null)
- instance = new ReceiveDirHandler();
+ instance = new receivedirhandler();
return instance;
}
@@ -60,8 +60,8 @@
private ArrayList<DirItems> fetchData(String Data) {
- ReceiveDirectoryXmlHandler handler = new ReceiveDirectoryXmlHandler();
- ReceiveHandler hand = new ReceiveHandler(handler);
+ receivedirectoryxmlhandler handler = new receivedirectoryxmlhandler();
+ receivehandler hand = new receivehandler(handler);
hand.readValues(Data);
return handler.DirList;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -28,7 +28,7 @@
import android.graphics.Bitmap;
-public class ReceiveDirectoryXmlHandler extends DefaultHandler {
+public class receivedirectoryxmlhandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -34,11 +34,11 @@
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-public class ReceiveHandler {
+public class receivehandler {
private org.xml.sax.ContentHandler _handler;
- public ReceiveHandler(org.xml.sax.ContentHandler Handler) {
+ public receivehandler(org.xml.sax.ContentHandler Handler) {
_handler = Handler;
}
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-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -37,7 +37,7 @@
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
-public class Remote_01 extends Activity implements OnGestureListener {
+public class remote_01 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private String HttpServer = "";
@@ -177,7 +177,7 @@
public void PostCommand(String button) {
- PostWebserver post = new PostWebserver(HttpServer, HttpPort);
+ postwebserver post = new postwebserver(HttpServer, HttpPort);
AssetManager assetManager = getAssets();
String xml = "";
@@ -210,7 +210,7 @@
// right to left swipe
if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, Remote_02.class);
+ Intent myIntent = new Intent(this, remote_02.class);
startActivityForResult(myIntent, 0);
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
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-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -35,7 +35,7 @@
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
-public class Remote_02 extends Activity implements OnGestureListener {
+public class remote_02 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private String HttpServer = "";
@@ -134,7 +134,7 @@
public void PostCommand(String button) {
- PostWebserver post = new PostWebserver(HttpServer, HttpPort);
+ postwebserver post = new postwebserver(HttpServer, HttpPort);
AssetManager assetManager = getAssets();
String xml = "";
@@ -171,7 +171,7 @@
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, Remote_01.class);
+ Intent myIntent = new Intent(this, remote_01.class);
startActivityForResult(myIntent, 0);
}
} catch (Exception e) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -17,11 +17,11 @@
import android.graphics.BitmapFactory;
import android.os.Environment;
-public class httpHandler {
+public class httphandler {
String extStorageDirectory;
- public httpHandler() {
+ public httphandler() {
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -34,7 +34,7 @@
import android.view.View;
import android.widget.*;
-public class Main extends Activity {
+public class main extends Activity {
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
@@ -56,7 +56,7 @@
Button btnPictures = (Button) findViewById(R.id.MainButton1);
btnPictures.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), Pictures.class);
+ Intent myIntent = new Intent(view.getContext(), pictures.class);
startActivityForResult(myIntent, 0);
}
});
@@ -64,7 +64,7 @@
Button btnMusic = (Button) findViewById(R.id.MainButton2);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), MusicTab.class);
+ Intent myIntent = new Intent(view.getContext(), musictab.class);
startActivityForResult(myIntent, 0);
}
});
@@ -97,7 +97,7 @@
Button btnRemote = (Button) findViewById(R.id.MainButton4);
btnRemote.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), Remote_01.class);
+ Intent myIntent = new Intent(view.getContext(), remote_01.class);
startActivityForResult(myIntent, 0);
}
});
@@ -123,7 +123,7 @@
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case 111:
- Intent myIntent = new Intent(this, Setup.class);
+ Intent myIntent = new Intent(this, setup.class);
startActivityForResult(myIntent, 0);
return true;
case 112:
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -39,18 +39,18 @@
import android.widget.TextView;
import android.widget.Toast;
-public class MusicAlbum extends Activity {
+public class musicalbum extends Activity {
private Handler mHandler = new Handler();
- private static ArrayList<ReceiveDbXmlHandler.DbItems> albumList;
+ private static ArrayList<receivedbxmlhandler.DbItems> albumList;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_album);
ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.setAdapter(new EfficientAdapter(MusicAlbum.this));
+ l1.setAdapter(new EfficientAdapter(musicalbum.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -83,11 +83,11 @@
Log.d("update album", "do update");
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ receivedbhandler handler = receivedbhandler.getinstance();
albumList = handler.GetAlbums();
if (albumList.size() == 0) {
- Toast.makeText(MusicAlbum.this, "TIME OUT SERVER",
+ Toast.makeText(musicalbum.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -134,7 +134,7 @@
holder = (ViewHolder) convertView.getTag();
}
- ReceiveDbXmlHandler.DbItems item = albumList.get(position);
+ receivedbxmlhandler.DbItems item = albumList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Album + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -39,19 +39,19 @@
import android.widget.TextView;
import android.widget.Toast;
-public class MusicArtist extends Activity{
+public class musicartist extends Activity{
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
- private static ArrayList<ReceiveDbXmlHandler.DbItems> artistList;
+ private static ArrayList<receivedbxmlhandler.DbItems> artistList;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_artist);
ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.setAdapter(new EfficientAdapter(MusicArtist.this));
+ l1.setAdapter(new EfficientAdapter(musicartist.this));
l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
{
@@ -59,9 +59,9 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- ReceiveDbXmlHandler.DbItems item = artistList.get(arg2);
- MusicResults.Select = item.Artist;
- Intent myIntent = new Intent(arg1.getContext(), MusicResults.class);
+ receivedbxmlhandler.DbItems item = artistList.get(arg2);
+ musicresults.Select = item.Artist;
+ Intent myIntent = new Intent(arg1.getContext(), musicresults.class);
startActivityForResult(myIntent, 0);
}
}
@@ -89,11 +89,11 @@
Log.d("update artist", "do update");
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ receivedbhandler handler = receivedbhandler .getinstance();
artistList = handler.GetArtist();
if (artistList.size() == 0) {
- Toast.makeText(MusicArtist.this, "TIME OUT SERVER",
+ Toast.makeText(musicartist.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -138,7 +138,7 @@
holder = (ViewHolder) convertView.getTag();
}
- ReceiveDbXmlHandler.DbItems item = artistList.get(position);
+ receivedbxmlhandler.DbItems item = artistList.get(position);
holder.text.setText(String.valueOf(position +1));
holder.text2.setText(item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -40,12 +40,12 @@
import android.widget.TextView;
import android.widget.Toast;
-public class MusicResults extends Activity {
+public class musicresults extends Activity {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
- private static ArrayList<ReceiveDbXmlHandler.DbItems> itemList;
+ private static ArrayList<receivedbxmlhandler.DbItems> itemList;
public static String Select = "";
@@ -54,7 +54,7 @@
setContentView(R.layout.music_results);
ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.setAdapter(new EfficientAdapter(MusicResults.this));
+ l1.setAdapter(new EfficientAdapter(musicresults.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -80,9 +80,9 @@
if (x == -1)
x = 0;
if (itemList.size() > 0) {
- ReceiveDbXmlHandler.DbItems itm = itemList.get(x);
+ receivedbxmlhandler.DbItems itm = itemList.get(x);
- httpHandler http = new httpHandler();
+ httphandler http = new httphandler();
http.DownloadFile();
}
x = 1;
@@ -112,11 +112,11 @@
Log.d("update search", "do update");
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ receivedbhandler handler = receivedbhandler.getinstance();
itemList = handler.GetSongsByArtist(Select);
if (itemList.size() == 0) {
- Toast.makeText(MusicResults.this, "TIME OUT SERVER",
+ Toast.makeText(musicresults.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -163,7 +163,7 @@
holder = (ViewHolder) convertView.getTag();
}
- ReceiveDbXmlHandler.DbItems item = itemList.get(position);
+ receivedbxmlhandler.DbItems item = itemList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -39,11 +39,11 @@
import android.widget.TextView;
import android.widget.Toast;
-public class MusicSong extends Activity {
+public class musicsong extends Activity {
private Handler mHandler = new Handler();
- private static ArrayList<ReceiveDbXmlHandler.DbItems> songList;
+ private static ArrayList<receivedbxmlhandler.DbItems> songList;
public static String Select = "";
@@ -52,7 +52,7 @@
setContentView(R.layout.music_song);
ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.setAdapter(new EfficientAdapter(MusicSong.this));
+ l1.setAdapter(new EfficientAdapter(musicsong.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -63,7 +63,7 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- MediaPlayerControl mp = MediaPlayerControl.getinstance();
+ mediaplayercontrol mp = mediaplayercontrol.getinstance();
mp.Play("http://" + Settings.Server + ":" + Settings.Port + "/music/" + "song-marianne-plays-on-piano-sense-and-sensibilit.mp3");
}
});
@@ -87,11 +87,11 @@
Log.d("update song", "do update");
- ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
+ receivedbhandler handler = receivedbhandler.getinstance();
songList = handler.GetSongs();
if (songList.size() == 0) {
- Toast.makeText(MusicSong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
+ Toast.makeText(musicsong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
.show();
}
@@ -138,7 +138,7 @@
holder = (ViewHolder) convertView.getTag();
}
- ReceiveDbXmlHandler.DbItems item = songList.get(position);
+ receivedbxmlhandler.DbItems item = songList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -27,7 +27,7 @@
import android.os.Bundle;
import android.widget.TabHost;
-public class MusicTab extends TabActivity {
+public class musictab extends TabActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.musictab);
@@ -38,7 +38,7 @@
Intent intent; // Reusable Intent for each tab
// Create an Intent to launch an Activity for the tab (to be reused)
- intent = new Intent().setClass(this, MusicArtist.class);
+ intent = new Intent().setClass(this, musicartist.class);
// Initialize a TabSpec for each tab and add it to the TabHost
spec = tabHost.newTabSpec("artists")
.setIndicator("Artists", res.getDrawable(R.drawable.ic_tab1))
@@ -46,19 +46,19 @@
tabHost.addTab(spec);
// Do the same for the other tabs
- intent = new Intent().setClass(this, MusicAlbum.class);
+ intent = new Intent().setClass(this, musicalbum.class);
spec = tabHost.newTabSpec("albums")
.setIndicator("Albums", res.getDrawable(R.drawable.ic_tab2))
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, MusicSong.class);
+ intent = new Intent().setClass(this, musicsong.class);
spec = tabHost.newTabSpec("songs")
.setIndicator("Songs", res.getDrawable(R.drawable.ic_tab3))
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, MusicDir.class);
+ intent = new Intent().setClass(this, musicdir.class);
spec = tabHost.newTabSpec("music")
.setIndicator("Music", res.getDrawable(R.drawable.ic_tab4))
.setContent(intent);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -149,7 +149,7 @@
if (nowplayinghandler.Cover.equals("True")) {
if (!lastTitle.equals(nowplayinghandler.Title)) {
- httpHandler h = new httpHandler();
+ httphandler h = new httphandler();
Bitmap bitmap = h.DownloadImage("http://" + HttpServer + ":"
+ HttpPort + "/nowplaying/cover");
if (bitmap != null) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -4,7 +4,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class nowplayingXmlHandler extends DefaultHandler {
+public class nowplayingxmlhandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -93,7 +93,7 @@
e.printStackTrace();
}
- nowplayingXmlHandler handler = new nowplayingXmlHandler();
+ nowplayingxmlhandler handler = new nowplayingxmlhandler();
reader.setContentHandler(handler);
try {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -4,7 +4,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class nowplaylistXmlHandler extends DefaultHandler {
+public class nowplaylistxmlhandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
nowplaylisthandler.PlayListItem item = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -95,7 +95,7 @@
e.printStackTrace();
}
- nowplaylistXmlHandler handler = new nowplaylistXmlHandler();
+ nowplaylistxmlhandler handler = new nowplaylistxmlhandler();
reader.setContentHandler(handler);
try {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -23,8 +23,9 @@
import java.util.ArrayList;
import mediaportal.remote.R;
-import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
+import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -41,12 +42,12 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
-public class Pictures extends Activity {
+public class pictures extends Activity {
private Handler mHandler = new Handler();
public static String actualDir = "";
- public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
+ public static ArrayList<receivedirectoryxmlhandler.DirItems> pictureList;
public static int selectedPicture;
@Override
@@ -69,13 +70,13 @@
if (pic.typ == "item") {
selectedPicture = position - 1;
- Intent myIntent = new Intent(Pictures.this,
- Picturesfullscreen.class);
+ Intent myIntent = new Intent(pictures.this,
+ picturesfullscreen.class);
startActivityForResult(myIntent, 0);
}
if (pic.typ == "folder") {
- actualDir += pic.title + "/";
+ actualDir += pic.title.replaceAll(" ", "%20") + "/";
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 0);
@@ -116,18 +117,26 @@
private void update() {
+ ProgressDialog dialog = new ProgressDialog(this);
+ dialog.setCancelable(true);
+ dialog.setMessage("Loading...");
+ dialog.show();
+
+
Log.d("update pictures", "do update folder : " + actualDir);
- ReceiveDirHandler h = ReceiveDirHandler.getinstance();
+ receivedirhandler h = receivedirhandler.getinstance();
pictureList = h.getPictureDir(actualDir);
if (pictureList.size() == 0) {
- Toast.makeText(Pictures.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ Toast.makeText(pictures.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
} else {
GridView gridview = (GridView) findViewById(R.id.GridView01);
gridview.setAdapter(new ImageAdapter2(this));
}
+
+ dialog.cancel();
}
public class ImageAdapter2 extends BaseAdapter {
@@ -189,12 +198,12 @@
iv.setTag(pic);
} else {
- httpHandler http = new httpHandler();
+ httphandler http = new httphandler();
String file = "http://" + Settings.Server + ":"
+ Settings.Port + "/pictures/";
file += actualDir + item.File + ".thb";
- item.Picture = http.DownloadImage(file);
+ item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
iv.setImageBitmap(item.Picture);
if (item.Picture == null)
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -22,7 +22,7 @@
package mediaportal.remote;
import mediaportal.remote.R;
-import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
+import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -33,6 +33,8 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.GestureDetector.OnGestureListener;
import android.view.MotionEvent;
@@ -40,7 +42,7 @@
import android.widget.TextView;
import android.widget.Toast;
-public class Picturesfullscreen extends Activity implements OnGestureListener {
+public class picturesfullscreen extends Activity implements OnGestureListener {
private static final int SWIPE_MIN_DISTANCE = 120;
private static final int SWIPE_MAX_OFF_PATH = 250;
@@ -56,12 +58,19 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ getWindow().setFlags
+ (WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ setContentView(R.layout.picturesfullscreen);
+
setContentView(R.layout.picturesfullscreen);
gestureScanner = new GestureDetector(this);
setPicture();
- Toast.makeText(Picturesfullscreen.this, "left/right swipe possible",
+ Toast.makeText(picturesfullscreen .this, "left/right swipe possible",
Toast.LENGTH_SHORT).show();
// ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
@@ -70,17 +79,19 @@
private void setPicture() {
ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
- DirItems item = Pictures.pictureList.get(Pictures.selectedPicture);
-
- httpHandler http = new httpHandler();
- String file = "http://" + Settings.Server + ":" + Settings.Port
- + "/pictures/";
- file += Pictures.actualDir + item.File;
- item.Picture = http.DownloadImage(file);
- imagev.setImageBitmap(item.Picture);
-
- TextView txt = (TextView) findViewById(R.id.full_text);
- txt.setText(item.File);
+ DirItems item = pictures.pictureList.get(pictures.selectedPicture);
+ if (!item.isFolder)
+ {
+ httphandler http = new httphandler();
+ String file = "http://" + Settings.Server + ":" + Settings.Port
+ + "/pictures/";
+ file += pictures.actualDir + item.File;
+ item.Picture = http.DownloadImage(file.replaceAll(" ", "%20"));
+ imagev.setImageBitmap(item.Picture);
+
+ TextView txt = (TextView) findViewById(R.id.full_text);
+ txt.setText(item.File);
+ }
}
@Override
@@ -124,18 +135,18 @@
if (slideShow) {
if(!randomShow)
{
- int max = Pictures.pictureList.size();
+ int max = pictures.pictureList.size();
- if (Pictures.selectedPicture < max - 1)
- Pictures.selectedPicture++;
+ if (pictures.selectedPicture < max - 1)
+ pictures.selectedPicture++;
else
- Pictures.selectedPicture = 0;
+ pictures.selectedPicture = 0;
setPicture();
}
else
{
String req = "http://" + Settings.Server + ":" + Settings.Port +"/random/pictures/random.jpg";
- httpHandler handler = new httpHandler();
+ httphandler handler = new httphandler();
Bitmap pic = handler.DownloadImage(req);
@@ -163,7 +174,7 @@
float velocityY) {
try {
- int max = Pictures.pictureList.size();
+ int max = pictures.pictureList.size();
if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
return false;
@@ -171,21 +182,21 @@
if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- if (Pictures.selectedPicture < max - 1) {
- Pictures.selectedPicture++;
+ if (pictures.selectedPicture < max - 1) {
+ pictures.selectedPicture++;
setPicture();
} else
- Toast.makeText(Picturesfullscreen.this, "reached end +",
+ Toast.makeText(picturesfullscreen.this, "reached end +",
Toast.LENGTH_SHORT).show();
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- if (Pictures.selectedPicture > 0) {
- Pictures.selectedPicture--;
+ if (pictures.selectedPicture > 0) {
+ pictures.selectedPicture--;
setPicture();
- }
- Toast.makeText(Picturesfullscreen.this, "reached end -",
+ } else
+ Toast.makeText(picturesfullscreen.this, "reached end -",
Toast.LENGTH_SHORT).show();
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -27,7 +27,7 @@
import android.os.Bundle;
import android.widget.EditText;
-public class Setup extends Activity {
+public class setup extends Activity {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java 2010-12-05 21:44:07 UTC (rev 4009)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java 2010-12-06 12:45:19 UTC (rev 4010)
@@ -27,7 +27,7 @@
import android.os.Bundle;
import android.os.Handler;
-public class Splash extends Activity {
+public class splash extends Activity {
private final int SPLASH_DISPLAY_LENGHT = 1500;
@@ -41,9 +41,9 @@
// @Override
public void run() {
/* Create an Intent that will start the main-Activity. */
- Intent mainIntent = new Intent(Splash.this, Main.class);
- Splash.this.startActivity(mainIntent);
- Splash.this.finish();
+ Intent mainIntent = new Intent(splash.this, main.class);
+ splash.this.startActivity(mainIntent);
+ splash.this.finish();
}
}, SPLASH_DISPLAY_LENGHT);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-05 21:44:14
|
Revision: 4009
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4009&view=rev
Author: kroko_koenig
Date: 2010-12-05 21:44:07 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
change to use shares of the mp for picture dirs
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-05 19:33:12 UTC (rev 4008)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-05 21:44:07 UTC (rev 4009)
@@ -37,6 +37,7 @@
using MediaPortal.GUI.Library;
using MediaPortal.Utils;
+using MediaPortal.Util;
using MediaPortal.Database;
using MediaPortal.Configuration;
@@ -57,6 +58,8 @@
private static string[] listAllPictures = null;
private SQLiteClient sqlClient;
+ private VirtualDirectory virtualDirectory = new VirtualDirectory();
+ private Dictionary<string, string> dirList = new Dictionary<string, string>();
public Request(Socket Socket)
{
@@ -125,13 +128,13 @@
else if (req.StartsWith("/pictures"))
{
// handle pictures
- req = req.Replace("/pictures", "");
+ req = req.Substring(9);
if (req.StartsWith("/")) req = req.Substring(1);
if (req == "")
{
// root
- ReplyPictureDir(AndroidServer.PicturePath, "root");
+ ReplyPictureDir("");
}
else
{
@@ -139,17 +142,15 @@
if (req.EndsWith(".jpg"))
{
- string orgPath = AndroidServer.PicturePath + "\\" + req;
- ReplyPictureFile(orgPath);
+ ReplyPictureFile(req);
}
else if (req.EndsWith(".thb"))
{
- string orgPath = AndroidServer.PicturePath + "\\" + req;
- ReplyPictureThumbFile(orgPath);
+ ReplyPictureThumbFile(req);
}
else
{
- ReplyPictureDir(AndroidServer.PicturePath + "\\" + req, req);
+ ReplyPictureDir(req);
}
}
}
@@ -271,6 +272,16 @@
{
ReplyMusicDbSongs(req);
}
+ if (req.StartsWith("getfile"))
+ {
+ int pos = req.IndexOf("?");
+ if (pos > 0)
+ {
+ string id = req.Substring(pos + 1);
+ id = id.Replace("id=", "");
+ ReplyMusicDbFile(id, msgTyp);
+ }
+ }
}
#endregion
@@ -543,10 +554,15 @@
AndroidServer.logDebug("Reply info server");
}
- private void ReplyPictureDir(string dir, string request)
+ private void ReplyPictureDir(string Request)
{
- if (Directory.Exists(dir))
+ GetPictureShare();
+ string dir = GetLocalDir(Request);
+
+ if (Request == string.Empty)
{
+ #region root shares
+
string msg = string.Empty;
// header
msg += "HTTP/1.0 200 Ok\r\n";
@@ -556,36 +572,73 @@
// content
msg += "<?xml version=\"1.0\"?>\r\n";
msg += "<Directory>\r\n";
+
// folder
- string[] dirs = Directory.GetDirectories(dir, "*.*", SearchOption.TopDirectoryOnly);
- foreach (string f in dirs)
+ foreach (string key in dirList.Keys)
{
- msg += "<Folder>" + HttpUtility.HtmlEncode(Path.GetFileName(f)) + "</Folder>\r\n";
+ msg += "<Folder>" + HttpUtility.HtmlEncode(key) + "</Folder>\r\n";
}
- //files
- string[] files = Directory.GetFiles(dir, "*.jpg", SearchOption.TopDirectoryOnly);
- foreach (string f in files)
- {
- string fName = Path.GetFileName(f);
- if ((fName.ToLower() != "folder.jpg") && (fName.ToLower() != "folder.png"))
- msg += "<File>" + HttpUtility.HtmlEncode(fName) + "</File>\r\n";
- }
+
msg += "</Directory>\r\n";
// send
sendMessage(socket, msg);
- AndroidServer.logDebug("Reply picture dir");
+ AndroidServer.logDebug("Reply picture root dir");
+
+ #endregion
}
else
{
- // dir does not exist
- SendErrorURL(request);
+ #region reply dirs
+
+ if (Directory.Exists(dir))
+ {
+ string msg = string.Empty;
+ // header
+ msg += "HTTP/1.0 200 Ok\r\n";
+ msg += "Content-Type: application/xml; charset=utf-8; filename=info.xml" + "\r\n";
+ msg += "Proxy-Connection: close" + "\r\n";
+ msg += "\r\n";
+ // content
+ msg += "<?xml version=\"1.0\"?>\r\n";
+ msg += "<Directory>\r\n";
+
+ // folder
+ string[] dirs = Directory.GetDirectories(dir, "*.*", SearchOption.TopDirectoryOnly);
+ foreach (string f in dirs)
+ {
+ msg += "<Folder>" + HttpUtility.HtmlEncode(Path.GetFileName(f)) + "</Folder>\r\n";
+ }
+
+ //files
+ string[] files = Directory.GetFiles(dir, "*.jpg", SearchOption.TopDirectoryOnly);
+ foreach (string f in files)
+ {
+ string fName = Path.GetFileName(f);
+ if ((fName.ToLower() != "folder.jpg") && (fName.ToLower() != "folder.png"))
+ msg += "<File>" + HttpUtility.HtmlEncode(fName) + "</File>\r\n";
+ }
+ msg += "</Directory>\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply picture dir");
+ }
+ else
+ {
+ // dir does not exist
+ SendErrorURL(Request);
+ }
+
+ #endregion
}
}
private void ReplyPictureFile(string filePath)
{
- if (File.Exists(filePath))
+ GetPictureShare();
+ string dir = GetLocalDir(filePath);
+
+ if (File.Exists(dir))
{
- Bitmap bit = (Bitmap)Bitmap.FromFile(filePath);
+ Bitmap bit = (Bitmap)Bitmap.FromFile(dir);
byte[] b;
if ((bit.Width > 600) || (bit.Height > 600))
@@ -626,10 +679,14 @@
}
private void ReplyPictureThumbFile(string filePath)
{
- filePath = filePath.Replace("thb", "");
- if (File.Exists(filePath))
+ filePath = filePath.Replace(".thb", "");
+
+ GetPictureShare();
+ string dir = GetLocalDir(filePath);
+
+ if (File.Exists(dir))
{
- Bitmap bit = (Bitmap)Bitmap.FromFile(filePath);
+ Bitmap bit = (Bitmap)Bitmap.FromFile(dir);
byte[] b;
Bitmap thumb = (Bitmap)bit.Clone();
@@ -797,7 +854,7 @@
sqlClient.BusyRetryDelay = 100;
DatabaseUtility.SetPragmas(sqlClient);
- string filePath = GetPathById(ID);
+ string filePath = GetPicturePathById(ID);
if (File.Exists(filePath))
{
@@ -847,7 +904,7 @@
sqlClient.BusyRetryDelay = 100;
DatabaseUtility.SetPragmas(sqlClient);
- string filePath = GetPathById(ID);
+ string filePath = GetPicturePathById(ID);
if (File.Exists(filePath))
{
@@ -1074,6 +1131,7 @@
{
msg += "<Item>\r\n";
+ msg += "<ID>" + HttpUtility.HtmlEncode(song.Id.ToString()) + "</ID>\r\n";
msg += "<Title>" + HttpUtility.HtmlEncode(song.Title) + "</Title>\r\n";
msg += "<Artist>" + HttpUtility.HtmlEncode(song.Artist) + "</Artist>\r\n";
msg += "<Album>" + HttpUtility.HtmlEncode(song.Artist) + "</Album>\r\n";
@@ -1081,7 +1139,6 @@
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";
}
@@ -1092,7 +1149,41 @@
AndroidServer.logDebug("Reply music db artist");
}
+ private void ReplyMusicDbFile(string ID, string Mode)
+ {
+ sqlClient = new SQLiteClient(Config.GetFile(Config.Dir.Database, "MusicDatabaseV11.db3"));
+ sqlClient.BusyRetries = 10;
+ sqlClient.BusyRetryDelay = 100;
+ DatabaseUtility.SetPragmas(sqlClient);
+ string filePath = GetMusicPathById(ID);
+
+ if (File.Exists(filePath))
+ {
+ byte[] b = FileToByteArray(filePath);
+
+ string msg = string.Empty;
+ // header
+ msg += "HTTP/1.0 200 Ok\r\n";
+ msg += "Content-Type: audio/mpeg" + "\r\n";
+ msg += "Content-Length: " + b.Length + "\r\n";
+ msg += "Proxy-Connection: close" + "\r\n";
+ msg += "\r\n";
+ sendMessage(socket, msg);
+
+ if (Mode != "HEAD")
+ {
+ // content
+ sendBytes(socket, b);
+ }
+ AndroidServer.logDebug("Reply music db file");
+ }
+ else
+ {
+ SendErrorFile("ID=" + ID);
+ }
+ }
+
private void ReplyNowPlaying()
{
string title = GUIPropertyManager.GetProperty("#Play.Current.Title");
@@ -1532,7 +1623,7 @@
return Count;
}
}
- public string GetPathById(string ID)
+ public string GetPicturePathById(string ID)
{
{
if (sqlClient == null)
@@ -1555,12 +1646,107 @@
}
catch (Exception ex)
{
- Log.Error("MediaPortal.Picture.Database exception getting Picture by Date err:{0} stack:{1}", ex.Message,
+ Log.Error("MediaPortal.Picture.Database exception getting strFile by ID err:{0} stack:{1}", ex.Message,
ex.StackTrace);
//Open();
}
return string.Empty;
}
}
+ public string GetMusicPathById(string ID)
+ {
+ {
+ if (sqlClient == null)
+ {
+ return string.Empty;
+ }
+ string strSQL = "SELECT strPath FROM tracks WHERE idTrack='" + ID + "'";
+ SQLiteResultSet result;
+ try
+ {
+ result = sqlClient.Execute(strSQL);
+ if (result != null)
+ {
+
+ if (result.Rows.Count == 1)
+ {
+ return DatabaseUtility.Get(result, 0, 0);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error("MediaPortal.Picture.Database exception getting strPath by ID err:{0} stack:{1}", ex.Message,
+ ex.StackTrace);
+ //Open();
+ }
+ return string.Empty;
+ }
+ }
+
+ private void GetPictureShare()
+ {
+ #region read virtual dir
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
+ {
+ VirtualDirectory virtualDirectory = new VirtualDirectory();
+ virtualDirectory.Clear();
+
+ for (int i = 0; i < VirtualDirectory.MaxSharesCount; i++)
+ {
+ string sharePath = String.Format("sharepath{0}", i);
+ string shareName = String.Format("sharename{0}", i);
+ string shareType = String.Format("sharetype{0}", i);
+
+ Share share = new Share();
+ share.Path = xmlreader.GetValueAsString("pictures", sharePath, string.Empty);
+ share.Name = xmlreader.GetValueAsString("pictures", shareName, string.Empty);
+ share.IsFtpShare = xmlreader.GetValueAsBool("pictures", shareType, false);
+
+ if (share.Path.Length > 0)
+ {
+ if (share.Path != string.Empty)
+ {
+ if (!share.IsFtpShare)
+ {
+ dirList.Add(share.Name, share.Path);
+ }
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+ #endregion
+ }
+ private string GetLocalDir(string Request)
+ {
+ string folder = string.Empty;
+ string baseFolder = string.Empty;
+
+ int x = Request.IndexOf("\\");
+ if (x == -1)
+ {
+ baseFolder = Request;
+ }
+ else
+ {
+ baseFolder = Request.Substring(0, x);
+ folder = Request.Substring(x);
+ }
+
+ string dir = string.Empty;
+ foreach (KeyValuePair<string, string> pair in dirList)
+ {
+ if (pair.Key.ToLower() == (baseFolder.ToLower()))
+ {
+ dir = pair.Value + folder;
+ return dir;
+ }
+ }
+ return string.Empty;
+ }
}
}
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.
|
|
From: <kro...@us...> - 2010-12-05 19:33:18
|
Revision: 4008
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4008&view=rev
Author: kroko_koenig
Date: 2010-12-05 19:33:12 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
update doc
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Release/Android Server communication.docx
Modified: trunk/plugins/AndroidRemote/Release/Android Server communication.docx
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
