Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4087] trunk/plugins/AndroidRemote
|
From: <kro...@us...> - 2011-02-01 14:33:22
|
Revision: 4087
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4087&view=rev
Author: kroko_koenig
Date: 2011-02-01 14:33:14 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
show dir also in music dirs, more doc
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java
trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
trunk/plugins/AndroidRemote/Release/Using Android Remote.docx
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/layout-large/
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-01 14:33:14 UTC (rev 4087)
@@ -77,34 +77,34 @@
}
public static final class id {
public static final int GridView01=0x7f060014;
- public static final int ImageView01=0x7f060027;
- public static final int LinearLayout00=0x7f06005a;
- public static final int LinearLayout01=0x7f06002e;
- public static final int LinearLayout02=0x7f060065;
- public static final int LinearLayout03=0x7f06006f;
- public static final int LinearLayout04=0x7f060079;
- public static final int LinearLayout05=0x7f06007f;
- public static final int ListView01=0x7f06003c;
- public static final int RadioGroup01=0x7f060094;
- public static final int Spinner01=0x7f06008b;
- public static final int SurfaceView01=0x7f06002d;
+ public static final int ImageView01=0x7f060028;
+ public static final int LinearLayout00=0x7f06005b;
+ public static final int LinearLayout01=0x7f06002f;
+ public static final int LinearLayout02=0x7f060066;
+ public static final int LinearLayout03=0x7f060070;
+ public static final int LinearLayout04=0x7f06007a;
+ public static final int LinearLayout05=0x7f060080;
+ public static final int ListView01=0x7f06003d;
+ public static final int RadioGroup01=0x7f060095;
+ public static final int Spinner01=0x7f06008c;
+ public static final int SurfaceView01=0x7f06002e;
public static final int TableLayout01=0x7f060006;
- public static final int TableLayout02=0x7f06004b;
+ public static final int TableLayout02=0x7f06004c;
public static final int TableRow01=0x7f060007;
- public static final int TableRow02=0x7f060050;
- public static final int TableRow03=0x7f060055;
+ public static final int TableRow02=0x7f060051;
+ public static final int TableRow03=0x7f060056;
public static final int TextView01=0x7f060003;
public static final int TextView02=0x7f060004;
- public static final int btnAlbumSelDown=0x7f060017;
- public static final int btnAlbumSelUp=0x7f060019;
- public static final int btnArtistSelDown=0x7f06001b;
- public static final int btnArtistSelUp=0x7f06001d;
- public static final int btnIpSettings=0x7f06008e;
- public static final int btnResultSelDown=0x7f06001f;
- public static final int btnResultSelUp=0x7f060021;
- public static final int btnSelectSkin=0x7f06008d;
- public static final int btnSongSelDown=0x7f060023;
- public static final int btnSongSelUp=0x7f060025;
+ public static final int btnAlbumSelDown=0x7f060018;
+ public static final int btnAlbumSelUp=0x7f06001a;
+ public static final int btnArtistSelDown=0x7f06001c;
+ public static final int btnArtistSelUp=0x7f06001e;
+ public static final int btnIpSettings=0x7f06008f;
+ public static final int btnResultSelDown=0x7f060020;
+ public static final int btnResultSelUp=0x7f060022;
+ public static final int btnSelectSkin=0x7f06008e;
+ public static final int btnSongSelDown=0x7f060024;
+ public static final int btnSongSelUp=0x7f060026;
public static final int btn_main_music=0x7f060009;
public static final int btn_main_now_playing=0x7f06000c;
public static final int btn_main_pictures=0x7f060008;
@@ -114,129 +114,130 @@
public static final int btn_main_skp_back=0x7f06000f;
public static final int btn_main_skp_forw=0x7f060011;
public static final int btn_main_video=0x7f06000a;
- public static final int btnkey01=0x7f06005b;
- public static final int btnkey02=0x7f06005c;
- public static final int btnkey03=0x7f06005d;
- public static final int btnkey04=0x7f06005e;
- public static final int btnkey05=0x7f06005f;
- public static final int btnkey06=0x7f060060;
- public static final int btnkey07=0x7f060061;
- public static final int btnkey08=0x7f060062;
- public static final int btnkey09=0x7f060063;
- public static final int btnkey10=0x7f060064;
- public static final int btnkey11=0x7f060066;
- public static final int btnkey12=0x7f060067;
- public static final int btnkey13=0x7f060068;
- public static final int btnkey14=0x7f060069;
- public static final int btnkey15=0x7f06006a;
- public static final int btnkey16=0x7f06006b;
- public static final int btnkey17=0x7f06006c;
- public static final int btnkey18=0x7f06006d;
- public static final int btnkey19=0x7f06006e;
- public static final int btnkey20=0x7f060070;
- public static final int btnkey21=0x7f060071;
- public static final int btnkey22=0x7f060072;
- public static final int btnkey23=0x7f060073;
- public static final int btnkey24=0x7f060074;
- public static final int btnkey25=0x7f060075;
- public static final int btnkey26=0x7f060076;
- public static final int btnkey27=0x7f060077;
- public static final int btnkey28=0x7f060078;
- public static final int btnkey29=0x7f06007a;
- public static final int btnkey30=0x7f06007b;
- public static final int btnkey31=0x7f06007c;
- public static final int btnkey32=0x7f06007d;
- public static final int btnkey33=0x7f06007e;
- public static final int btnkey41=0x7f060080;
- public static final int btnkey42=0x7f060081;
- public static final int btnkey43=0x7f060082;
- public static final int btnkey44=0x7f060083;
- public static final int btnkey45=0x7f060084;
- public static final int btnkey46=0x7f060085;
- public static final int btnkey47=0x7f060086;
- public static final int btnkey48=0x7f060087;
- public static final int btnkey49=0x7f060088;
- public static final int btnkey50=0x7f060089;
- public static final int button_open=0x7f06002a;
- public static final int button_stream=0x7f06002b;
- public static final int button_stream_stop=0x7f06002c;
- public static final int crtl_back=0x7f060048;
- public static final int crtl_ch_m=0x7f060054;
- public static final int crtl_ch_p=0x7f06004f;
- public static final int crtl_down=0x7f060047;
- public static final int crtl_full=0x7f060051;
- public static final int crtl_info=0x7f060059;
- public static final int crtl_left=0x7f060042;
- public static final int crtl_menu=0x7f060053;
- public static final int crtl_mp=0x7f06003e;
- public static final int crtl_osd=0x7f060058;
- public static final int crtl_parent=0x7f060046;
- public static final int crtl_play=0x7f060052;
- public static final int crtl_power=0x7f060040;
- public static final int crtl_ratio=0x7f060057;
- public static final int crtl_right=0x7f060044;
- public static final int crtl_select=0x7f060043;
- public static final int crtl_skip_back=0x7f06004c;
- public static final int crtl_skip_forw=0x7f06004e;
- public static final int crtl_stop=0x7f06004d;
- public static final int crtl_sub=0x7f060056;
- public static final int crtl_up=0x7f06003f;
- public static final int crtl_vol_m=0x7f06004a;
- public static final int crtl_vol_p=0x7f060049;
- public static final int full_text=0x7f060026;
+ public static final int btnkey01=0x7f06005c;
+ public static final int btnkey02=0x7f06005d;
+ public static final int btnkey03=0x7f06005e;
+ public static final int btnkey04=0x7f06005f;
+ public static final int btnkey05=0x7f060060;
+ public static final int btnkey06=0x7f060061;
+ public static final int btnkey07=0x7f060062;
+ public static final int btnkey08=0x7f060063;
+ public static final int btnkey09=0x7f060064;
+ public static final int btnkey10=0x7f060065;
+ public static final int btnkey11=0x7f060067;
+ public static final int btnkey12=0x7f060068;
+ public static final int btnkey13=0x7f060069;
+ public static final int btnkey14=0x7f06006a;
+ public static final int btnkey15=0x7f06006b;
+ public static final int btnkey16=0x7f06006c;
+ public static final int btnkey17=0x7f06006d;
+ public static final int btnkey18=0x7f06006e;
+ public static final int btnkey19=0x7f06006f;
+ public static final int btnkey20=0x7f060071;
+ public static final int btnkey21=0x7f060072;
+ public static final int btnkey22=0x7f060073;
+ public static final int btnkey23=0x7f060074;
+ public static final int btnkey24=0x7f060075;
+ public static final int btnkey25=0x7f060076;
+ public static final int btnkey26=0x7f060077;
+ public static final int btnkey27=0x7f060078;
+ public static final int btnkey28=0x7f060079;
+ public static final int btnkey29=0x7f06007b;
+ public static final int btnkey30=0x7f06007c;
+ public static final int btnkey31=0x7f06007d;
+ public static final int btnkey32=0x7f06007e;
+ public static final int btnkey33=0x7f06007f;
+ public static final int btnkey41=0x7f060081;
+ public static final int btnkey42=0x7f060082;
+ public static final int btnkey43=0x7f060083;
+ public static final int btnkey44=0x7f060084;
+ public static final int btnkey45=0x7f060085;
+ public static final int btnkey46=0x7f060086;
+ public static final int btnkey47=0x7f060087;
+ public static final int btnkey48=0x7f060088;
+ public static final int btnkey49=0x7f060089;
+ public static final int btnkey50=0x7f06008a;
+ public static final int button_open=0x7f06002b;
+ public static final int button_stream=0x7f06002c;
+ public static final int button_stream_stop=0x7f06002d;
+ public static final int crtl_back=0x7f060049;
+ public static final int crtl_ch_m=0x7f060055;
+ public static final int crtl_ch_p=0x7f060050;
+ public static final int crtl_down=0x7f060048;
+ public static final int crtl_full=0x7f060052;
+ public static final int crtl_info=0x7f06005a;
+ public static final int crtl_left=0x7f060043;
+ public static final int crtl_menu=0x7f060054;
+ public static final int crtl_mp=0x7f06003f;
+ public static final int crtl_osd=0x7f060059;
+ public static final int crtl_parent=0x7f060047;
+ public static final int crtl_play=0x7f060053;
+ public static final int crtl_power=0x7f060041;
+ public static final int crtl_ratio=0x7f060058;
+ public static final int crtl_right=0x7f060045;
+ public static final int crtl_select=0x7f060044;
+ public static final int crtl_skip_back=0x7f06004d;
+ public static final int crtl_skip_forw=0x7f06004f;
+ public static final int crtl_stop=0x7f06004e;
+ public static final int crtl_sub=0x7f060057;
+ public static final int crtl_up=0x7f060040;
+ public static final int crtl_vol_m=0x7f06004b;
+ public static final int crtl_vol_p=0x7f06004a;
+ public static final int full_text=0x7f060027;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
- public static final int list_album=0x7f060016;
- public static final int list_artist=0x7f06001a;
- public static final int list_result=0x7f06001e;
- public static final int list_song=0x7f060022;
+ public static final int list_album=0x7f060017;
+ public static final int list_artist=0x7f06001b;
+ public static final int list_result=0x7f06001f;
+ public static final int list_song=0x7f060023;
public static final int main_instance=0x7f060005;
public static final int main_now_playing=0x7f06000e;
- public static final int music_grid=0x7f060015;
- public static final int now_album=0x7f060030;
- public static final int now_artist=0x7f060036;
- public static final int now_cd=0x7f060031;
- public static final int now_list=0x7f06003b;
- public static final int now_next=0x7f06003a;
- public static final int now_play=0x7f060039;
- public static final int now_playing=0x7f06002f;
- public static final int now_playing_right=0x7f060034;
- public static final int now_playing_t_left=0x7f060033;
- public static final int now_prev=0x7f060037;
- public static final int now_progress=0x7f060032;
- public static final int now_stop=0x7f060038;
- public static final int now_title=0x7f060035;
- public static final int radio01=0x7f06009d;
- public static final int radio02=0x7f06009e;
- public static final int radio03=0x7f06009f;
- public static final int radio04=0x7f0600a0;
- public static final int radioStop=0x7f0600a1;
- public static final int selectSkin1=0x7f060095;
- public static final int selectSkin2=0x7f060097;
- public static final int selectSkin3=0x7f060099;
- public static final int server_ip=0x7f060091;
- public static final int server_macid=0x7f060093;
- public static final int server_name=0x7f060090;
- public static final int server_port=0x7f060092;
- public static final int splash=0x7f06009b;
- public static final int text_kb_streamed=0x7f060028;
- public static final int title=0x7f06009c;
- public static final int txtDbAlbum=0x7f060018;
- public static final int txtDbArtist=0x7f06001c;
- public static final int txtDbResult=0x7f060020;
- public static final int txtDbSong=0x7f060024;
+ public static final int music_grid=0x7f060016;
+ public static final int now_album=0x7f060031;
+ public static final int now_artist=0x7f060037;
+ public static final int now_cd=0x7f060032;
+ public static final int now_list=0x7f06003c;
+ public static final int now_next=0x7f06003b;
+ public static final int now_play=0x7f06003a;
+ public static final int now_playing=0x7f060030;
+ public static final int now_playing_right=0x7f060035;
+ public static final int now_playing_t_left=0x7f060034;
+ public static final int now_prev=0x7f060038;
+ public static final int now_progress=0x7f060033;
+ public static final int now_stop=0x7f060039;
+ public static final int now_title=0x7f060036;
+ public static final int radio01=0x7f06009e;
+ public static final int radio02=0x7f06009f;
+ public static final int radio03=0x7f0600a0;
+ public static final int radio04=0x7f0600a1;
+ public static final int radioStop=0x7f0600a2;
+ public static final int selectSkin1=0x7f060096;
+ public static final int selectSkin2=0x7f060098;
+ public static final int selectSkin3=0x7f06009a;
+ public static final int server_ip=0x7f060092;
+ public static final int server_macid=0x7f060094;
+ public static final int server_name=0x7f060091;
+ public static final int server_port=0x7f060093;
+ public static final int splash=0x7f06009c;
+ public static final int text_kb_streamed=0x7f060029;
+ public static final int title=0x7f06009d;
+ public static final int txtDbAlbum=0x7f060019;
+ public static final int txtDbArtist=0x7f06001d;
+ public static final int txtDbResult=0x7f060021;
+ public static final int txtDbSong=0x7f060025;
+ public static final int txtDirMusic=0x7f060015;
public static final int txtDirectory=0x7f060013;
- public static final int txtFile=0x7f060029;
- public static final int txtIntanceName=0x7f06008f;
- public static final int txtVersion=0x7f06008a;
- public static final int vibration=0x7f06008c;
- public static final int visitHome1=0x7f060096;
- public static final int visitHome2=0x7f060098;
- public static final int visitHome3=0x7f06009a;
+ public static final int txtFile=0x7f06002a;
+ public static final int txtIntanceName=0x7f060090;
+ public static final int txtVersion=0x7f06008b;
+ public static final int vibration=0x7f06008d;
+ public static final int visitHome1=0x7f060097;
+ public static final int visitHome2=0x7f060099;
+ public static final int visitHome3=0x7f06009b;
public static final int widget0=0x7f060012;
- public static final int widget00=0x7f06003d;
- public static final int widget01=0x7f060041;
- public static final int widget02=0x7f060045;
+ public static final int widget00=0x7f06003e;
+ public static final int widget01=0x7f060042;
+ public static final int widget02=0x7f060046;
public static final int widget44=0x7f060000;
}
public static final class layout {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-01 14:33:14 UTC (rev 4087)
@@ -1,6 +1,13 @@
-<AbsoluteLayout android:id="@+id/widget0"
+<LinearLayout android:id="@+id/widget0"
android:layout_width="fill_parent" android:layout_height="wrap_content"
- xmlns:android="http://schemas.android.com/apk/res/android">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical">
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Actual: ..."
+ android:textColor="#FFFFFFFF" android:textSize="20dip" android:id="@+id/txtDirMusic"
+ android:paddingBottom="5dip"></TextView>
+
<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"
@@ -8,5 +15,5 @@
android:horizontalSpacing="10dp" android:stretchMode="columnWidth"
android:gravity="center">
</GridView>
-</AbsoluteLayout>
+</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-01 14:33:14 UTC (rev 4087)
@@ -1,6 +1,7 @@
<LinearLayout android:id="@+id/widget0"
android:layout_width="fill_parent" android:layout_height="wrap_content"
- xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml 2011-02-01 14:33:14 UTC (rev 4087)
@@ -0,0 +1,70 @@
+<?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">
+
+<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance" android:textSize="28dip"></TextView>
+
+<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:padding="10dip" android:id="@+id/TableRow01">
+
+ <Button android:scaleType="fitXY"
+ android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="120dip" android:layout_width="120dip">
+ </Button>
+
+ <Button android:scaleType="fitXY" android:padding="5dip"
+ android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_height="120dip" android:layout_width="120dip">
+ </Button>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <Button android:scaleType="fitXY"
+ android:padding="5dip" android:layout_marginRight="40dip" android:id="@+id/btn_main_video" android:background="@drawable/ic_menu_skin1_video" android:layout_height="120dip" android:layout_width="120dip">
+ </Button>
+
+ <Button android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:id="@+id/btn_main_remote" android:background="@drawable/ic_menu_skin1_remote" android:layout_height="120dip">
+ </Button>
+
+
+</TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <Button android:scaleType="fitXY"
+ android:padding="5dip" android:layout_marginRight="40dip" android:id="@+id/btn_main_now_playing" android:background="@drawable/ic_menu_skin1_now_playing" android:layout_height="120dip" android:layout_width="120dip">
+ </Button>
+
+ <Button android:scaleType="fitXY" android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:id="@+id/btn_main_plugins" android:layout_height="120dip" android:layout_width="120dip">
+ </Button>
+
+ </TableRow>
+
+</TableLayout>
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="nothing playing"
+ android:gravity="center_horizontal" android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing" android:textSize="24dip">
+ </TextView>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
+
+
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_height="80dip" android:layout_width="80dip"></Button>
+ <ImageButton android:scaleType="fitXY"
+ android:id="@+id/btn_main_play" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_play" android:layout_height="80dip" android:layout_width="80dip"></ImageButton>
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_height="80dip" android:layout_width="80dip"></Button>
+</LinearLayout>
+</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-01 14:33:14 UTC (rev 4087)
@@ -81,7 +81,7 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
+
btnPlay = (ImageButton) findViewById(R.id.btn_main_play);
btnSkipBack = (Button) findViewById(R.id.btn_main_skp_back);
btnSkipForw = (Button) findViewById(R.id.btn_main_skp_forw);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-02-01 14:33:14 UTC (rev 4087)
@@ -281,6 +281,17 @@
}
}
+ String dsp = actualDir;
+ int len = dsp.length();
+
+ if (dsp == "")
+ dsp = "root";
+ if (len > 25)
+ dsp = "..." + dsp.substring(len - 20, len);
+
+ TextView txt = (TextView) findViewById(R.id.txtDirMusic);
+ txt.setText("Act: " + dsp);
+
if (musicList == null) {
Toast.makeText(MusicDir.this, "TIME OUT SERVER",
Toast.LENGTH_SHORT).show();
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java 2011-02-01 14:33:14 UTC (rev 4087)
@@ -21,7 +21,11 @@
package mediaportal.remote.utils;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
import android.content.SharedPreferences;
+import android.util.Log;
public class AppSettings{
@@ -43,16 +47,31 @@
public static String getServer()
{
+ String dns = "";
+
switch(getInstance())
{
case 1:
- return getServer1();
+ dns = getServer1();
case 2:
- return getServer2();
+ dns = getServer2();
case 3:
- return getServer3();
+ dns = getServer3();
}
- return "";
+
+ InetAddress in;
+ try {
+ in = InetAddress.getByName(dns);
+ Log.d("MediaPortal", "IP lookup : " + in.getHostAddress());
+
+ dns = in.getHostAddress();
+
+ } catch (UnknownHostException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ return dns;
}
public static String getPort()
{
Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Release/Using Android Remote.docx
===================================================================
(Binary files differ)
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 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2011-02-01 14:33:14 UTC (rev 4087)
@@ -39,8 +39,9 @@
this.btnSave = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.txtVlc = new System.Windows.Forms.Label();
this.btnBrowse = new System.Windows.Forms.Button();
- this.txtVlc = new System.Windows.Forms.Label();
+ this.txtVersion = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
@@ -160,16 +161,6 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Streaming Profile";
//
- // btnBrowse
- //
- this.btnBrowse.Location = new System.Drawing.Point(287, 19);
- this.btnBrowse.Name = "btnBrowse";
- this.btnBrowse.Size = new System.Drawing.Size(137, 23);
- this.btnBrowse.TabIndex = 0;
- this.btnBrowse.Text = "Browse profiles";
- this.btnBrowse.UseVisualStyleBackColor = true;
- this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
- //
// txtVlc
//
this.txtVlc.BackColor = System.Drawing.Color.White;
@@ -182,11 +173,31 @@
this.txtVlc.Text = "Profile";
this.txtVlc.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // btnBrowse
+ //
+ this.btnBrowse.Location = new System.Drawing.Point(287, 19);
+ this.btnBrowse.Name = "btnBrowse";
+ this.btnBrowse.Size = new System.Drawing.Size(137, 23);
+ this.btnBrowse.TabIndex = 0;
+ this.btnBrowse.Text = "Browse profiles";
+ this.btnBrowse.UseVisualStyleBackColor = true;
+ this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
+ //
+ // txtVersion
+ //
+ this.txtVersion.Location = new System.Drawing.Point(385, 189);
+ this.txtVersion.Name = "txtVersion";
+ this.txtVersion.Size = new System.Drawing.Size(117, 23);
+ this.txtVersion.TabIndex = 4;
+ this.txtVersion.Text = "Version 0.1.0.0";
+ this.txtVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(514, 227);
+ this.Controls.Add(this.txtVersion);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnSave);
@@ -223,5 +234,6 @@
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnBrowse;
private System.Windows.Forms.Label txtVlc;
+ private System.Windows.Forms.Label txtVersion;
}
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2011-02-01 07:07:30 UTC (rev 4086)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2011-02-01 14:33:14 UTC (rev 4087)
@@ -54,6 +54,8 @@
txtMyIP.Text = IPHost.AddressList[0].ToString();
else
txtMyIP.Text = "no IP adress !";
+
+ txtVersion.Text = GetVersion();
}
private void LoadSettings()
@@ -96,7 +98,7 @@
private void Setup_FormClosing(object sender, FormClosingEventArgs e)
{
-
+
}
private void btnBrowse_Click(object sender, EventArgs e)
@@ -113,7 +115,13 @@
{
txtVlc.Text = Path.GetFileName(openFile1.FileName);
}
+ }
+ private string GetVersion()
+ {
+ Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+ return ("Version : " + v.Major + "." + v.Minor + "." + v.Build + "." + v.Revision);
}
+
}
}
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.
|
