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-05 19:32:47
|
Revision: 4007
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4007&view=rev
Author: kroko_koenig
Date: 2010-12-05 19:32:41 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
add ids for pictures
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-04 18:31:25 UTC (rev 4006)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-05 19:32:41 UTC (rev 4007)
@@ -38,10 +38,13 @@
using MediaPortal.GUI.Library;
using MediaPortal.Utils;
using MediaPortal.Database;
+using MediaPortal.Configuration;
using MediaPortal.Player;
using MediaPortal.Playlists;
+using SQLite.NET;
+
namespace AndroidRemote
{
public class Request
@@ -53,6 +56,8 @@
private static Bitmap actualCover = null;
private static string[] listAllPictures = null;
+ private SQLiteClient sqlClient;
+
public Request(Socket Socket)
{
socket = Socket;
@@ -193,6 +198,26 @@
ReplyPicturesDbByDate(date);
}
}
+ if (req.StartsWith("getpicture"))
+ {
+ int pos = req.IndexOf("?");
+ if (pos > 0)
+ {
+ string id = req.Substring(pos + 1);
+ id = id.Replace("id=", "");
+ ReplyPicturesDbFile(id);
+ }
+ }
+ if (req.StartsWith("getthumb"))
+ {
+ int pos = req.IndexOf("?");
+ if (pos > 0)
+ {
+ string id = req.Substring(pos + 1);
+ id = id.Replace("id=", "");
+ ReplyPicturesDbThumbFile(id);
+ }
+ }
}
#endregion
@@ -732,6 +757,11 @@
}
private void ReplyPicturesDbByDate(string Date)
{
+ sqlClient = new SQLiteClient(Config.GetFile(Config.Dir.Database, "PictureDatabase.db3"));
+ sqlClient.BusyRetries = 10;
+ sqlClient.BusyRetryDelay = 100;
+ DatabaseUtility.SetPragmas(sqlClient);
+
string msg = string.Empty;
// header
msg += "HTTP/1.0 200 Ok\r\n";
@@ -743,17 +773,16 @@
msg += "<Database>\r\n";
msg += "<Date>" + Date + "</Date>\r\n";
- List<string> aList = new List<string>();
- MediaPortal.Picture.Database.PictureDatabase.ListPicsByDate(Date, ref aList);
+ List<string[]> aList = new List<string[]>();
+ //MediaPortal.Picture.Database.PictureDatabase.ListPicsByDate(Date, ref aList); // we dont get the ids... pff
+ ListPicsByDate(Date, ref aList);
- foreach (string year in aList)
+ foreach (string[] item in aList)
{
- if (year != string.Empty)
- {
- msg += "<Item>\r\n";
- msg += "<Picture>" + HttpUtility.HtmlEncode(year) + "</Picture>\r\n";
- msg += "</Item>\r\n";
- }
+ msg += "<Item>\r\n";
+ msg += "<ID>" + HttpUtility.HtmlEncode(item[0]) + "</ID>\r\n";
+ msg += "<Name>" + HttpUtility.HtmlEncode(item[1]) + "</Name>\r\n";
+ msg += "</Item>\r\n";
}
msg += "</Database>\r\n\r\n";
@@ -761,7 +790,100 @@
sendMessage(socket, msg);
AndroidServer.logDebug("Reply db pictures date");
}
+ private void ReplyPicturesDbFile(string ID)
+ {
+ sqlClient = new SQLiteClient(Config.GetFile(Config.Dir.Database, "PictureDatabase.db3"));
+ sqlClient.BusyRetries = 10;
+ sqlClient.BusyRetryDelay = 100;
+ DatabaseUtility.SetPragmas(sqlClient);
+ string filePath = GetPathById(ID);
+
+ if (File.Exists(filePath))
+ {
+ Bitmap bit = (Bitmap)Bitmap.FromFile(filePath);
+ byte[] b;
+
+ if ((bit.Width > 600) || (bit.Height > 600))
+ {
+ Bitmap thumb = (Bitmap)bit.Clone();
+ thumb = MediaPortal.Util.BitmapResize.Resize(ref thumb, 600, 600, false, true);
+
+ b = BildToByteArray((Image)thumb);
+ }
+ else
+ {
+ b = BildToByteArray((Image)bit);
+ }
+
+ if (b != null)
+ {
+ string msg = string.Empty;
+ // header
+ msg += "HTTP/1.0 200 Ok\r\n";
+ msg += "Content-Type: image/jpeg" + "\r\n";
+ msg += "Content-Length: " + b.Length + "\r\n";
+ msg += "Proxy-Connection: close" + "\r\n";
+ msg += "\r\n";
+ sendMessage(socket, msg);
+ // content
+ sendBytes(socket, b);
+ AndroidServer.logDebug("Reply picture file");
+ }
+ else
+ {
+ SendServerError(filePath, "ReplyPictureFile");
+ }
+ }
+ else
+ {
+ SendErrorFile(filePath);
+ }
+ }
+ private void ReplyPicturesDbThumbFile(string ID)
+ {
+ sqlClient = new SQLiteClient(Config.GetFile(Config.Dir.Database, "PictureDatabase.db3"));
+ sqlClient.BusyRetries = 10;
+ sqlClient.BusyRetryDelay = 100;
+ DatabaseUtility.SetPragmas(sqlClient);
+
+ string filePath = GetPathById(ID);
+
+ if (File.Exists(filePath))
+ {
+ Bitmap bit = (Bitmap)Bitmap.FromFile(filePath);
+ byte[] b;
+
+ Bitmap thumb = (Bitmap)bit.Clone();
+ thumb = MediaPortal.Util.BitmapResize.Resize(ref thumb, 85, 85, false, true);
+
+ b = BildToByteArray((Image)thumb);
+
+ if (b != null)
+ {
+ string msg = string.Empty;
+ // header
+ msg += "HTTP/1.0 200 Ok\r\n";
+ msg += "Content-Type: image/jpeg" + "\r\n";
+ msg += "Content-Length: " + b.Length + "\r\n";
+ msg += "Proxy-Connection: close" + "\r\n";
+ msg += "\r\n";
+ sendMessage(socket, msg);
+ // content
+ sendBytes(socket, b);
+ AndroidServer.logDebug("Reply picture file");
+ }
+ else
+ {
+ SendServerError(filePath, "ReplyPictureFile");
+ }
+ }
+ else
+ {
+ SendErrorFile(filePath);
+ }
+ }
+
private void ReplyMusicDir(string dir, string request)
{
if (Directory.Exists(dir))
@@ -1376,5 +1498,69 @@
{
return System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(ResourceName);
}
+
+ public int ListPicsByDate(string Date, ref List<string[]> Pics)
+ {
+ int Count = 0;
+ {
+ if (sqlClient == null)
+ {
+ return 0;
+ }
+ string strSQL = "select idPicture,strFile from picture where strDateTaken like '" + Date + "%' order by 1";
+ SQLiteResultSet result;
+ try
+ {
+ result = sqlClient.Execute(strSQL);
+ if (result != null)
+ {
+ for (Count = 0; Count < result.Rows.Count; Count++)
+ {
+ string[] vals = new string[2];
+ vals[0] = DatabaseUtility.Get(result, Count, 0);
+ vals[1] = Path.GetFileName(DatabaseUtility.Get(result, Count, 1));
+ Pics.Add(vals);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error("MediaPortal.Picture.Database exception getting Picture by Date err:{0} stack:{1}", ex.Message,
+ ex.StackTrace);
+ //Open();
+ }
+ return Count;
+ }
+ }
+ public string GetPathById(string ID)
+ {
+ {
+ if (sqlClient == null)
+ {
+ return string.Empty;
+ }
+ string strSQL = "select strFile from picture where idPicture='" + 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 Picture by Date err:{0} stack:{1}", ex.Message,
+ ex.StackTrace);
+ //Open();
+ }
+ 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-04 18:31:32
|
Revision: 4006
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4006&view=rev
Author: kroko_koenig
Date: 2010-12-04 18:31:25 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
add support for picture db
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-04 17:50:02 UTC (rev 4005)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-04 18:31:25 UTC (rev 4006)
@@ -39,6 +39,9 @@
using MediaPortal.Utils;
using MediaPortal.Database;
+using MediaPortal.Player;
+using MediaPortal.Playlists;
+
namespace AndroidRemote
{
public class Request
@@ -147,6 +150,53 @@
}
#endregion
+ #region pictured datatbase
+
+ else if (req.StartsWith("/db_pictures"))
+ {
+ // handle pictures
+ req = req.Replace("/db_pictures", "");
+ if (req.StartsWith("/")) req = req.Substring(1);
+
+ if (req == "years.xml")
+ {
+ ReplyPicturesDbYears();
+ }
+ if (req.StartsWith("months.xml"))
+ {
+ int pos = req.IndexOf("?");
+ if (pos > 0)
+ {
+ string year = req.Substring(pos + 1);
+ ReplyPicturesDbMonths(year);
+ }
+ }
+ if (req.StartsWith("days.xml"))
+ {
+ int pos = req.IndexOf("?");
+ if (pos > 0)
+ {
+ string date = req.Substring(pos + 1);
+ string[] my = date.Split('&');
+ if (my.Length == 2)
+ {
+ ReplyPicturesDbDays(my[0], my[1]);
+ }
+ }
+ }
+ if (req.StartsWith("date.xml"))
+ {
+ int pos = req.IndexOf("?");
+ if (pos > 0)
+ {
+ string date = req.Substring(pos + 1);
+ ReplyPicturesDbByDate(date);
+ }
+ }
+ }
+
+ #endregion
+
#region music
else if (req.StartsWith("/music"))
{
@@ -272,159 +322,175 @@
data.Add(child.Name, child.InnerText);
}
- #region player
- if (Message.Contains("ACTION_PLAY"))
- {
- Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_STOP"))
- {
- Action action = new Action(Action.ActionType.ACTION_STOP, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_PAUSE"))
- {
- Action action = new Action(Action.ActionType.ACTION_PAUSE, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_NEXT_ITEM"))
- {
- Action action = new Action(Action.ActionType.ACTION_NEXT_ITEM, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_PREV_ITEM"))
- {
- Action action = new Action(Action.ActionType.ACTION_PREV_ITEM, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_FORWARD"))
- {
- Action action = new Action(Action.ActionType.ACTION_FORWARD, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_REWIND"))
- {
- Action action = new Action(Action.ActionType.ACTION_REWIND, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- #endregion
+ //PlayListPlayer playlistPlayer = PlayListPlayer.SingletonPlayer;
+ //PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC);
- #region navigate
- if (Message.Contains("ACTION_MOVE_RIGHT"))
- {
- Action action = new Action(Action.ActionType.ACTION_MOVE_RIGHT, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_MOVE_LEFT"))
- {
- Action action = new Action(Action.ActionType.ACTION_MOVE_LEFT, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_MOVE_UP"))
- {
- Action action = new Action(Action.ActionType.ACTION_MOVE_UP, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_MOVE_DOWN"))
- {
- Action action = new Action(Action.ActionType.ACTION_MOVE_DOWN, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_SELECT_ITEM"))
- {
- Action action = new Action(Action.ActionType.ACTION_SELECT_ITEM, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- #endregion
+ //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;
- #region menu
- if (Message.Contains("ACTION_PREVIOUS_MENU"))
- {
- Action action = new Action(Action.ActionType.ACTION_PREVIOUS_MENU, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_PARENT_DIR"))
- {
- Action action = new Action(Action.ActionType.ACTION_PARENT_DIR, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_SHOW_INFO"))
- {
- Action action = new Action(Action.ActionType.ACTION_SHOW_INFO, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_CONTEXT_MENU"))
- {
- Action action = new Action(Action.ActionType.ACTION_CONTEXT_MENU, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- #endregion
+ //playlistItem.MusicTag = null;
+ //playList.Add(playlistItem);
- #region volume / programm
- if (Message.Contains("ACTION_VOLUME_UP"))
+ if (data.ContainsKey("command"))
{
- Action action = new Action(Action.ActionType.ACTION_VOLUME_UP, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_VOLUME_DOWN"))
- {
- Action action = new Action(Action.ActionType.ACTION_VOLUME_DOWN, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_VOLUME_MUTE"))
- {
- Action action = new Action(Action.ActionType.ACTION_VOLUME_MUTE, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_NEXT_CHANNEL"))
- {
- Action action = new Action(Action.ActionType.ACTION_NEXT_CHANNEL, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_PREV_CHANNEL"))
- {
- Action action = new Action(Action.ActionType.ACTION_PREV_CHANNEL, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_PREV_CHANNEL"))
- {
- Action action = new Action(Action.ActionType.ACTION_PREV_CHANNEL, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
+ #region player
+ if (data["command"] == "ACTION_PLAY")
+ {
+ Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_STOP"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_STOP, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_PAUSE"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PAUSE, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_NEXT_ITEM"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_NEXT_ITEM, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_PREV_ITEM"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PREV_ITEM, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_FORWARD"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_FORWARD, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_REWIND"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_REWIND, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ #endregion
- #endregion
+ #region navigate
+ if (data["command"] == ("ACTION_MOVE_RIGHT"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_MOVE_RIGHT, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_MOVE_LEFT"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_MOVE_LEFT, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_MOVE_UP"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_MOVE_UP, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_MOVE_DOWN"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_MOVE_DOWN, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_SELECT_ITEM"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_SELECT_ITEM, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ #endregion
- #region power control
- if (Message.Contains("ACTION_EXIT"))
- {
- Action action = new Action(Action.ActionType.ACTION_EXIT, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
+ #region menu
+ if (data["command"] == ("ACTION_PREVIOUS_MENU"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PREVIOUS_MENU, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_PARENT_DIR"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PARENT_DIR, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_SHOW_INFO"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_SHOW_INFO, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_CONTEXT_MENU"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_CONTEXT_MENU, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ #endregion
- // TODO: these actions need confirmation so we need to do change it later....
- if (Message.Contains("ACTION_SUSPEND"))
- {
- Action action = new Action(Action.ActionType.ACTION_SUSPEND, 0, 0);
- GUIGraphicsContext.OnAction(action);
+ #region volume / programm
+ if (data["command"] == ("ACTION_VOLUME_UP"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_VOLUME_UP, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_VOLUME_DOWN"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_VOLUME_DOWN, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_VOLUME_MUTE"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_VOLUME_MUTE, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_NEXT_CHANNEL"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_NEXT_CHANNEL, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_PREV_CHANNEL"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PREV_CHANNEL, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+
+ if (data["command"] == ("ACTION_PREV_CHANNEL"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PREV_CHANNEL, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+
+ #endregion
+
+ #region power control
+ if (data["command"] == ("ACTION_EXIT"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_EXIT, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+
+ // TODO: these actions need confirmation so we need to do change it later....
+ if (data["command"] == ("ACTION_SUSPEND"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_SUSPEND, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_HIBERNATE"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_HIBERNATE, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_REBOOT"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_REBOOT, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (data["command"] == ("ACTION_POWER_OFF"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_POWER_OFF, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ #endregion
}
- if (Message.Contains("ACTION_HIBERNATE"))
- {
- Action action = new Action(Action.ActionType.ACTION_HIBERNATE, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_REBOOT"))
- {
- Action action = new Action(Action.ActionType.ACTION_REBOOT, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- if (Message.Contains("ACTION_POWER_OFF"))
- {
- Action action = new Action(Action.ActionType.ACTION_POWER_OFF, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
- #endregion
}
}
@@ -571,6 +637,131 @@
}
}
+ private void ReplyPicturesDbYears()
+ {
+ 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 += "<Database>\r\n";
+
+ List<string> aList = new List<string>();
+ MediaPortal.Picture.Database.PictureDatabase.ListYears(ref aList);
+
+ foreach (string year in aList)
+ {
+ if (year != string.Empty)
+ {
+ msg += "<Item>\r\n";
+ msg += "<Year>" + HttpUtility.HtmlEncode(year) + "</Year>\r\n";
+ msg += "</Item>\r\n";
+ }
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply db pictures years");
+ }
+ private void ReplyPicturesDbMonths(string Year)
+ {
+ 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 += "<Database>\r\n";
+ msg += "<Year>" + Year + "</Year>\r\n";
+
+ List<string> aList = new List<string>();
+ MediaPortal.Picture.Database.PictureDatabase.ListMonths(Year, ref aList);
+
+ foreach (string year in aList)
+ {
+ if (year != string.Empty)
+ {
+ msg += "<Item>\r\n";
+ msg += "<Month>" + HttpUtility.HtmlEncode(year) + "</Month>\r\n";
+ msg += "</Item>\r\n";
+ }
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply db pictures month");
+ }
+ private void ReplyPicturesDbDays(string Month, string Year)
+ {
+ 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 += "<Database>\r\n";
+ msg += "<Month>" + Month + "</Month>\r\n";
+ msg += "<Year>" + Year + "</Year>\r\n";
+
+ List<string> aList = new List<string>();
+ MediaPortal.Picture.Database.PictureDatabase.ListDays(Month, Year, ref aList);
+
+ foreach (string year in aList)
+ {
+ if (year != string.Empty)
+ {
+ msg += "<Item>\r\n";
+ msg += "<Day>" + HttpUtility.HtmlEncode(year) + "</Day>\r\n";
+ msg += "</Item>\r\n";
+ }
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply db pictures days");
+ }
+ private void ReplyPicturesDbByDate(string Date)
+ {
+ 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 += "<Database>\r\n";
+ msg += "<Date>" + Date + "</Date>\r\n";
+
+ List<string> aList = new List<string>();
+ MediaPortal.Picture.Database.PictureDatabase.ListPicsByDate(Date, ref aList);
+
+ foreach (string year in aList)
+ {
+ if (year != string.Empty)
+ {
+ msg += "<Item>\r\n";
+ msg += "<Picture>" + HttpUtility.HtmlEncode(year) + "</Picture>\r\n";
+ msg += "</Item>\r\n";
+ }
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply db pictures date");
+ }
+
private void ReplyMusicDir(string dir, string request)
{
if (Directory.Exists(dir))
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: <sa...@us...> - 2010-12-04 17:50:09
|
Revision: 4005
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4005&view=rev
Author: saamand
Date: 2010-12-04 17:50:02 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs
trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs
trunk/plugins/MyLyrics/LyricsEngine/app.config
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/change log.txt
trunk/plugins/MyLyrics/MyLyrics.sln
Property Changed:
----------------
trunk/plugins/MyLyrics/LyricsEngine/
trunk/plugins/MyLyrics/My Lyrics/
Property changes on: trunk/plugins/MyLyrics/LyricsEngine
___________________________________________________________________
Modified: svn:ignore
- *.suo
*.user
thumbs.db
+ *.suo
*.user
thumbs.db
[Bb]in
obj
[Dd]ebug
[Rr]elease
*.aps
*.eto
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,8 +16,25 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -110,7 +128,6 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
- <SubType>Component</SubType>
</Compile>
<Compile Include="LyricsSites\LyricWiki.cs" />
</ItemGroup>
@@ -138,6 +155,23 @@
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3074
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,7 +1,7 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -9,477 +9,384 @@
//------------------------------------------------------------------------------
//
-// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.3053.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.1.
//
-using System;
-using System.CodeDom.Compiler;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Threading;
-using System.Web.Services;
-using System.Web.Services.Description;
-using System.Web.Services.Protocols;
-using LyricsEngine.Properties;
-
#pragma warning disable 1591
-namespace LyricsEngine.lrcfinder
-{
+namespace LyricsEngine.lrcfinder {
+ using System;
+ using System.Web.Services;
+ using System.Diagnostics;
+ using System.Web.Services.Protocols;
+ using System.ComponentModel;
+ using System.Xml.Serialization;
+ using System.Data;
+
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
- [DebuggerStepThrough()]
- [DesignerCategory("code")]
- [WebServiceBinding(Name = "LrcFinderSoap", Namespace = "http://tempuri.org/")]
- public partial class LrcFinder : SoapHttpClientProtocol
- {
- private SendOrPostCallback FindLRCOperationCompleted;
-
- private SendOrPostCallback FindLRCsOperationCompleted;
- private SendOrPostCallback NewDomainOperationCompleted;
-
- private SendOrPostCallback SaveLRCOperationCompleted;
-
- private SendOrPostCallback SaveLRCWithGuidOperationCompleted;
-
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Web.Services.WebServiceBindingAttribute(Name="LrcFinderSoap", Namespace="http://tempuri.org/")]
+ public partial class LrcFinder : System.Web.Services.Protocols.SoapHttpClientProtocol {
+
+ private System.Threading.SendOrPostCallback FindLRCOperationCompleted;
+
+ private System.Threading.SendOrPostCallback FindLRCsOperationCompleted;
+
+ private System.Threading.SendOrPostCallback SaveLRCOperationCompleted;
+
+ private System.Threading.SendOrPostCallback SaveLRCWithGuidOperationCompleted;
+
+ private System.Threading.SendOrPostCallback NewDomainOperationCompleted;
+
private bool useDefaultCredentialsSetExplicitly;
-
+
/// <remarks/>
- public LrcFinder()
- {
- Url = Settings.Default.LyricsEngine_lrcfinder_LrcFinder;
- if ((IsLocalFileSystemWebService(Url) == true))
- {
- UseDefaultCredentials = true;
- useDefaultCredentialsSetExplicitly = false;
+ public LrcFinder() {
+ this.Url = global::LyricsEngine.Properties.Settings.Default.LyricsEngine_lrcfinder_LrcFinder;
+ if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
+ this.UseDefaultCredentials = true;
+ this.useDefaultCredentialsSetExplicitly = false;
}
- else
- {
- useDefaultCredentialsSetExplicitly = true;
+ else {
+ this.useDefaultCredentialsSetExplicitly = true;
}
}
-
- public new string Url
- {
- get { return base.Url; }
- set
- {
- if ((((IsLocalFileSystemWebService(base.Url) == true)
- && (useDefaultCredentialsSetExplicitly == false))
- && (IsLocalFileSystemWebService(value) == false)))
- {
+
+ public new string Url {
+ get {
+ return base.Url;
+ }
+ set {
+ if ((((this.IsLocalFileSystemWebService(base.Url) == true)
+ && (this.useDefaultCredentialsSetExplicitly == false))
+ && (this.IsLocalFileSystemWebService(value) == false))) {
base.UseDefaultCredentials = false;
}
base.Url = value;
}
}
-
- public new bool UseDefaultCredentials
- {
- get { return base.UseDefaultCredentials; }
- set
- {
+
+ public new bool UseDefaultCredentials {
+ get {
+ return base.UseDefaultCredentials;
+ }
+ set {
base.UseDefaultCredentials = value;
- useDefaultCredentialsSetExplicitly = true;
+ this.useDefaultCredentialsSetExplicitly = true;
}
}
-
+
/// <remarks/>
public event FindLRCCompletedEventHandler FindLRCCompleted;
-
+
/// <remarks/>
public event FindLRCsCompletedEventHandler FindLRCsCompleted;
-
+
/// <remarks/>
public event SaveLRCCompletedEventHandler SaveLRCCompleted;
-
+
/// <remarks/>
public event SaveLRCWithGuidCompletedEventHandler SaveLRCWithGuidCompleted;
-
+
/// <remarks/>
public event NewDomainCompletedEventHandler NewDomainCompleted;
-
+
/// <remarks/>
- [SoapDocumentMethod("http://tempuri.org/FindLRC", RequestNamespace = "http://tempuri.org/",
- ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal,
- ParameterStyle = SoapParameterStyle.Wrapped)]
- public string FindLRC(string artist, string title)
- {
- object[] results = Invoke("FindLRC", new object[]
- {
- artist,
- title
- });
- return ((string) (results[0]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/FindLRC", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public string FindLRC(string artist, string title) {
+ object[] results = this.Invoke("FindLRC", new object[] {
+ artist,
+ title});
+ return ((string)(results[0]));
}
-
+
/// <remarks/>
- public void FindLRCAsync(string artist, string title)
- {
- FindLRCAsync(artist, title, null);
+ public void FindLRCAsync(string artist, string title) {
+ this.FindLRCAsync(artist, title, null);
}
-
+
/// <remarks/>
- public void FindLRCAsync(string artist, string title, object userState)
- {
- if ((FindLRCOperationCompleted == null))
- {
- FindLRCOperationCompleted = new SendOrPostCallback(OnFindLRCOperationCompleted);
+ public void FindLRCAsync(string artist, string title, object userState) {
+ if ((this.FindLRCOperationCompleted == null)) {
+ this.FindLRCOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFindLRCOperationCompleted);
}
- InvokeAsync("FindLRC", new object[]
- {
- artist,
- title
- }, FindLRCOperationCompleted, userState);
+ this.InvokeAsync("FindLRC", new object[] {
+ artist,
+ title}, this.FindLRCOperationCompleted, userState);
}
-
- private void OnFindLRCOperationCompleted(object arg)
- {
- if ((FindLRCCompleted != null))
- {
- InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg));
- FindLRCCompleted(this,
- new FindLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error,
- invokeArgs.Cancelled, invokeArgs.UserState));
+
+ private void OnFindLRCOperationCompleted(object arg) {
+ if ((this.FindLRCCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.FindLRCCompleted(this, new FindLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
-
+
/// <remarks/>
- [SoapDocumentMethod("http://tempuri.org/FindLRCs", RequestNamespace = "http://tempuri.org/",
- ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal,
- ParameterStyle = SoapParameterStyle.Wrapped)]
- public DataTable FindLRCs(string artist, string title)
- {
- object[] results = Invoke("FindLRCs", new object[]
- {
- artist,
- title
- });
- return ((DataTable) (results[0]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/FindLRCs", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public System.Data.DataTable FindLRCs(string artist, string title) {
+ object[] results = this.Invoke("FindLRCs", new object[] {
+ artist,
+ title});
+ return ((System.Data.DataTable)(results[0]));
}
-
+
/// <remarks/>
- public void FindLRCsAsync(string artist, string title)
- {
- FindLRCsAsync(artist, title, null);
+ public void FindLRCsAsync(string artist, string title) {
+ this.FindLRCsAsync(artist, title, null);
}
-
+
/// <remarks/>
- public void FindLRCsAsync(string artist, string title, object userState)
- {
- if ((FindLRCsOperationCompleted == null))
- {
- FindLRCsOperationCompleted = new SendOrPostCallback(OnFindLRCsOperationCompleted);
+ public void FindLRCsAsync(string artist, string title, object userState) {
+ if ((this.FindLRCsOperationCompleted == null)) {
+ this.FindLRCsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFindLRCsOperationCompleted);
}
- InvokeAsync("FindLRCs", new object[]
- {
- artist,
- title
- }, FindLRCsOperationCompleted, userState);
+ this.InvokeAsync("FindLRCs", new object[] {
+ artist,
+ title}, this.FindLRCsOperationCompleted, userState);
}
-
- private void OnFindLRCsOperationCompleted(object arg)
- {
- if ((FindLRCsCompleted != null))
- {
- InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg));
- FindLRCsCompleted(this,
- new FindLRCsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error,
- invokeArgs.Cancelled, invokeArgs.UserState));
+
+ private void OnFindLRCsOperationCompleted(object arg) {
+ if ((this.FindLRCsCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.FindLRCsCompleted(this, new FindLRCsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
-
+
/// <remarks/>
- [SoapDocumentMethod("http://tempuri.org/SaveLRC", RequestNamespace = "http://tempuri.org/",
- ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal,
- ParameterStyle = SoapParameterStyle.Wrapped)]
- public string SaveLRC(string lrcFileString)
- {
- object[] results = Invoke("SaveLRC", new object[]
- {
- lrcFileString
- });
- return ((string) (results[0]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SaveLRC", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public string SaveLRC(string lrcFileString) {
+ object[] results = this.Invoke("SaveLRC", new object[] {
+ lrcFileString});
+ return ((string)(results[0]));
}
-
+
/// <remarks/>
- public void SaveLRCAsync(string lrcFileString)
- {
- SaveLRCAsync(lrcFileString, null);
+ public void SaveLRCAsync(string lrcFileString) {
+ this.SaveLRCAsync(lrcFileString, null);
}
-
+
/// <remarks/>
- public void SaveLRCAsync(string lrcFileString, object userState)
- {
- if ((SaveLRCOperationCompleted == null))
- {
- SaveLRCOperationCompleted = new SendOrPostCallback(OnSaveLRCOperationCompleted);
+ public void SaveLRCAsync(string lrcFileString, object userState) {
+ if ((this.SaveLRCOperationCompleted == null)) {
+ this.SaveLRCOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveLRCOperationCompleted);
}
- InvokeAsync("SaveLRC", new object[]
- {
- lrcFileString
- }, SaveLRCOperationCompleted, userState);
+ this.InvokeAsync("SaveLRC", new object[] {
+ lrcFileString}, this.SaveLRCOperationCompleted, userState);
}
-
- private void OnSaveLRCOperationCompleted(object arg)
- {
- if ((SaveLRCCompleted != null))
- {
- InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg));
- SaveLRCCompleted(this,
- new SaveLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error,
- invokeArgs.Cancelled, invokeArgs.UserState));
+
+ private void OnSaveLRCOperationCompleted(object arg) {
+ if ((this.SaveLRCCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.SaveLRCCompleted(this, new SaveLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
-
+
/// <remarks/>
- [SoapDocumentMethod("http://tempuri.org/SaveLRCWithGuid", RequestNamespace = "http://tempuri.org/",
- ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal,
- ParameterStyle = SoapParameterStyle.Wrapped)]
- public string SaveLRCWithGuid(string lrcFileString, Guid guid)
- {
- object[] results = Invoke("SaveLRCWithGuid", new object[]
- {
- lrcFileString,
- guid
- });
- return ((string) (results[0]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SaveLRCWithGuid", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public string SaveLRCWithGuid(string lrcFileString, System.Guid guid) {
+ object[] results = this.Invoke("SaveLRCWithGuid", new object[] {
+ lrcFileString,
+ guid});
+ return ((string)(results[0]));
}
-
+
/// <remarks/>
- public void SaveLRCWithGuidAsync(string lrcFileString, Guid guid)
- {
- SaveLRCWithGuidAsync(lrcFileString, guid, null);
+ public void SaveLRCWithGuidAsync(string lrcFileString, System.Guid guid) {
+ this.SaveLRCWithGuidAsync(lrcFileString, guid, null);
}
-
+
/// <remarks/>
- public void SaveLRCWithGuidAsync(string lrcFileString, Guid guid, object userState)
- {
- if ((SaveLRCWithGuidOperationCompleted == null))
- {
- SaveLRCWithGuidOperationCompleted = new SendOrPostCallback(OnSaveLRCWithGuidOperationCompleted);
+ public void SaveLRCWithGuidAsync(string lrcFileString, System.Guid guid, object userState) {
+ if ((this.SaveLRCWithGuidOperationCompleted == null)) {
+ this.SaveLRCWithGuidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveLRCWithGuidOperationCompleted);
}
- InvokeAsync("SaveLRCWithGuid", new object[]
- {
- lrcFileString,
- guid
- }, SaveLRCWithGuidOperationCompleted, userState);
+ this.InvokeAsync("SaveLRCWithGuid", new object[] {
+ lrcFileString,
+ guid}, this.SaveLRCWithGuidOperationCompleted, userState);
}
-
- private void OnSaveLRCWithGuidOperationCompleted(object arg)
- {
- if ((SaveLRCWithGuidCompleted != null))
- {
- InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg));
- SaveLRCWithGuidCompleted(this,
- new SaveLRCWithGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error,
- invokeArgs.Cancelled,
- invokeArgs.UserState));
+
+ private void OnSaveLRCWithGuidOperationCompleted(object arg) {
+ if ((this.SaveLRCWithGuidCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.SaveLRCWithGuidCompleted(this, new SaveLRCWithGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
-
+
/// <remarks/>
- [SoapDocumentMethod("http://tempuri.org/NewDomain", RequestNamespace = "http://tempuri.org/",
- ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal,
- ParameterStyle = SoapParameterStyle.Wrapped)]
- public string[] NewDomain()
- {
- object[] results = Invoke("NewDomain", new object[0]);
- return ((string[]) (results[0]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/NewDomain", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public string[] NewDomain() {
+ object[] results = this.Invoke("NewDomain", new object[0]);
+ return ((string[])(results[0]));
}
-
+
/// <remarks/>
- public void NewDomainAsync()
- {
- NewDomainAsync(null);
+ public void NewDomainAsync() {
+ this.NewDomainAsync(null);
}
-
+
/// <remarks/>
- public void NewDomainAsync(object userState)
- {
- if ((NewDomainOperationCompleted == null))
- {
- NewDomainOperationCompleted = new SendOrPostCallback(OnNewDomainOperationCompleted);
+ public void NewDomainAsync(object userState) {
+ if ((this.NewDomainOperationCompleted == null)) {
+ this.NewDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNewDomainOperationCompleted);
}
- InvokeAsync("NewDomain", new object[0], NewDomainOperationCompleted, userState);
+ this.InvokeAsync("NewDomain", new object[0], this.NewDomainOperationCompleted, userState);
}
-
- private void OnNewDomainOperationCompleted(object arg)
- {
- if ((NewDomainCompleted != null))
- {
- InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg));
- NewDomainCompleted(this,
- new NewDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error,
- invokeArgs.Cancelled, invokeArgs.UserState));
+
+ private void OnNewDomainOperationCompleted(object arg) {
+ if ((this.NewDomainCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.NewDomainCompleted(this, new NewDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
-
+
/// <remarks/>
- public new void CancelAsync(object userState)
- {
+ public new void CancelAsync(object userState) {
base.CancelAsync(userState);
}
-
- private bool IsLocalFileSystemWebService(string url)
- {
- if (((url == null)
- || (url == string.Empty)))
- {
+
+ private bool IsLocalFileSystemWebService(string url) {
+ if (((url == null)
+ || (url == string.Empty))) {
return false;
}
- Uri wsUri = new Uri(url);
- if (((wsUri.Port >= 1024)
- && (string.Compare(wsUri.Host, "localHost", StringComparison.OrdinalIgnoreCase) == 0)))
- {
+ System.Uri wsUri = new System.Uri(url);
+ if (((wsUri.Port >= 1024)
+ && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) {
return true;
}
return false;
}
}
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
public delegate void FindLRCCompletedEventHandler(object sender, FindLRCCompletedEventArgs e);
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
- [DebuggerStepThrough()]
- [DesignerCategory("code")]
- public partial class FindLRCCompletedEventArgs : AsyncCompletedEventArgs
- {
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class FindLRCCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
private object[] results;
-
- internal FindLRCCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState)
- {
+
+ internal FindLRCCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
this.results = results;
}
-
+
/// <remarks/>
- public string Result
- {
- get
- {
- RaiseExceptionIfNecessary();
- return ((string) (results[0]));
+ public string Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[0]));
}
}
}
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
public delegate void FindLRCsCompletedEventHandler(object sender, FindLRCsCompletedEventArgs e);
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
- [DebuggerStepThrough()]
- [DesignerCategory("code")]
- public partial class FindLRCsCompletedEventArgs : AsyncCompletedEventArgs
- {
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class FindLRCsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
private object[] results;
-
- internal FindLRCsCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState)
- {
+
+ internal FindLRCsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
this.results = results;
}
-
+
/// <remarks/>
- public DataTable Result
- {
- get
- {
- RaiseExceptionIfNecessary();
- return ((DataTable) (results[0]));
+ public System.Data.DataTable Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((System.Data.DataTable)(this.results[0]));
}
}
}
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
public delegate void SaveLRCCompletedEventHandler(object sender, SaveLRCCompletedEventArgs e);
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
- [DebuggerStepThrough()]
- [DesignerCategory("code")]
- public partial class SaveLRCCompletedEventArgs : AsyncCompletedEventArgs
- {
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class SaveLRCCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
private object[] results;
-
- internal SaveLRCCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState)
- {
+
+ internal SaveLRCCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
this.results = results;
}
-
+
/// <remarks/>
- public string Result
- {
- get
- {
- RaiseExceptionIfNecessary();
- return ((string) (results[0]));
+ public string Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[0]));
}
}
}
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
public delegate void SaveLRCWithGuidCompletedEventHandler(object sender, SaveLRCWithGuidCompletedEventArgs e);
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
- [DebuggerStepThrough()]
- [DesignerCategory("code")]
- public partial class SaveLRCWithGuidCompletedEventArgs : AsyncCompletedEventArgs
- {
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class SaveLRCWithGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
private object[] results;
-
- internal SaveLRCWithGuidCompletedEventArgs(object[] results, Exception exception, bool cancelled,
- object userState) :
- base(exception, cancelled, userState)
- {
+
+ internal SaveLRCWithGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
this.results = results;
}
-
+
/// <remarks/>
- public string Result
- {
- get
- {
- RaiseExceptionIfNecessary();
- return ((string) (results[0]));
+ public string Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[0]));
}
}
}
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
public delegate void NewDomainCompletedEventHandler(object sender, NewDomainCompletedEventArgs e);
-
+
/// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.3053")]
- [DebuggerStepThrough()]
- [DesignerCategory("code")]
- public partial class NewDomainCompletedEventArgs : AsyncCompletedEventArgs
- {
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class NewDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
private object[] results;
-
- internal NewDomainCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState)
- {
+
+ internal NewDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
this.results = results;
}
-
+
/// <remarks/>
- public string[] Result
- {
- get
- {
- RaiseExceptionIfNecessary();
- return ((string[]) (results[0]));
+ public string[] Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string[])(this.results[0]));
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/app.config
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/app.config 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/LyricsEngine/app.config 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
<configuration>
<configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
- <section name="LyricsEngine.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <section name="LyricsEngine.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
<applicationSettings>
@@ -18,4 +18,4 @@
</setting>
</LyricsEngine.Properties.Settings>
</applicationSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Property changes on: trunk/plugins/MyLyrics/My Lyrics
___________________________________________________________________
Modified: svn:ignore
- *.suo
*.user
thumbs.db
+ *.suo
*.user
thumbs.db
[Bb]in
obj
[Dd]ebug
[Rr]elease
*.aps
*.eto
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -80,7 +80,7 @@
this.lbInfo1.Name = "lbInfo1";
this.lbInfo1.Size = new System.Drawing.Size(197, 18);
this.lbInfo1.TabIndex = 3;
- this.lbInfo1.Text = "MyLyrics plugin, version 1.5.2.0";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.5.5.0";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -234,7 +234,7 @@
rdTrackBar_CheckedChanged(null, null);
tbLimit.Text = xmlreader.GetValueAsString("myLyrics", "limit", m_TotalTitles.ToString());
- tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics");
+ tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "Lyrics");
m_enableLogging = xmlreader.GetValue("myLyrics", "loggingEnabled").Equals("True");
cbEnableLogging.Checked = m_enableLogging;
@@ -251,7 +251,7 @@
cbMusicTagAlwaysCheck.Checked = m_automaticReadFromToMusicTag;
cbUseAutoScrollAsDefault.Checked = xmlreader.GetValue("myLyrics", "useAutoscroll").Equals("yes");
- tbLrcTaggingOffset.Text = xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "0");
+ tbLrcTaggingOffset.Text = xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "500");
tbLrcTaggingName.Text = xmlreader.GetValueAsString("myLyrics", "LrcTaggingName", "");
m_guidString = ((string) xmlreader.GetValueAsString("myLyrics", "Guid", ""));
@@ -1183,6 +1183,14 @@
cbLyrDB.Checked = false;
cbLyricsPluginSite.Checked = false;
+ cbLyricsOnDemand.Enabled = false;
+ cbLyrics007.Enabled = false;
+ cbLrcFinder.Enabled = false;
+ cbLyricsPluginSite.Enabled = false;
+ cbHotLyrics.Enabled = false;
+ cbActionext.Enabled = false;
+ cbLyrDB.Enabled = false;
+
cbMusicTagAlwaysCheck.Checked = false;
cbMusicTagWrite.Checked = true;
@@ -1230,7 +1238,9 @@
xmlwriter.SetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", cbMoveSongFrom.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticWriteToMusicTag", cbMusicTagWrite.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticReadFromMusicTag", cbMusicTagAlwaysCheck.Checked);
+ xmlwriter.SetValue("myLyrics", "LrcTaggingOffset", tbLrcTaggingOffset.Text);
+
string text = comboBoxLanguages.SelectedItem as string;
if (!string.IsNullOrEmpty(text))
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -704,7 +704,11 @@
(xmlreader.GetValueAsString("myLyrics", "useAutoOnLyricLength", "False")).Equals("yes")
? true
: false;
- _LrcTaggingOffset = (xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "0"));
+ _LrcTaggingOffset = (xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "´500"));
+
+ string strButtonText = (xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics"));
+ GUIPropertyManager.SetProperty("#currentmodule", strButtonText);
+
_LrcTaggingName = (xmlreader.GetValueAsString("myLyrics", "LrcTaggingName", ""));
_uploadLrcToLrcFinder =
@@ -919,11 +923,11 @@
return base.OnMessage(message);
}
- public override void OnAction(Action action)
+ public override void OnAction(MediaPortal.GUI.Library.Action action)
{
if (!enableMouseControl())
{
- if (action.wID == Action.ActionType.ACTION_MOUSE_MOVE)
+ if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOUSE_MOVE)
{
return;
}
@@ -933,21 +937,21 @@
switch (action.wID)
{
- case Action.ActionType.ACTION_PREVIOUS_MENU:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREVIOUS_MENU:
{
//_OkToCallPreviousMenu = true;
//GUIWindowManager.ShowPreviousWindow();
//return;
break;
}
- case Action.ActionType.ACTION_MOVE_LEFT:
- case Action.ActionType.ACTION_MOVE_RIGHT:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT:
{
if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
- if (action.wID == Action.ActionType.ACTION_MOVE_LEFT)
+ if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT)
_selectedinLRCPicker--;
- if (action.wID == Action.ActionType.ACTION_MOVE_RIGHT)
+ if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT)
_selectedinLRCPicker++;
if (_selectedinLRCPicker < 0)
@@ -965,7 +969,7 @@
}
break;
}
- case Action.ActionType.ACTION_SELECT_ITEM:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM:
{
if (!isFocusedBlacklisted())
{
@@ -976,7 +980,7 @@
}
break;
}
- case Action.ActionType.ACTION_KEY_PRESSED:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED:
{
if (/*action.m_key.KeyChar.Equals(13) || */action.m_key.KeyChar.Equals(35) || action.m_key.KeyChar.Equals(41)) // 'Enter' or '#' or ')'
{
@@ -1162,19 +1166,19 @@
}
break;
}
- case Action.ActionType.ACTION_REWIND:
- case Action.ActionType.ACTION_FORWARD:
- case Action.ActionType.ACTION_MUSIC_FORWARD:
- case Action.ActionType.ACTION_MUSIC_PLAY:
- case Action.ActionType.ACTION_MUSIC_REWIND:
- case Action.ActionType.ACTION_PAUSE:
- case Action.ActionType.ACTION_PLAY:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_REWIND:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_FORWARD:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_FORWARD:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_PLAY:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_REWIND:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAUSE:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_PLAY:
{
break;
}
- case Action.ActionType.ACTION_EXIT:
- case Action.ActionType.ACTION_END:
- case Action.ActionType.ACTION_SHUTDOWN:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_EXIT:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_END:
+ case MediaPortal.GUI.Library.Action.ActionType.ACTION_SHUTDOWN:
{
break;
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,7 +18,9 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -30,9 +33,9 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -214,6 +217,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -229,6 +237,11 @@
<ProductName>.NET Framework 3.5</ProductName>
<Install>false</Install>
</BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="change log.txt" />
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,4 +1,4 @@
-Release notes to MyLyrics 1.5.3.0
+Release notes to MyLyrics 1.5.5.0
MyLyrics displays the lyric of the currently played song inside MediaPortal.
The plugin can show LRC's and plain lyrics. It uses both musictags and online searches to find lyrics.
@@ -33,10 +33,7 @@
Compatible with MediaPortal 1.1.0 nad 1.1.1
-Changes and fixes since version 1.5.2.0
-- Fix: LyricsPluginSite changed once again and an invalid result was returned when no lyric was found.
-
-Changes and fixes since version 1.5.1.0
-- Fix: LyricsPluginSite fixed and reenabled (big thanks to yoavain).
-- Fix: Lyrics007 which didn't return valid result.
-- Rem: LyricWiki didn't work and could not be fixed.
+Changes and fixes since version 1.5.3.0
+- Add: Gui property #currentmodule returns user defined plugin name
+- Fix: LRC tagging offset value wasn't saved in version 1.5.2.0
+- Fix: Minor fixes in configuration
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/MyLyrics.sln
===================================================================
--- trunk/plugins/MyLyrics/MyLyrics.sln 2010-12-04 09:34:26 UTC (rev 4004)
+++ trunk/plugins/MyLyrics/MyLyrics.sln 2010-12-04 17:50:02 UTC (rev 4005)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LyricsEngine", "LyricsEngine\LyricsEngine.csproj", "{B0760CE8-086F-4301-9091-C9BE54F261FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLyrics", "My Lyrics\MyLyrics.csproj", "{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 09:34:32
|
Revision: 4004
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4004&view=rev
Author: chef_koch
Date: 2010-12-04 09:34:26 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
removing old bin directories before compiling new
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Build/BuildScript.bat
Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat 2010-12-04 09:25:17 UTC (rev 4003)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat 2010-12-04 09:34:26 UTC (rev 4004)
@@ -31,6 +31,12 @@
echo.
+echo Removing old binaries...
+RMDir /S /Q ..\bin\%BUILD_TYPE% >> %LOG%
+if not %ERRORLEVEL%==0 EXIT
+
+
+echo.
echo Writing SVN revision assemblies...
%DeployVersionSVN% /svn="..\IR Server Suite" >> %LOG%
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 09:25:23
|
Revision: 4003
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4003&view=rev
Author: chef_koch
Date: 2010-12-04 09:25:17 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
updated WiimoteLib.dll to 1.7.0
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
===================================================================
(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-04 09:23:07
|
Revision: 4002
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4002&view=rev
Author: chef_koch
Date: 2010-12-04 09:23:01 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
updated WiimoteLib.dll to 1.3.0
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2010-12-04 08:58:08 UTC (rev 4001)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2010-12-04 09:23:01 UTC (rev 4002)
@@ -202,7 +202,7 @@
_wiimote.WiimoteExtensionChanged += WiimoteExtensionChanged;
_wiimote.Connect();
- _wiimote.SetReportType(Wiimote.InputReport.IRAccel, true);
+ _wiimote.SetReportType(InputReport.IRAccel, true);
_wiimote.SetLEDs(_led1, _led2, _led3, _led4);
_wiimote.SetRumble(false);
}
@@ -379,8 +379,8 @@
if (ws.NunchukState.Z != _previousState.NunchukState.Z)
mouseButtons |= ws.NunchukState.Z ? Mouse.MouseEvents.LeftDown : Mouse.MouseEvents.LeftUp;
- int deltaX = (int) (ws.NunchukState.X * 10 * _mouseSensitivity);
- int deltaY = (int) (ws.NunchukState.Y * -10 * _mouseSensitivity);
+ int deltaX = (int) (ws.NunchukState.Joystick.X * 10 * _mouseSensitivity);
+ int deltaY = (int) (ws.NunchukState.Joystick.Y * -10 * _mouseSensitivity);
if (_handleMouseLocally)
{
@@ -440,10 +440,10 @@
RemoteCallback(Name, "WiimoteClassic_Pad:Up");
}
- if (ws.IRState.Found1 && ws.IRState.Found2)
+ if (ws.IRState.IRSensors[0].Found && ws.IRState.IRSensors[1].Found)
{
- int x = (int) (ScreenWidth - (ws.IRState.X1 + ws.IRState.X2) / 2 * ScreenWidth);
- int y = (int) ((ws.IRState.Y1 + ws.IRState.Y2) / 2 * ScreenHeight);
+ int x = (int)(ScreenWidth - (ws.IRState.IRSensors[0].Position.X + ws.IRState.IRSensors[1].Position.X) / 2 * ScreenWidth);
+ int y = (int)((ws.IRState.IRSensors[0].Position.Y + ws.IRState.IRSensors[1].Position.Y) / 2 * ScreenHeight);
if (_handleMouseLocally)
{
@@ -451,8 +451,8 @@
}
else
{
- int prevX = (int) (ScreenWidth - (_previousState.IRState.X1 + _previousState.IRState.X2) / 2 * ScreenWidth);
- int prevY = (int) ((_previousState.IRState.Y1 + _previousState.IRState.Y2) / 2 * ScreenHeight);
+ int prevX = (int)(ScreenWidth - (_previousState.IRState.IRSensors[0].Position.X + _previousState.IRState.IRSensors[1].Position.X) / 2 * ScreenWidth);
+ int prevY = (int)((_previousState.IRState.IRSensors[0].Position.Y + _previousState.IRState.IRSensors[1].Position.Y) / 2 * ScreenHeight);
int deltaX = x - prevX;
int deltaY = y - prevY;
@@ -495,23 +495,10 @@
_previousState.Extension = ws.Extension;
_previousState.ExtensionType = ws.ExtensionType;
- _previousState.IRState.Found1 = ws.IRState.Found1;
- _previousState.IRState.Found2 = ws.IRState.Found2;
- _previousState.IRState.MidX = ws.IRState.MidX;
- _previousState.IRState.MidY = ws.IRState.MidY;
+ _previousState.IRState.IRSensors = ws.IRState.IRSensors;
+ _previousState.IRState.Midpoint = ws.IRState.Midpoint;
_previousState.IRState.Mode = ws.IRState.Mode;
- _previousState.IRState.RawMidX = ws.IRState.RawMidX;
- _previousState.IRState.RawMidY = ws.IRState.RawMidY;
- _previousState.IRState.RawX1 = ws.IRState.RawX1;
- _previousState.IRState.RawX2 = ws.IRState.RawX2;
- _previousState.IRState.RawY1 = ws.IRState.RawY1;
- _previousState.IRState.RawY2 = ws.IRState.RawY2;
- _previousState.IRState.Size1 = ws.IRState.Size1;
- _previousState.IRState.Size2 = ws.IRState.Size2;
- _previousState.IRState.X1 = ws.IRState.X1;
- _previousState.IRState.X2 = ws.IRState.X2;
- _previousState.IRState.Y1 = ws.IRState.Y1;
- _previousState.IRState.Y2 = ws.IRState.Y2;
+ _previousState.IRState.RawMidpoint = ws.IRState.RawMidpoint;
_previousState.NunchukState.C = ws.NunchukState.C;
_previousState.NunchukState.Z = ws.NunchukState.Z;
@@ -520,9 +507,9 @@
private void WiimoteExtensionChanged(object sender, WiimoteExtensionChangedEventArgs args)
{
if (args.Inserted)
- _wiimote.SetReportType(Wiimote.InputReport.IRExtensionAccel, true);
+ _wiimote.SetReportType(InputReport.IRExtensionAccel, true);
else
- _wiimote.SetReportType(Wiimote.InputReport.IRAccel, true);
+ _wiimote.SetReportType(InputReport.IRAccel, true);
}
#endregion Implementation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 08:58:14
|
Revision: 4001
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4001&view=rev
Author: chef_koch
Date: 2010-12-04 08:58:08 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
updated WiimoteLib.dll to 1.2.1
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-04 08:45:42 UTC (rev 4000)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-04 08:58:08 UTC (rev 4001)
@@ -60,7 +60,10 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="WiimoteLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" />
+ <Reference Include="WiimoteLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>References\WiimoteLib.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionInfo.cs">
@@ -101,7 +104,6 @@
</ItemGroup>
<ItemGroup>
<Content Include="Icon.ico" />
- <Content Include="References\WiimoteLib.dll" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 08:45:49
|
Revision: 4000
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4000&view=rev
Author: chef_koch
Date: 2010-12-04 08:45:42 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
readded CommandProcessor.csproj, TestApp.csproj, Ira Transceiver.csproj and Tira Transceiver.csproj to the solution
disabled them for debug and release build configuration
disabled Tray Launcher for debug and release build
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/TestApp.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj 2010-12-04 08:45:42 UTC (rev 4000)
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{49CF376E-811C-4EB4-817F-A39C9529B608}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -10,8 +10,29 @@
<RootNamespace>Commands</RootNamespace>
<AssemblyName>CommandProcessor</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -35,8 +56,29 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <DocumentationFile>bin\Debug\CommandProcessor.xml</DocumentationFile>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <Optimize>true</Optimize>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
@@ -50,18 +92,6 @@
<Compile Include="Control Statements\CommandAbortMacro.cs" />
<Compile Include="Exceptions\MacroExecutionException.cs" />
<Compile Include="Exceptions\MacroStructureException.cs" />
- <Compile Include="Forms\CommandEditDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Forms\CommandEditDialog.Designer.cs">
- <DependentUpon>CommandEditDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Forms\ControlLabel.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Forms\ControlLabel.Designer.cs">
- <DependentUpon>ControlLabel.cs</DependentUpon>
- </Compile>
<Compile Include="Forms\EditAbortMessage.cs">
<SubType>Form</SubType>
</Compile>
@@ -172,14 +202,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Forms\CommandEditDialog.resx">
- <DependentUpon>CommandEditDialog.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Forms\ControlLabel.resx">
- <SubType>Designer</SubType>
- <DependentUpon>ControlLabel.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="Forms\EditAbortMessage.resx">
<DependentUpon>EditAbortMessage.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -261,6 +283,33 @@
<Content Include="Graphics\MoveUp.png" />
<Content Include="Graphics\Plus.png" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs 2010-12-04 08:45:42 UTC (rev 4000)
@@ -20,6 +20,7 @@
using System;
using System.Reflection;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/Resources.Designer.cs 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/Resources.Designer.cs 2010-12-04 08:45:42 UTC (rev 4000)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.832
+// Runtime Version:2.0.50727.4952
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs 2010-12-04 08:45:42 UTC (rev 4000)
@@ -20,6 +20,7 @@
using System;
using System.Reflection;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/TestApp.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/TestApp.csproj 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/TestApp.csproj 2010-12-04 08:45:42 UTC (rev 4000)
@@ -1,14 +1,35 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A86517F4-BBCF-4D56-B0CA-C9E36AFAC550}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestApp</RootNamespace>
<AssemblyName>TestApp</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -32,6 +53,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -57,6 +81,33 @@
<Name>VariableList</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj 2010-12-04 08:45:42 UTC (rev 4000)
@@ -10,6 +10,8 @@
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Ira Transceiver</AssemblyName>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -36,7 +38,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
@@ -61,6 +63,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
@@ -104,7 +109,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs 2010-12-04 08:45:42 UTC (rev 4000)
@@ -20,6 +20,7 @@
using System;
using System.Reflection;
+using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj 2010-12-04 08:45:42 UTC (rev 4000)
@@ -10,6 +10,8 @@
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Tira Transceiver</AssemblyName>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -61,6 +63,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
@@ -117,7 +122,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2010-12-04 08:43:11 UTC (rev 3999)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2010-12-04 08:45:42 UTC (rev 4000)
@@ -129,6 +129,20 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRServer.Shared", "IR Server\IRServer.Shared\IRServer.Shared.csproj", "{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "Commands\TestApp\TestApp.csproj", "{A86517F4-BBCF-4D56-B0CA-C9E36AFAC550}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandProcessor", "Commands\CommandProcessor\CommandProcessor.csproj", "{49CF376E-811C-4EB4-817F-A39C9529B608}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "disabled", "disabled", "{6AA1F598-03AD-427F-AA58-A0D967D42D4B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "disabled", "disabled", "{EAE43789-D389-4EE3-AAB7-843135F877B0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "disabled", "disabled", "{6E178F04-C237-4292-A964-4D3C935EB035}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ira Transceiver", "IR Server Plugins\Ira Transceiver\Ira Transceiver.csproj", "{0E045E97-EEB2-461C-A416-CFC8E452E044}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tira Transceiver", "IR Server Plugins\Tira Transceiver\Tira Transceiver.csproj", "{6137C390-DDB0-44B0-8ED5-51B45C0D4404}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
@@ -136,9 +150,7 @@
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.ActiveCfg = Debug|x86
- {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.Build.0 = Debug|x86
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|x86.ActiveCfg = Release|x86
- {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|x86.Build.0 = Release|x86
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|x86.ActiveCfg = Debug|x86
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|x86.Build.0 = Debug|x86
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|x86.ActiveCfg = Release|x86
@@ -371,12 +383,19 @@
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Debug|x86.Build.0 = Debug|x86
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|x86.ActiveCfg = Release|x86
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|x86.Build.0 = Release|x86
+ {A86517F4-BBCF-4D56-B0CA-C9E36AFAC550}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A86517F4-BBCF-4D56-B0CA-C9E36AFAC550}.Release|x86.ActiveCfg = Release|Any CPU
+ {49CF376E-811C-4EB4-817F-A39C9529B608}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {49CF376E-811C-4EB4-817F-A39C9529B608}.Release|x86.ActiveCfg = Release|Any CPU
+ {0E045E97-EEB2-461C-A416-CFC8E452E044}.Debug|x86.ActiveCfg = Debug|x86
+ {0E045E97-EEB2-461C-A416-CFC8E452E044}.Release|x86.ActiveCfg = Release|x86
+ {6137C390-DDB0-44B0-8ED5-51B45C0D4404}.Debug|x86.ActiveCfg = Debug|x86
+ {6137C390-DDB0-44B0-8ED5-51B45C0D4404}.Release|x86.ActiveCfg = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
@@ -393,6 +412,7 @@
{097F7027-77A1-4623-8D6C-3D2020769EFD} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{58BFF250-541B-4AA4-A62D-ACB819AD317B} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
+ {EAE43789-D389-4EE3-AAB7-843135F877B0} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{7C686499-7517-4338-8837-7E8617549D9A} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
@@ -423,6 +443,7 @@
{EC37743A-64B2-472A-9EB6-CB052AD2B35C} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{EBFA0F67-1EB6-4282-8475-C397B9852B3F} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{D88EDBC1-D583-4149-9873-8239FA63F4FE} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
+ {6E178F04-C237-4292-A964-4D3C935EB035} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{CA15769C-232E-4CA7-94FD-206A06CA3ABB} = {E757F80C-23C5-4AD6-B178-16799E337E03}
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {E757F80C-23C5-4AD6-B178-16799E337E03}
{28923F6E-8A68-4BC8-A507-825B09C3F64E} = {E757F80C-23C5-4AD6-B178-16799E337E03}
@@ -435,6 +456,12 @@
{21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
{D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
+ {6AA1F598-03AD-427F-AA58-A0D967D42D4B} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
+ {49CF376E-811C-4EB4-817F-A39C9529B608} = {6AA1F598-03AD-427F-AA58-A0D967D42D4B}
+ {A86517F4-BBCF-4D56-B0CA-C9E36AFAC550} = {6AA1F598-03AD-427F-AA58-A0D967D42D4B}
+ {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A} = {EAE43789-D389-4EE3-AAB7-843135F877B0}
+ {6137C390-DDB0-44B0-8ED5-51B45C0D4404} = {6E178F04-C237-4292-A964-4D3C935EB035}
+ {0E045E97-EEB2-461C-A416-CFC8E452E044} = {6E178F04-C237-4292-A964-4D3C935EB035}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
VisualSVNWorkingCopyRoot = ..
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 08:43:17
|
Revision: 3999
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3999&view=rev
Author: chef_koch
Date: 2010-12-04 08:43:11 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
Property Changed:
----------------
trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/
trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 08:16:23
|
Revision: 3998
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3998&view=rev
Author: chef_koch
Date: 2010-12-04 08:16:12 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
added SolutionInfo.cs for shared AssemblyInformation
removed shared AssemblyInformation from AssemblyInfo.cs files
BuildScript.bat: DeployVersionSVN is only needed for IRServer directory now
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Build/BuildScript.bat
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/TestApp.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/Virtual Remote (PocketPC2003).csproj
trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/Virtual Remote (Smartphone2003).csproj
trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/Virtual Remote (WinCE5).csproj
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/SolutionInfo.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/AssemblyInfo.cs
Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat 2010-12-04 08:16:12 UTC (rev 3998)
@@ -32,7 +32,7 @@
echo.
echo Writing SVN revision assemblies...
-%DeployVersionSVN% /svn=".." >> %LOG%
+%DeployVersionSVN% /svn="..\IR Server Suite" >> %LOG%
echo.
@@ -52,11 +52,11 @@
echo.
echo Reverting assemblies...
-%DeployVersionSVN% /svn=".." /revert >> %LOG%
+%DeployVersionSVN% /svn="..\IR Server Suite" /revert >> %LOG%
echo.
echo Reading the svn revision...
-%DeployVersionSVN% /svn=".." /GetVersion >> %LOG%
+%DeployVersionSVN% /svn="..\IR Server Suite" /GetVersion >> %LOG%
rem SET /p version=<version.txt >> build.log
SET version=%errorlevel%
DEL version.txt >> %LOG%
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -72,6 +72,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -79,7 +83,6 @@
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="MainForm.resx">
<SubType>Designer</SubType>
<DependentUpon>MainForm.cs</DependentUpon>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,62 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
+//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+//
[assembly: AssemblyTitle("Abstractor")]
[assembly: AssemblyDescription("Abstract Remote Map Creator")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("Abstractor")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("4d23d334-3b85-4d33-85a2-0071812ce053")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -66,6 +66,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SetupForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -73,7 +77,6 @@
<DependentUpon>SetupForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="SetupForm.resx">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,62 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
+//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+//
[assembly: AssemblyTitle("Dbox Tuner")]
[assembly: AssemblyDescription("Tune channels on a Dreambox - based on Mark Koenig's MediaPortal plugin")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("Dbox Tuner")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("C4021B4F-1451-4a84-BF3B-213C254290D8")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,6 +65,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -72,7 +76,6 @@
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MainForm.resx">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
//
// General Information about an assembly is controlled through the following
@@ -33,32 +30,5 @@
[assembly: AssemblyTitle("Debug Client")]
[assembly: AssemblyDescription("Debug client for IR Server")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("DebugClient")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: Guid("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -55,8 +55,11 @@
</Reference>
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,60 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
+using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
+//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+//
[assembly: AssemblyTitle("HCW PVR Tuner")]
[assembly: AssemblyDescription("Command line tuner for Hauppauge PVR devices")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("HCW PVR Tuner")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("57d8b7f1-678f-4169-80ba-e190dd01fba4")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,8 +65,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
//
// General Information about an assembly is controlled through the following
@@ -33,32 +30,5 @@
[assembly: AssemblyTitle("IR Blast")]
[assembly: AssemblyDescription("Command line application for blasting IR commands to IR Server")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("IRBlast")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: Guid("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -67,8 +67,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
//
// General Information about an assembly is controlled through the following
@@ -33,32 +30,5 @@
[assembly: AssemblyTitle("IR Blast (No Window)")]
[assembly: AssemblyDescription("Command line application for blasting IR commands to IR Server")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("IRBlastNoWindow")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: Guid("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,6 +65,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -76,7 +80,6 @@
<Compile Include="MceDetectionData.cs" />
<Compile Include="Program.cs" />
<Compile Include="Pronto.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RemoteDetectionData.cs" />
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,60 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
+using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
+//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+//
[assembly: AssemblyTitle("IR File Tool")]
[assembly: AssemblyDescription("For learning, modifying, testing, correcting and converting IR command files")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("IR File Tool")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("74144852-ec06-4af4-925f-459e8053b2f8")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,8 +65,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,62 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
+//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+//
[assembly: AssemblyTitle("Keyboard Input Relay")]
[assembly: AssemblyDescription("Relays keyboard input to the IR Server to use like remote button presses")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("Keyboard Input Relay")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("cf85e48e-e867-49e5-b240-693378fdd11c")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -54,8 +54,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,60 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
+using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
+//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+//
[assembly: AssemblyTitle("LogTimeCodeExtractor")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LogTimeCodeExtractor")]
-[assembly: AssemblyCopyright("Copyright � 2008")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("a20b9b41-55a2-454d-a461-9b4a77abdcf3")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -61,6 +61,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -68,7 +72,6 @@
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="MainForm.resx">
<SubType>Designer</SubType>
<DependentUpon>MainForm.cs</DependentUpon>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs 2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
// http://www.team-mediaportal.com
//
-// This Program is free software; you can redistribute it and/or modify
+// MediaPortal 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.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
//
-// This Program is distributed in the hope that it will be useful,
+// MediaPortal 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
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Reflection;
using System.Resources;
-using System.Runtime.InteropServices;
//
// General Information about an assembly is controlled through the following
@@ -33,32 +30,5 @@
[assembly: AssemblyTitle("MacroScope")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("MacroScope")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("3b4dbc18-a931-42eb-aa55-fc96a32f215f")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj 2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj 2010-12-04 08:16:12 UTC (rev 3998)
@@ -70,6 +70,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\SolutionInfo.cs">
+ <Link>Properties\SolutionInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ExternalChannelConfig.cs" />
<Compile Include="Forms\ExternalChannels.cs">
<SubType>Form</SubType>
@@ -97,7 +101,6 @@
</Compile>
<Compile Include="Program.cs">
</Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</Aut...
[truncated message content] |
|
From: <che...@us...> - 2010-12-04 08:01:43
|
Revision: 3997
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3997&view=rev
Author: chef_koch
Date: 2010-12-04 08:01:37 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/Properties/
Property Changed:
----------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote
___________________________________________________________________
Modified: svn:ignore
- [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
+ [Bb]in
[Oo]bj
[Dd]ebug
[Rr]elease
_ReSharper.*
thumbs.db
*.aps
*.bak
*.cache
*.eto
*.exe
*.log
*.mpe1
*.patch
*.suo
*.user
obj
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-04 07:51:46
|
Revision: 3996
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3996&view=rev
Author: chef_koch
Date: 2010-12-04 07:51:39 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
added errorlevel-check after building solutions, if error occurred stop immediately
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Build/BuildScript.bat
Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat 2010-12-03 15:54:31 UTC (rev 3995)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat 2010-12-04 07:51:39 UTC (rev 3996)
@@ -39,13 +39,14 @@
echo Building IR Server Suite...
rem "%ProgramDir%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\IR Server Suite\IR Server Suite.sln" >> %LOG%
"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86;AllowUnsafeBlocks=true "..\IR Server Suite\IR Server Suite.sln" >> %LOG%
+if not %ERRORLEVEL%==0 EXIT
-
if not %2!==MPplugins! goto NoMPplugins
echo.
echo Building MediaPortal plugins...
"%ProgramDir%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
rem "%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
+if not %ERRORLEVEL%==0 EXIT
:NoMPplugins
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-03 15:54:37
|
Revision: 3995
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3995&view=rev
Author: chef_koch
Date: 2010-12-03 15:54:31 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
removed WiimoteLib source
added WiimoteLib binary as reference
using new output directory for plugins in install script
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/setup/setup.nsi
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-03 15:22:48 UTC (rev 3994)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-03 15:54:31 UTC (rev 3995)
@@ -60,6 +60,7 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
+ <Reference Include="WiimoteLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup>
<Compile Include="Mouse.cs" />
@@ -83,10 +84,6 @@
<Name>IR Server Plugin Interface</Name>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\WiimoteLib\WiimoteLib.csproj">
- <Project>{37A555DF-7012-4B99-8A47-1C922A361E52}</Project>
- <Name>WiimoteLib</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
@@ -101,6 +98,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Icon.ico" />
+ <Content Include="References\WiimoteLib.dll" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -111,6 +109,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"
+xcopy /Y "$(ProjectDir)References\*.dll" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2010-12-03 15:22:48 UTC (rev 3994)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2010-12-03 15:54:31 UTC (rev 3995)
@@ -63,8 +63,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wii Remote Receiver", "IR Server Plugins\Wii Remote Receiver\Wii Remote Receiver.csproj", "{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WiimoteLib", "IR Server Plugins\WiimoteLib\WiimoteLib.csproj", "{37A555DF-7012-4B99-8A47-1C922A361E52}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Direct Input Receiver", "IR Server Plugins\Direct Input Receiver\Direct Input Receiver.csproj", "{732CDF64-D047-4D3C-91DA-E2FF27D84179}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ads Tech PTV-335 Receiver", "IR Server Plugins\Ads Tech PTV-335 Receiver\Ads Tech PTV-335 Receiver.csproj", "{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB}"
@@ -241,10 +239,6 @@
{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Debug|x86.Build.0 = Debug|x86
{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Release|x86.ActiveCfg = Release|x86
{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Release|x86.Build.0 = Release|x86
- {37A555DF-7012-4B99-8A47-1C922A361E52}.Debug|x86.ActiveCfg = Debug|x86
- {37A555DF-7012-4B99-8A47-1C922A361E52}.Debug|x86.Build.0 = Debug|x86
- {37A555DF-7012-4B99-8A47-1C922A361E52}.Release|x86.ActiveCfg = Release|x86
- {37A555DF-7012-4B99-8A47-1C922A361E52}.Release|x86.Build.0 = Release|x86
{732CDF64-D047-4D3C-91DA-E2FF27D84179}.Debug|x86.ActiveCfg = Debug|x86
{732CDF64-D047-4D3C-91DA-E2FF27D84179}.Debug|x86.Build.0 = Debug|x86
{732CDF64-D047-4D3C-91DA-E2FF27D84179}.Release|x86.ActiveCfg = Release|x86
@@ -414,7 +408,6 @@
{A4023992-CCD6-461E-8E14-219A496734C5} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{5A9954F8-344C-489C-B8DA-8E8927271A02} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
- {37A555DF-7012-4B99-8A47-1C922A361E52} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{732CDF64-D047-4D3C-91DA-E2FF27D84179} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
@@ -434,11 +427,11 @@
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {E757F80C-23C5-4AD6-B178-16799E337E03}
{28923F6E-8A68-4BC8-A507-825B09C3F64E} = {E757F80C-23C5-4AD6-B178-16799E337E03}
{28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03}
+ {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
{46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
{1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
{5C0DF76E-D1AE-4161-B8D1-843925C8AB58} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
- {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
{21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
{D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi 2010-12-03 15:22:48 UTC (rev 3994)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi 2010-12-03 15:54:31 UTC (rev 3995)
@@ -376,44 +376,7 @@
File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*"
${LOG_TEXT} "INFO" "Installing IR Server Plugins..."
- SetOutPath "$DIR_INSTALL\Plugins"
-
- File "..\IR Server Suite\IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${Build_Type}\Ads Tech PTV-335 Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Custom HID Receiver\bin\${Build_Type}\Custom HID Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Direct Input Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\FireDTV Receiver\bin\${Build_Type}\FireDTV Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\FusionRemote Receiver\bin\${Build_Type}\FusionRemote Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*"
- File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\IgorPlug Receiver\bin\${Build_Type}\IgorPlug Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Imon USB Receivers\bin\${Build_Type}\Imon USB Receivers.*"
- File "..\IR Server Suite\IR Server Plugins\IR501 Receiver\bin\${Build_Type}\IR501 Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\IR507 Receiver\bin\${Build_Type}\IR507 Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\IRMan Receiver\bin\${Build_Type}\IRMan Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\IRTrans Transceiver\bin\${Build_Type}\IRTrans Transceiver.*"
- File "..\IR Server Suite\IR Server Plugins\Keyboard Input\bin\${Build_Type}\Keyboard Input.*"
- File "..\IR Server Suite\IR Server Plugins\LiveDrive Receiver\bin\${Build_Type}\LiveDrive Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\MacMini Receiver\bin\${Build_Type}\MacMini Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Microsoft MCE Transceiver\bin\${Build_Type}\Microsoft MCE Transceiver.*"
- File "..\IR Server Suite\IR Server Plugins\Pinnacle Serial Receiver\bin\${Build_Type}\Pinnacle Serial Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\RC102 Receiver\bin\${Build_Type}\RC102 Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\RedEye Blaster\bin\${Build_Type}\RedEye Blaster.*"
- File "..\IR Server Suite\IR Server Plugins\Serial IR Blaster\bin\${Build_Type}\Serial IR Blaster.*"
- File "..\IR Server Suite\IR Server Plugins\Speech Receiver\bin\${Build_Type}\Speech Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\Technotrend Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\ttBdaDrvApi_Dll.dll"
- File "..\IR Server Suite\IR Server Plugins\USB-UIRT Transceiver\bin\${Build_Type}\USB-UIRT Transceiver.*"
- File "..\IR Server Suite\IR Server Plugins\Wii Remote Receiver\bin\${Build_Type}\Wii Remote Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\WiimoteLib\bin\${Build_Type}\WiimoteLib.*"
- File "..\IR Server Suite\IR Server Plugins\Windows Message Receiver\bin\${Build_Type}\Windows Message Receiver.*"
- File "..\IR Server Suite\IR Server Plugins\WinLirc Transceiver\bin\${Build_Type}\WinLirc Transceiver.*"
- File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\X10 Transceiver.*"
- File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\Interop.X10.dll"
- File "..\IR Server Suite\IR Server Plugins\XBCDRC Receiver\bin\${Build_Type}\XBCDRC Receiver.*"
- ; Ira project is not compiling currently
- ; File "..\IR Server Suite\IR Server Plugins\Ira Transceiver\bin\${Build_Type}\Ira Transceiver.*"
- ; File "..\IR Server Suite\IR Server Plugins\Tira Transceiver\bin\${Build_Type}\Tira Transceiver.*"
+ File /r "${svn_ROOT_IRSS}\bin\${Build_Type}\Plugins"
; Create App Data Folder for IR Server configuration files
CreateDirectory "${COMMON_APPDATA}\IR Server"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-03 15:22:54
|
Revision: 3994
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3994&view=rev
Author: chef_koch
Date: 2010-12-03 15:22:48 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
fixed location for compiled IRServer.exe
Modified Paths:
--------------
trunk/plugins/IR Server Suite/setup/setup.nsi
Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi 2010-12-03 15:10:31 UTC (rev 3993)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi 2010-12-03 15:22:48 UTC (rev 3994)
@@ -360,7 +360,7 @@
SetOutPath "$DIR_INSTALL"
${LOG_TEXT} "INFO" "Installing IR Server..."
- File "..\IR Server Suite\IR Server\IR Server\bin\${Build_Type}\IR Server.*"
+ File "${svn_ROOT_IRSS}\bin\${Build_Type}\IR Server.???"
File "..\IR Server Suite\IR Server\IR Server\Install.cmd"
File "..\IR Server Suite\IR Server\IR Server\Uninstall.cmd"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-03 15:10:39
|
Revision: 3993
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3993&view=rev
Author: chef_koch
Date: 2010-12-03 15:10:31 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
copy plugin dlls to irservers outdir during postbuild
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Ads Tech PTV-335 Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -96,4 +96,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>CoolCommand Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -98,7 +98,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Custom HID Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
@@ -128,7 +128,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Direct Input Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>
</StartupObject>
@@ -113,4 +113,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -14,6 +14,7 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -125,4 +126,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>FusionREMOTE Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -101,7 +101,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Girder Plugin</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -110,7 +110,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>HCW Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -112,7 +112,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -16,6 +16,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -95,4 +96,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -18,6 +18,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -100,4 +101,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>IRMan Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -106,7 +106,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>IRTrans Transceiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -112,7 +112,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>IgorPlug Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>
</StartupObject>
@@ -104,7 +104,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Imon USB Receivers</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
@@ -116,7 +116,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -18,6 +18,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -93,4 +94,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -16,6 +16,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -103,4 +104,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -16,6 +16,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -96,4 +97,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Microsoft MCE Transceiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
@@ -133,7 +133,8 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"
+rem xcopy /Y "$(TargetDir)DefaultRemoteMap.xml" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"
+rem xcopy /Y "$(ProjectDir)References\*.dll" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Pinnacle Serial Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>
</StartupObject>
@@ -108,7 +108,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -16,6 +16,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -94,4 +95,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>RedEye Blaster</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -105,7 +105,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Serial IR Blaster</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -105,7 +105,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -15,6 +15,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -92,4 +93,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Technotrend Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>
</StartupObject>
@@ -110,7 +110,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>USB-UIRT Transceiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -110,7 +110,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Wii Remote Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -111,7 +111,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -26,6 +26,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -95,4 +96,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>WinLirc Transceiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -124,7 +124,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>Windows Message Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -108,7 +108,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>X10 Transceiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -115,7 +115,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj 2010-12-03 14:09:56 UTC (rev 3992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj 2010-12-03 15:10:31 UTC (rev 3993)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>XBCDRC Receiver</AssemblyName>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>
</StartupObject>
@@ -100,7 +100,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ 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-03 14:10:02
|
Revision: 3992
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3992&view=rev
Author: chef_koch
Date: 2010-12-03 14:09:56 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
changed output path for IRServer
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2010-12-03 07:14:42 UTC (rev 3991)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2010-12-03 14:09:56 UTC (rev 3992)
@@ -63,12 +63,12 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\..\bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\..\bin\Release\</OutputPath>
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-12-03 07:14:48
|
Revision: 3991
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3991&view=rev
Author: chef_koch
Date: 2010-12-03 07:14:42 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
backup (old) file extensions changed from *.bak to *.old.log
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssLog.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssLog.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssLog.cs 2010-12-03 07:03:11 UTC (rev 3990)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssLog.cs 2010-12-03 07:14:42 UTC (rev 3991)
@@ -41,7 +41,7 @@
/// <summary>
/// File extension for log file backups.
/// </summary>
- public const string ExtensionBackupFile = ".bak";
+ public const string ExtensionBackupFile = ".old.log";
#endregion Constants
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-03 07:03:17
|
Revision: 3990
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3990&view=rev
Author: kroko_koenig
Date: 2010-12-03 07:03:11 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
pictures fixed and slightshow, single instance
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.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-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-03 07:03:11 UTC (rev 3990)
@@ -3,13 +3,13 @@
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">
+ <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">
+ <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" />
@@ -17,17 +17,17 @@
</activity>
<activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
<activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
- <activity android:name=".Pictures"></activity>
- <activity android:name=".Picturesfullscreen"></activity>
- <activity android:name=".MusicDir"></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"></activity>
- <activity android:name=".nowplaylist"></activity>
- <activity android:name=".MusicArtist"></activity>
- <activity android:name=".MusicAlbum"></activity>
- <activity android:name=".MusicSong"></activity>
- <activity android:name=".MusicTab"></activity>
- <activity android:name=".MusicResults"></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>
</application>
<uses-sdk android:minSdkVersion="3" />
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-03 07:03:11 UTC (rev 3990)
@@ -74,7 +74,6 @@
}
return bitmap;
-
}
public void DownloadFile() {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-03 07:03:11 UTC (rev 3990)
@@ -45,8 +45,10 @@
private Handler mHandler = new Handler();
public static String actualDir = "";
+
public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
-
+ public static int selectedPicture;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -66,7 +68,7 @@
picItem pic = (picItem) iv.getTag();
if (pic.typ == "item") {
- Picturesfullscreen.selectedPicture = position - 1;
+ selectedPicture = position - 1;
Intent myIntent = new Intent(Pictures.this,
Picturesfullscreen.class);
startActivityForResult(myIntent, 0);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-03 07:03:11 UTC (rev 3990)
@@ -24,8 +24,16 @@
import mediaportal.remote.R;
import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
import android.os.Bundle;
+import android.os.Handler;
+import android.view.ContextMenu;
import android.view.GestureDetector;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
import android.view.GestureDetector.OnGestureListener;
import android.view.MotionEvent;
import android.widget.ImageView;
@@ -39,8 +47,11 @@
private static final int SWIPE_THRESHOLD_VELOCITY = 200;
private GestureDetector gestureScanner;
- public static int selectedPicture = 0;
+ private Handler mHandler = new Handler();
+ private boolean slideShow;
+ private boolean randomShow;
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -49,12 +60,21 @@
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() {
ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+ DirItems item = Pictures.pictureList.get(Pictures.selectedPicture);
- DirItems item = Pictures.pictureList.get(selectedPicture);
-
httpHandler http = new httpHandler();
- String file = "http://" + Settings.Server + ":" + Settings.Port + "/pictures/";
+ String file = "http://" + Settings.Server + ":" + Settings.Port
+ + "/pictures/";
file += Pictures.actualDir + item.File;
item.Picture = http.DownloadImage(file);
imagev.setImageBitmap(item.Picture);
@@ -64,6 +84,77 @@
}
@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();
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 2000);
+ }
+
+ private Runnable mUpdateTimeTask = new Runnable() {
+ public void run() {
+
+ if (slideShow) {
+ 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";
+ httpHandler handler = new httpHandler();
+
+ Bitmap pic = handler.DownloadImage(req);
+
+ ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+ imagev.setImageBitmap(pic);
+ }
+ }
+
+ mHandler.postDelayed(mUpdateTimeTask, 2000);
+ }
+ };
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ }
+
+ @Override
public boolean onTouchEvent(MotionEvent me) {
return gestureScanner.onTouchEvent(me);
}
@@ -71,36 +162,32 @@
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) {
- Toast.makeText(Picturesfullscreen.this, "Left Swipe",
- Toast.LENGTH_SHORT).show();
- // picturehandler pic = picturehandler.getinstance();
- // pic.selectedPicture += 1;
- // if(pic.selectedPicture>=pic.getpictures().gettitle().size())
- // pic.selectedPicture = 0;
- // ImageView imagev = (ImageView)
- // findViewById(R.id.ImageView01);
- // imagev.setImageBitmap(pic.getselectedPicture());
- // TextView txt = (TextView) findViewById(R.id.full_text);
- // txt.setText(pic.selectedPictureName);
+ if (Pictures.selectedPicture < max - 1) {
+ Pictures.selectedPicture++;
+ setPicture();
+ } else
+ 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) {
- Toast.makeText(Picturesfullscreen.this, "Right Swipe",
+
+ if (Pictures.selectedPicture > 0) {
+ Pictures.selectedPicture--;
+ setPicture();
+ }
+ Toast.makeText(Picturesfullscreen.this, "reached end -",
Toast.LENGTH_SHORT).show();
- // picturehandler pic = picturehandler.getinstance();
- // pic.selectedPicture -= 1;
- // if(pic.selectedPicture<=0)
- // pic.selectedPicture = pic.getpictures().gettitle().size();
- // ImageView imagev = (ImageView)
- // findViewById(R.id.ImageView01);
- // imagev.setImageBitmap(pic.getselectedPicture());
- // TextView txt = (TextView) findViewById(R.id.full_text);
- // txt.setText(pic.selectedPictureName);
+
}
} catch (Exception e) {
// nothing
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-12-01 18:50:49
|
Revision: 3989
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3989&view=rev
Author: kroko_koenig
Date: 2010-12-01 18:50:41 +0000 (Wed, 01 Dec 2010)
Log Message:
-----------
more remote and gfx
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/pictures.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.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/splash.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.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/ReceiveDirectoryXmlHandler.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/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Release/Android Server communication.docx
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml
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/splash02.jpg
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -15,12 +15,12 @@
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".Remote_01"></activity>
- <activity android:name=".Remote_02"></activity>
+ <activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
+ <activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
<activity android:name=".Pictures"></activity>
- <activity android:name=".picturesfullscreen"></activity>
+ <activity android:name=".Picturesfullscreen"></activity>
<activity android:name=".MusicDir"></activity>
- <activity android:name=".Setup"></activity>
+ <activity android:name=".Setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying"></activity>
<activity android:name=".nowplaylist"></activity>
<activity android:name=".MusicArtist"></activity>
@@ -32,5 +32,6 @@
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.INTERNET"></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
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_EXIT</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_HIBERNATE</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_REBOOT</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_POWER_OFF</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_SUSPEND</command>
+</message>
\ 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-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -20,36 +20,49 @@
public static final int back=0x7f020006;
public static final int back_icon=0x7f020007;
public static final int border=0x7f020008;
- public static final int cdcover=0x7f020009;
- public static final int close_icon=0x7f02000a;
- public static final int document=0x7f02000b;
- public static final int down_icon=0x7f02000c;
- public static final int folder=0x7f02000d;
- public static final int folderback=0x7f02000e;
- public static final int foldertab=0x7f02000f;
- public static final int foldertab_off=0x7f020010;
- public static final int forward=0x7f020011;
- public static final int ic_tab=0x7f020012;
- public static final int ic_tab1=0x7f020013;
- public static final int ic_tab2=0x7f020014;
- public static final int ic_tab3=0x7f020015;
- public static final int ic_tab4=0x7f020016;
- public static final int icon=0x7f020017;
- public static final int music_logo=0x7f020018;
- public static final int next_icon=0x7f020019;
- public static final int nowplaying_logo=0x7f02001a;
- public static final int pause=0x7f02001b;
- public static final int picture=0x7f02001c;
- public static final int pictures_logo=0x7f02001d;
- public static final int play=0x7f02001e;
- public static final int remote_logo=0x7f02001f;
- public static final int rewind=0x7f020020;
- public static final int song=0x7f020021;
- public static final int song_off=0x7f020022;
- public static final int splash=0x7f020023;
- public static final int stop=0x7f020024;
- public static final int up_icon=0x7f020025;
- public static final int videos_logo=0x7f020026;
+ 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 class id {
public static final int GridView01=0x7f050010;
@@ -64,9 +77,13 @@
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;
@@ -74,11 +91,18 @@
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;
@@ -102,10 +126,10 @@
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=0x7f050039;
- public static final int server_macid=0x7f05003b;
- public static final int server_port=0x7f05003a;
- public static final int title=0x7f05003c;
+ 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;
@@ -135,8 +159,7 @@
public static final int title=0x7f030011;
}
public static final class string {
- public static final int app_name=0x7f040001;
- public static final int hello=0x7f040000;
+ public static final int app_name=0x7f040000;
}
public static final class styleable {
/** Attributes that can be used with a Gallery1.
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/splash02.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/splash02.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -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/GridView01" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:columnWidth="90dp"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,6 +1,6 @@
<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">
<TextView android:id="@+id/full_text" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="name"
android:gravity="center_horizontal" android:background="#FFFFFFFF"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -3,7 +3,6 @@
android:id="@+id/widget0"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/back"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
@@ -17,8 +16,7 @@
<LinearLayout
android:id="@+id/widget00"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
+ android:layout_height="wrap_content" android:layout_marginTop="5dip">
<Button android:id="@+id/btnFBack"
android:layout_width="80dip"
@@ -78,20 +76,16 @@
<Button android:id="@+id/btnHome"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Home">
+ android:text="Home" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnUp"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/up_icon">
+ android:background="@drawable/up_icon" android:layout_width="160dip" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnInfo"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Info">
+ android:text="Info" android:layout_height="50dip">
</Button>
</LinearLayout>
@@ -108,9 +102,7 @@
</Button>
<Button android:id="@+id/btnOk"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/accept_icon">
+ android:background="@drawable/accept_icon" android:layout_width="160dip" android:layout_height="80dip">
</Button>
<Button android:id="@+id/btnRight"
@@ -128,20 +120,17 @@
<Button android:id="@+id/btnMenu"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Menu">
+ android:text="Menu" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnDown"
android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/down_icon">
+ android:background="@drawable/down_icon" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnBack"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Back">
+ android:text="Back" android:layout_height="50dip">
</Button>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,17 +1,100 @@
<?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/back"
- 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="Menu 02"
- android:gravity="center_horizontal" android:background="#FFFFFFFF"
- android:textSize="15dip"
+<LinearLayout android:id="@+id/widget0"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ 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:background="#FFFFFFFF" android:textSize="15dip"
android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
</TextView>
-
+
+ <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:id="@+id/btnVolumeUp" android:layout_width="80dip"
+ android:layout_height="60dip" android:text="Vol. +">
+ </Button>
+
+ <Button android:id="@+id/btnChannelUp" android:layout_width="80dip"
+ android:layout_marginLeft="40dip" android:layout_height="60dip"
+ android:text="Ch. +">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_height="wrap_content" android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical">
+
+ <Button android:layout_width="80dip" android:layout_height="60dip"
+ android:text="Mute" android:id="@+id/btnVolumeMute">
+ </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/btnVolumeDown" android:layout_width="80dip"
+
+ android:layout_height="60dip" android:text="Vol.- -">
+ </Button>
+
+ <Button android:id="@+id/btnChannelDown" android:layout_width="80dip"
+ android:layout_marginLeft="40dip" android:layout_height="60dip"
+ android:text="Ch. -">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_width="fill_parent" android:layout_marginTop="20dip"
+ android:layout_height="wrap_content">
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Exit" android:textColor="#FFFFFFFF"
+ android:id="@+id/btnExit" android:background="@drawable/button_close_nofocus"
+ android:gravity="bottom|center">
+ </Button>
+
+ <Button android:textSize="12dip" android:layout_height="60dip"
+ android:text="Suspend" android:textColor="#FFFFFFFF" android:id="@+id/btnSuspend"
+ android:background="@drawable/button_standby_focus" android:gravity="bottom|center"
+ android:layout_width="60dip">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Hibernate"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnHibernate"
+ android:background="@drawable/button_hibernate_focus"
+ android:gravity="bottom|center">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Restart"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnRestart"
+ android:background="@drawable/button_restart_focus"
+ android:gravity="bottom|center">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Shut off"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnShutOff"
+ android:background="@drawable/button_shutdown_focus" android:gravity="bottom|center">
+ </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:text="Wake On Lan"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnWakeOnLan"
+ android:background="@drawable/button_wakeup_focus" android:gravity="bottom|center">
+ </Button>
+ </LinearLayout>
+
</LinearLayout>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ImageView android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:src="@drawable/splash"
+ android:layout_height="fill_parent" android:src="@drawable/splash02"
android:scaleType="fitXY">
</ImageView>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="hello">Hello World, main!</string>
<string name="app_name">MediaPortal Remote</string>
</resources>
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-01 18:50:41 UTC (rev 3989)
@@ -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();
+ }
+
+
+ }
+
+}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -32,17 +32,18 @@
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
@@ -50,48 +51,59 @@
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) {
- /*
- * 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
- * iv = (ImageView) v.findViewById(R.id.icon_image); musicItem item =
- * (musicItem) iv.getTag();
- *
- * if (item.typ == "item") { ReceiveDirHandler h =
- * ReceiveDirHandler.getinstance(); h.selectedMusic = position - 1; }
- *
- * if (item.typ == "folder") {
- *
- * musichandler h = musichandler.getinstance(); h.gotodir(item.title);
- *
- * GridView gridview = (GridView) findViewById(R.id.music_grid);
- * gridview.setAdapter(new ImageAdapter2(parent.getContext()));
- *
- * parent.invalidate(); }
- *
- * if (item.typ == "oneup") { musichandler h =
- * musichandler.getinstance(); h.oneup();
- *
- * GridView gridview = (GridView) findViewById(R.id.music_grid);
- * gridview.setAdapter(new ImageAdapter2(parent.getContext()));
- *
- * parent.invalidate(); }
- *
- * } });
- */
+ // 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);
+ // mHandler.removeCallbacks(mUpdateTimeTask);
+ // mHandler.postDelayed(mUpdateTimeTask, 100);
}
private Runnable mUpdateTimeTask = new Runnable() {
@@ -102,7 +114,7 @@
private void update() {
- Log.d("update music dir", "do update");
+ Log.d("update music dir", "do update folder : " + actualDir);
ReceiveDirHandler h = ReceiveDirHandler.getinstance();
musicList = h.getMusicDir(actualDir);
@@ -110,10 +122,10 @@
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();
}
-
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.invalidateViews();
}
public class ImageAdapter2 extends BaseAdapter {
@@ -161,6 +173,7 @@
tv.setText(txtName);
ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+
if (isFolder) {
iv.setImageResource(R.drawable.folder);
musicItem item = new musicItem();
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -21,6 +21,8 @@
package mediaportal.remote;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.ArrayList;
import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
@@ -56,8 +58,15 @@
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;
}
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -41,6 +41,7 @@
public String AlbumArtist= "";
public String Track= "";
public String Rating= "";
+ public String Filename= "";
}
private DbItems currentDbItem;
@@ -73,6 +74,7 @@
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);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -26,6 +26,8 @@
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;
@@ -36,6 +38,7 @@
{
public boolean isFolder = false;
public String File= "";
+ public Bitmap Picture = null;
}
private DirItems currentdirItem;
@@ -69,7 +72,7 @@
DirList.add(currentdirItem);
}
if (localName == "File") {
- currentdirItem.isFolder = true;
+ currentdirItem.isFolder = false;
currentdirItem.File = currentValue;
DirList.add(currentdirItem);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -31,7 +31,9 @@
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 {
@@ -57,7 +59,76 @@
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");
+ }
+ });
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -82,7 +82,8 @@
.toString();
try {
- InputStream in = openHttpConnection("http://192.168.0.30:8200/music/Clementi_Sonatina_Op.36_No.1_Movement_1.mp3");
+ 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);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -21,10 +21,13 @@
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;
@@ -34,18 +37,22 @@
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);
+ 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) {
@@ -53,7 +60,7 @@
startActivityForResult(myIntent, 0);
}
});
-
+
Button btnMusic = (Button) findViewById(R.id.MainButton2);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
@@ -62,6 +69,31 @@
}
});
+ 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) {
@@ -73,7 +105,8 @@
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);
+ Intent myIntent = new Intent(view.getContext(),
+ nowplaying.class);
startActivityForResult(myIntent, 0);
}
});
@@ -85,17 +118,17 @@
menu.add(0, 112, 0, "Exit");
return true;
}
-
+
@Override
- public boolean onOptionsItemSelected (MenuItem item){
- switch (item.getItemId()){
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
case 111:
Intent myIntent = new Intent(this, Setup.class);
startActivityForResult(myIntent, 0);
- return true;
+ return true;
case 112:
this.finish();
- return true;
+ return true;
}
return true;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -40,49 +40,60 @@
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;
-
+
public static String Select = "";
-
+
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_results);
-
- 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);
-
- registerForContextMenu(l1);
- }
-
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_results);
+
+ 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);
+
+ registerForContextMenu(l1);
+ }
+
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
menu.setHeaderTitle("Select action");
-
+
menu.add(0, 101, 0, "Add title to playlist");
menu.add(0, 102, 0, "Download title to SD");
menu.add(0, 103, 0, "Add all title to playlist");
menu.add(0, 104, 0, "Download all title to SD");
menu.add(0, 105, 0, "Close menu");
+
+ 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);
+
+ httpHandler http = new httpHandler();
+ http.DownloadFile();
+ }
+ x = 1;
}
-
+
@Override
public boolean onContextItemSelected(MenuItem item) {
// item.id ==
return true;
}
-
@Override
public void onStart() {
super.onStart();
@@ -90,30 +101,31 @@
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 100);
}
+
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
update();
}
};
-
+
private void update() {
-
+
Log.d("update search", "do update");
-
+
ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
itemList = handler.GetSongsByArtist(Select);
-
+
if (itemList.size() == 0) {
Toast.makeText(MusicResults.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
-
+
ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.invalidateViews();
+ l1.invalidateViews();
}
-
+
private static class EfficientAdapter extends BaseAdapter {
-
+
private LayoutInflater mInflater;
public EfficientAdapter(Context context) {
@@ -121,8 +133,10 @@
}
public int getCount() {
- if(itemList != null) return itemList.size();
- else return 0;
+ if (itemList != null)
+ return itemList.size();
+ else
+ return 0;
}
public Object getItem(int position) {
@@ -135,7 +149,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();
@@ -148,10 +162,10 @@
} else {
holder = (ViewHolder) convertView.getTag();
}
-
+
ReceiveDbXmlHandler.DbItems item = itemList.get(position);
-
- holder.text.setText(String.valueOf(position +1));
+
+ holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -24,6 +24,7 @@
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;
@@ -32,31 +33,42 @@
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 MusicSong extends Activity{
-
+public class MusicSong extends Activity {
+
private Handler mHandler = new Handler();
-
+
private static ArrayList<ReceiveDbXmlHandler.DbItems> songList;
-
+
public static String Select = "";
-
+
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_song);
-
- 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);
- }
-
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_song);
+
+ 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) {
+
+ MediaPlayerControl mp = MediaPlayerControl.getinstance();
+ mp.Play("http://" + Settings.Server + ":" + Settings.Port + "/music/" + "song-marianne-plays-on-piano-sense-and-sensibilit.mp3");
+ }
+ });
+ }
+
@Override
public void onStart() {
super.onStart();
@@ -64,30 +76,31 @@
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 100);
}
+
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
update();
}
};
-
+
private void update() {
-
+
Log.d("update song", "do update");
-
+
ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
songList = handler.GetSongs();
-
+
if (songList.size() == 0) {
- Toast.makeText(MusicSong.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
+ Toast.makeText(MusicSong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
+ .show();
}
-
+
ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.invalidateViews();
+ l1.invalidateViews();
}
-
+
private static class EfficientAdapter extends BaseAdapter {
-
+
private LayoutInflater mInflater;
public EfficientAdapter(Context context) {
@@ -95,8 +108,10 @@
}
public int getCount() {
- if(songList != null) return songList.size();
- else return 0;
+ if (songList != null)
+ return songList.size();
+ else
+ return 0;
}
public Object getItem(int position) {
@@ -109,7 +124,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();
@@ -122,10 +137,10 @@
} else {
holder = (ViewHolder) convertView.getTag();
}
-
+
ReceiveDbXmlHandler.DbItems item = songList.get(position);
-
- holder.text.setText(String.valueOf(position +1));
+
+ holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -26,77 +26,84 @@
import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
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 Pictures extends Activity {
private Handler mHandler = new Handler();
- private String actualDir = "";
+ public static String actualDir = "";
+ public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
- private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
-
- /** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.pictures);
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.GridView01);
- gridview.setAdapter(new ImageAdapter2(this));
+ gridview.setOnItemClickListener(new OnItemClickListener() {
+ public void onItemClick(AdapterView<?> parent, View v,
+ int position, long id) {
- /*
- * 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
- * iv = (ImageView) v.findViewById(R.id.icon_image); picItem pic =
- * (picItem) iv.getTag();
- *
- * if (pic.typ == "item") { picturehandler h =
- * picturehandler.getinstance(); h.selectedPicture = position - 1;
- *
- * Intent myIntent = new Intent(v.getContext(),
- * picturesfullscreen.class); startActivityForResult(myIntent, 0); }
- *
- * if (pic.typ == "folder") {
- *
- * picturehandler h = picturehandler.getinstance();
- * h.gotodir(pic...
[truncated message content] |
|
From: <kro...@us...> - 2010-11-30 12:17:40
|
Revision: 3988
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3988&view=rev
Author: kroko_koenig
Date: 2010-11-30 12:17:31 +0000 (Tue, 30 Nov 2010)
Log Message:
-----------
better structure and code cleanup
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/setup.xml
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/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/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 Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.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
Removed Paths:
-------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ImageAdapter.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ScrollView.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryItems.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musichandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturehandler.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-30 12:17:31 UTC (rev 3988)
@@ -3,13 +3,13 @@
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">
+ <activity android:name=".Splash" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".main" android:label="@string/app_name">
+ <activity android:label="@string/app_name" android:name=".Main">
<intent-filter>
<action android:name="android.intent.action.DEFAULT" />
<category android:name="android.intent.category.VIEW" />
@@ -17,17 +17,17 @@
</activity>
<activity android:name=".Remote_01"></activity>
<activity android:name=".Remote_02"></activity>
- <activity android:name=".pictures"></activity>
+ <activity android:name=".Pictures"></activity>
<activity android:name=".picturesfullscreen"></activity>
- <activity android:name=".music"></activity>
- <activity android:name=".setup"></activity>
+ <activity android:name=".MusicDir"></activity>
+ <activity android:name=".Setup"></activity>
<activity android:name=".nowplaying"></activity>
<activity android:name=".nowplaylist"></activity>
- <activity android:name=".musicArtist"></activity>
- <activity android:name=".musicAlbum"></activity>
- <activity android:name=".musicSong"></activity>
- <activity android:name=".musicTab"></activity>
- <activity android:name=".musicResults"></activity>
+ <activity android:name=".MusicArtist"></activity>
+ <activity android:name=".MusicAlbum"></activity>
+ <activity android:name=".MusicSong"></activity>
+ <activity android:name=".MusicTab"></activity>
+ <activity android:name=".MusicResults"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -74,7 +74,6 @@
public static final int btnOk=0x7f050033;
public static final int btnPause=0x7f05002b;
public static final int btnPlay=0x7f050026;
- public static final int btnReturnSetup=0x7f05003b;
public static final int btnRight=0x7f050034;
public static final int btnSkipBack=0x7f050029;
public static final int btnSkipForw=0x7f05002c;
@@ -104,6 +103,7 @@
public static final int now_stop=0x7f05001d;
public static final int now_title=0x7f05001a;
public static final int server_ip=0x7f050039;
+ public static final int server_macid=0x7f05003b;
public static final int server_port=0x7f05003a;
public static final int title=0x7f05003c;
public static final int widget0=0x7f05000a;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2010-11-30 12:17:31 UTC (rev 3988)
@@ -13,7 +13,10 @@
<EditText android:id="@+id/server_port" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="8200"
android:inputType="number|numberSigned"></EditText>
- <Button android:id="@+id/btnReturnSetup" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:text="Return"></Button>
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="MediaPortal MAC Adress"></TextView>
+ <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>
</LinearLayout>
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ImageAdapter.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ImageAdapter.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ImageAdapter.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,136 +0,0 @@
-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;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.*;
-
-import mediaportal.remote.httpHandler;
-
-public class ImageAdapter extends BaseAdapter {
- private Context mContext;
-
- public ImageAdapter(Context c) {
- mContext = c;
- }
-
- public int getCount() {
- directoryItems myItems = directoryXmlHandler.getSitesList();
- return myItems.gettitle().size();
- }
-
- public Object getItem(int position) {
- return null;
- }
-
- public long getItemId(int position) {
- return 0;
- }
-
- // create a new ImageView for each item referenced by the Adapter
- public View getView(int position, View convertView, ViewGroup parent) {
- ImageView imageView;
- if (convertView == null) { // if it's not recycled, initialize some
- // attributes
- imageView = new ImageView(mContext);
- imageView.setLayoutParams(new GridView.LayoutParams(85, 85));
- imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
- imageView.setPadding(8, 8, 8, 8);
- } else {
- imageView = (ImageView) convertView;
- }
-
- imageView.setImageBitmap(bmImg[position]);
- return imageView;
- }
-
- public static Bitmap[] bmImg;
-
- public static Bitmap downloadFile(String fileUrl) {
- 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.setReadTimeout(3000);
- conn.setDoInput(true);
- conn.connect();
- // int length = conn.getContentLength();
- 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();
- }
-
- directoryXmlHandler handler = new directoryXmlHandler();
-
- reader.setContentHandler(handler);
- try {
- reader.parse(new InputSource(is));
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- is.close();
- sp.reset();
-
- directoryItems myItems = directoryXmlHandler.getSitesList();
- bmImg = new Bitmap[myItems.gettitle().size()];
-
- httpHandler h = new httpHandler();
-
- for (int i = 0; i < myItems.gettitle().size(); i++) {
- String tit = myItems.gettitle().get(i);
- // Boolean fold = myItems.getIsFolder().get(i);
-
- tit = tit + ".thb";
-
- bmImg[i] = h.DownloadImage("http://192.6.10.182:8200/pictures/"
- + tit);
- }
-
- // bmImg = BitmapFactory.decodeStream(is);
- return null;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
- }
-}
\ No newline at end of file
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-11-30 12:17:31 UTC (rev 3988)
@@ -0,0 +1,205 @@
+/*
+ * 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.BaseAdapter;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.TextView;
+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);
+
+ 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
+ * iv = (ImageView) v.findViewById(R.id.icon_image); musicItem item =
+ * (musicItem) iv.getTag();
+ *
+ * if (item.typ == "item") { ReceiveDirHandler h =
+ * ReceiveDirHandler.getinstance(); h.selectedMusic = position - 1; }
+ *
+ * if (item.typ == "folder") {
+ *
+ * musichandler h = musichandler.getinstance(); h.gotodir(item.title);
+ *
+ * GridView gridview = (GridView) findViewById(R.id.music_grid);
+ * gridview.setAdapter(new ImageAdapter2(parent.getContext()));
+ *
+ * parent.invalidate(); }
+ *
+ * if (item.typ == "oneup") { musichandler h =
+ * musichandler.getinstance(); h.oneup();
+ *
+ * GridView gridview = (GridView) findViewById(R.id.music_grid);
+ * gridview.setAdapter(new ImageAdapter2(parent.getContext()));
+ *
+ * parent.invalidate(); }
+ *
+ * } });
+ */
+ }
+
+ @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");
+
+ ReceiveDirHandler h = ReceiveDirHandler.getinstance();
+ musicList = h.getMusicDir(actualDir);
+
+ if (musicList.size() == 0) {
+ Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ .show();
+ }
+
+ 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;
+ }
+
+}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,34 +1,33 @@
+/*
+ * 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.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
import java.util.ArrayList;
-
-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;
-
import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
public class ReceiveDbHandler {
- public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
- private static ArrayList<DbItems> Result;
private static ReceiveDbHandler instance;
- private String _server;
- private String _port;
-
public int selectedMusic;
public static ReceiveDbHandler getinstance() {
@@ -37,104 +36,28 @@
return instance;
}
- public void setconnection(String server, String port) {
- _server = server;
- _port = port;
+ public ArrayList<DbItems> GetAlbums() {
+ return fetchData("album.xml");
}
- public boolean GetAlbums() {
- fetchData("album.xml");
- return true;
+ public ArrayList<DbItems> GetArtist() {
+ return fetchData("artist.xml");
}
- public boolean GetArtist() {
- fetchData("artist.xml");
- return true;
+ public ArrayList<DbItems> GetSongs() {
+ return fetchData("song.xml");
}
- public boolean GetSongs() {
- fetchData("song.xml");
- return true;
+ public ArrayList<DbItems> GetSongsByArtist(String Artist) {
+ return fetchData("song.xml?artist=" + Artist);
}
-
- public boolean GetSongsByArtist(String Artist) {
- fetchData("song.xml?artist=" + Artist);
- return true;
- }
- public ArrayList<DbItems> GetResult() {
- return Result;
- }
+ private ArrayList<DbItems> fetchData(String Data) {
- private void fetchData(String Data) {
+ ReceiveDbXmlHandler handler = new ReceiveDbXmlHandler();
+ ReceiveHandler hand = new ReceiveHandler(handler);
+ hand.readValues("/db_music/" + Data);
- Result = new ArrayList<DbItems>();
-
- try {
- Data = URLEncoder.encode(Data, "UTF-8");
- } catch (UnsupportedEncodingException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- String fileUrl = "http://" + _server + ":" + _port + "/db_music/"
- + Data;
-
- 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(3000);
- 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();
- }
-
- ReceiveDbXmlHandler handler = new ReceiveDbXmlHandler();
-
- reader.setContentHandler(handler);
- try {
- reader.parse(new InputSource(is));
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- is.close();
- sp.reset();
-
- Result = ReceiveDbXmlHandler.DbList;
-
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ return handler.DbList;
}
-
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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;
@@ -10,7 +31,8 @@
Boolean currentElement = false;
String currentValue = null;
- public static ArrayList<DbItems> DbList = new ArrayList<DbItems>();
+ public ArrayList<DbItems> DbList = new ArrayList<DbItems>();
+
public static class DbItems
{
public String Title = "";
@@ -18,8 +40,7 @@
public String Album= "";
public String AlbumArtist= "";
public String Track= "";
- public String Rating= "";
-
+ public String Rating= "";
}
private DbItems currentDbItem;
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-11-30 12:17:31 UTC (rev 3988)
@@ -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-11-30 12:17:31 UTC (rev 3988)
@@ -0,0 +1,92 @@
+/*
+ * 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 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= "";
+ }
+ 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 = true;
+ 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-11-30 12:17:31 UTC (rev 3988)
@@ -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();
+ }
+
+
+ }
+
+}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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;
@@ -2,5 +23,3 @@
import java.io.InputStream;
-
import mediaportal.remote.R;
-
import android.app.Activity;
@@ -12,9 +31,7 @@
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 {
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ScrollView.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ScrollView.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ScrollView.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,38 +0,0 @@
-package mediaportal.remote;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-public class ScrollView extends TextView {
-
- public ScrollView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public ScrollView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public ScrollView(Context context) {
- super(context);
- }
-
- @Override
- protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
- if(focused)
- super.onFocusChanged(focused, direction, previouslyFocusedRect);
- }
-
- @Override
- public void onWindowFocusChanged(boolean focused) {
- if(focused)
- super.onWindowFocusChanged(focused);
- }
-
- @Override
- public boolean isFocused() {
- return true;
- }
-}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Settings.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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{
@@ -2,8 +23,6 @@
- public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
- public 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/directoryItems.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryItems.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryItems.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,26 +0,0 @@
-package mediaportal.remote;
-
-import java.util.ArrayList;
-
-/** Contains getter and setter method for variables */
-public class directoryItems {
-
- /** Variables */
- private ArrayList<String> title = new ArrayList<String>();
- private ArrayList<Boolean> isFolder = new ArrayList<Boolean>();
-
- public ArrayList<String> gettitle() {
- return title;
- }
- public void settitle(String title) {
- this.title.add(title);
- }
-
- public ArrayList<Boolean> getIsFolder() {
- return isFolder;
- }
- public void setIsFolder(Boolean isFolder) {
- this.isFolder.add(isFolder);
- }
-
-}
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryXmlHandler.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/directoryXmlHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,68 +0,0 @@
-package mediaportal.remote;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class directoryXmlHandler extends DefaultHandler {
- Boolean currentElement = false;
- String currentValue = null;
-
- public static directoryItems itemList = null;
-
- public static directoryItems getSitesList() {
- return itemList;
- }
-
- public static void setSitesList(directoryItems directoryList) {
- directoryXmlHandler.itemList = directoryList;
- }
-
- /**
- * 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;
-
- if (localName == "Directory") {
- itemList = new directoryItems();
- }
- }
-
- /**
- * 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") {
- itemList.setIsFolder(true);
- itemList.settitle(currentValue);
- }
- if (localName == "File") {
- itemList.setIsFolder(false);
- itemList.settitle(currentValue);
- }
- }
-
- /**
- * 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
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -17,7 +17,6 @@
import android.graphics.BitmapFactory;
import android.os.Environment;
-
public class httpHandler {
String extStorageDirectory;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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 mediaportal.remote.R;
@@ -3,4 +24,5 @@
import android.app.Activity;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.Menu;
@@ -9,18 +31,25 @@
import android.view.View;
import android.widget.*;
-public class main extends Activity {
+public class Main extends Activity {
- /** Called when the activity is first created. */
+ 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");
+
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);
}
});
@@ -28,7 +57,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);
}
});
@@ -61,7 +90,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:
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,193 +0,0 @@
-package mediaportal.remote;
-
-import mediaportal.remote.R;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
-
-public class music extends Activity {
-
- public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music);
- /*
- requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
- setContentView(R.layout.music);
- getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title);
-
- ((TextView) findViewById(R.id.title)).setText("Music");
- */
-
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
- MODE_PRIVATE);
-
- String HttpServer = settings.getString("Server", "192.168.0.30");
- String HttpPort = settings.getString("Port", "8200");
-
- musichandler h = musichandler.getinstance();
- h.setconnection(HttpServer, HttpPort);
- h.getrootdirectory();
-
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(music.this));
-
- /*
- gridview.setOnItemSelectedListener(new OnItemSelectedListener() {
- public void onItemSelected(AdapterView<?> arg0, View arg1,
- int arg2, long arg3) {
- ImageView iv = (ImageView) arg1.findViewById(R.id.icon_image);
- musicItem item = (musicItem) iv.getTag();
-
- ((TextView) findViewById(R.id.title)).setText(item.title);
- }
-
- public void onNothingSelected(AdapterView<?> arg0) {
- // TODO Auto-generated method stub
- }
- });
- */
-
- 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 iv = (ImageView) v.findViewById(R.id.icon_image);
- musicItem item = (musicItem) iv.getTag();
-
- if (item.typ == "item") {
- musichandler h = musichandler.getinstance();
- h.selectedMusic = position - 1;
-
- // todo play or transfer
- // Intent myIntent = new Intent(v.getContext(),
- // picturesfullscreen.class);
- // startActivityForResult(myIntent, 0);
- }
-
- if (item.typ == "folder") {
-
- musichandler h = musichandler.getinstance();
- h.gotodir(item.title);
-
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(parent.getContext()));
-
- parent.invalidate();
- }
-
- if (item.typ == "oneup") {
- musichandler h = musichandler.getinstance();
- h.oneup();
-
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(parent.getContext()));
-
- parent.invalidate();
- }
-
- }
- });
- }
-
- public class ImageAdapter2 extends BaseAdapter {
- private Context mContext;
- public static final int ACTIVITY_CREATE = 10;
-
- public ImageAdapter2(Context c) {
- mContext = c;
- }
-
- public int getCount() {
- musichandler h = musichandler.getinstance();
- return h.getmusicItems().gettitle().size() + 1;
- }
-
- 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;
-
- musichandler h = musichandler.getinstance();
- String txtName = h.getmusicItems().gettitle().get(position);
- Boolean isFolder = h.getmusicItems().getIsFolder()
- .get(position);
-
- 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;
- }
-
- // imageView.setImageBitmap(bmImg[position]);
- return v;
- }
- }
-
- public class musicItem {
- public String title;
- public String typ;
- }
-
-}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,3 +1,24 @@
+/*
+ * 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;
@@ -4,40 +25,32 @@
import android.app.Activity;
import android.content.Context;
-import android.content.SharedPreferences;
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.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ListView;
-import android.widget.TabHost;
import android.widget.TextView;
import android.widget.Toast;
-public class musicAlbum extends Activity {
+public class MusicAlbum extends Activity {
- public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
private static ArrayList<ReceiveDbXmlHandler.DbItems> albumList;
- private View menuInstance = null;
-
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);
@@ -57,7 +70,7 @@
super.onStart();
mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 1000);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
}
private Runnable mUpdateTimeTask = new Runnable() {
@@ -70,23 +83,14 @@
Log.d("update album", "do update");
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
- MODE_PRIVATE);
-
- String HttpServer = settings.getString("Server", "192.168.0.30");
- String HttpPort = settings.getString("Port", "8200");
-
ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
- handler.setconnection(HttpServer, HttpPort);
- boolean result = handler.GetAlbums();
+ albumList = handler.GetAlbums();
- if (!result) {
- Toast.makeText(musicAlbum.this, "TIME OUT SERVER",
+ if (albumList.size() == 0) {
+ Toast.makeText(MusicAlbum.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
- albumList = handler.GetResult();
-
ListView l1 = (ListView) findViewById(R.id.list_album);
l1.invalidateViews();
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-11-30 07:11:25 UTC (rev 3987)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-11-30 12:17:31 UTC (rev 3988)
@@ -1,11 +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;
import java.util.ArrayList;
-
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphic...
[truncated message content] |
|
From: <kro...@us...> - 2010-11-30 07:11:33
|
Revision: 3987
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3987&view=rev
Author: kroko_koenig
Date: 2010-11-30 07:11:25 +0000 (Tue, 30 Nov 2010)
Log Message:
-----------
after some real test
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.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/Server/AndroidRemote/AndroidServer.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.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
Removed Paths:
-------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/remote.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-30 07:11:25 UTC (rev 3987)
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="mediaportal.remote" android:versionCode="1"
android:versionName="1.0">
- <application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar">
+ <application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar" android:debuggable="true">
<activity android:name=".splash" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -15,7 +15,8 @@
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".remote"></activity>
+ <activity android:name=".Remote_01"></activity>
+ <activity android:name=".Remote_02"></activity>
<activity android:name=".pictures"></activity>
<activity android:name=".picturesfullscreen"></activity>
<activity android:name=".music"></activity>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -63,23 +63,23 @@
public static final int MainButton5=0x7f050009;
public static final int TextView01=0x7f050003;
public static final int TextView02=0x7f050004;
- public static final int btnBack=0x7f050037;
- public static final int btnDown=0x7f050036;
- public static final int btnFBack=0x7f050024;
- public static final int btnFForw=0x7f050026;
- public static final int btnHome=0x7f05002d;
- public static final int btnInfo=0x7f05002f;
- public static final int btnLeft=0x7f050031;
- public static final int btnMenu=0x7f050035;
- public static final int btnOk=0x7f050032;
- public static final int btnPause=0x7f05002a;
- public static final int btnPlay=0x7f050025;
- public static final int btnReturnSetup=0x7f05003a;
- public static final int btnRight=0x7f050033;
- public static final int btnSkipBack=0x7f050028;
- public static final int btnSkipForw=0x7f05002b;
- public static final int btnStop=0x7f050029;
- public static final int btnUp=0x7f05002e;
+ public static final int btnBack=0x7f050038;
+ public static final int btnDown=0x7f050037;
+ public static final int btnFBack=0x7f050025;
+ public static final int btnFForw=0x7f050027;
+ 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 btnReturnSetup=0x7f05003b;
+ public static final int btnRight=0x7f050034;
+ public static final int btnSkipBack=0x7f050029;
+ public static final int btnSkipForw=0x7f05002c;
+ public static final int btnStop=0x7f05002a;
+ public static final int btnUp=0x7f05002f;
public static final int full_text=0x7f050011;
public static final int icon_image=0x7f050001;
public static final int icon_text=0x7f050002;
@@ -88,6 +88,7 @@
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;
@@ -102,15 +103,15 @@
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=0x7f050038;
- public static final int server_port=0x7f050039;
- public static final int title=0x7f05003b;
+ public static final int server_ip=0x7f050039;
+ public static final int server_port=0x7f05003a;
+ public static final int title=0x7f05003c;
public static final int widget0=0x7f05000a;
- public static final int widget00=0x7f050023;
- public static final int widget01=0x7f050027;
- public static final int widget02=0x7f05002c;
- public static final int widget03=0x7f050030;
- public static final int widget04=0x7f050034;
+ 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 class layout {
@@ -127,10 +128,11 @@
public static final int picturesfullscreen=0x7f03000a;
public static final int playingnow=0x7f03000b;
public static final int playnowlist=0x7f03000c;
- public static final int remote=0x7f03000d;
- public static final int setup=0x7f03000e;
- public static final int splash=0x7f03000f;
- public static final int title=0x7f030010;
+ 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 class string {
public static final int app_name=0x7f040001;
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml 2010-11-30 07:11:25 UTC (rev 3987)
@@ -1,142 +0,0 @@
-<?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/back"
- android:orientation="vertical"
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <LinearLayout
- android:id="@+id/widget00"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
-
- <Button android:id="@+id/btnFBack"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="FBack">
- </Button>
-
- <Button android:id="@+id/btnPlay"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:text="Play">
- </Button>
-
- <Button android:id="@+id/btnFForw"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="FForw">
- </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:text="Skp -">
- </Button>
-
- <Button android:id="@+id/btnStop"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Stop">
- </Button>
-
- <Button android:id="@+id/btnPause"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Pause">
- </Button>
-
- <Button android:id="@+id/btnSkipForw"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Skp +">
- </Button>
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/widget02"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/btnHome"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Home">
- </Button>
-
- <Button android:id="@+id/btnUp"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/up_icon">
- </Button>
-
- <Button android:id="@+id/btnInfo"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Info">
- </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:layout_height="120dip"
- android:background="@drawable/back_icon">
- </Button>
-
- <Button android:id="@+id/btnOk"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/accept_icon">
- </Button>
-
- <Button android:id="@+id/btnRight"
- android:layout_width="80dip"
- android:layout_height="120dip"
- android:background="@drawable/next_icon">
- </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:layout_height="60dip"
- android:text="Menu">
- </Button>
-
- <Button android:id="@+id/btnDown"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/down_icon">
- </Button>
-
- <Button android:id="@+id/btnBack"
- android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Back">
- </Button>
-
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-11-30 07:11:25 UTC (rev 3987)
@@ -0,0 +1,149 @@
+<?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/back"
+ 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 01"
+ android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
+ </TextView>
+
+ <LinearLayout
+ android:id="@+id/widget00"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ >
+
+ <Button android:id="@+id/btnFBack"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="FBack">
+ </Button>
+
+ <Button android:id="@+id/btnPlay"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:text="Play">
+ </Button>
+
+ <Button android:id="@+id/btnFForw"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="FForw">
+ </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:text="Skp -">
+ </Button>
+
+ <Button android:id="@+id/btnStop"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Stop">
+ </Button>
+
+ <Button android:id="@+id/btnPause"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Pause">
+ </Button>
+
+ <Button android:id="@+id/btnSkipForw"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Skp +">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/widget02"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <Button android:id="@+id/btnHome"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Home">
+ </Button>
+
+ <Button android:id="@+id/btnUp"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/up_icon">
+ </Button>
+
+ <Button android:id="@+id/btnInfo"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Info">
+ </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:layout_height="120dip"
+ android:background="@drawable/back_icon">
+ </Button>
+
+ <Button android:id="@+id/btnOk"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/accept_icon">
+ </Button>
+
+ <Button android:id="@+id/btnRight"
+ android:layout_width="80dip"
+ android:layout_height="120dip"
+ android:background="@drawable/next_icon">
+ </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:layout_height="60dip"
+ android:text="Menu">
+ </Button>
+
+ <Button android:id="@+id/btnDown"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/down_icon">
+ </Button>
+
+ <Button android:id="@+id/btnBack"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Back">
+ </Button>
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml 2010-11-30 07:11:25 UTC (rev 3987)
@@ -0,0 +1,17 @@
+<?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/back"
+ 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="Menu 02"
+ android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
+ </TextView>
+
+</LinearLayout>
\ No newline at end of file
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-11-30 07:11:25 UTC (rev 3987)
@@ -0,0 +1,54 @@
+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/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-11-30 07:11:25 UTC (rev 3987)
@@ -0,0 +1,219 @@
+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-11-30 07:11:25 UTC (rev 3987)
@@ -0,0 +1,109 @@
+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");
+
+ }
+
+
+ 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-11-30 07:11:25 UTC (rev 3987)
@@ -0,0 +1,11 @@
+package mediaportal.remote;
+
+public class Settings{
+
+ public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+
+ public Settings()
+ {
+
+ }
+}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -36,7 +36,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.class);
+ Intent myIntent = new Intent(view.getContext(), Remote_01.class);
startActivityForResult(myIntent, 0);
}
});
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -65,8 +65,8 @@
HttpURLConnection conn = (HttpURLConnection) myFileUrl
.openConnection();
- conn.setReadTimeout(3000);
- conn.setConnectTimeout(3000);
+ conn.setReadTimeout(5000);
+ conn.setConnectTimeout(5000);
conn.setDoInput(true);
conn.connect();
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -67,7 +67,7 @@
HttpURLConnection conn = (HttpURLConnection) myFileUrl
.openConnection();
- conn.setConnectTimeout(3000);
+ conn.setConnectTimeout(5000);
conn.setReadTimeout(10000);
conn.setDoInput(true);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -34,8 +34,7 @@
//getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title);
//((TextView) findViewById(R.id.title)).setText("Pictures");
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
- MODE_PRIVATE);
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE, MODE_PRIVATE);
String HttpServer = settings.getString("Server", "192.168.0.30");
String HttpPort = settings.getString("Port", "8200");
@@ -47,20 +46,6 @@
GridView gridview = (GridView) findViewById(R.id.GridView01);
gridview.setAdapter(new ImageAdapter2(this));
- gridview.setOnItemSelectedListener(new OnItemSelectedListener() {
- public void onItemSelected(AdapterView<?> arg0, View arg1,
- int arg2, long arg3) {
- ImageView iv = (ImageView) arg1.findViewById(R.id.icon_image);
- picItem pic = (picItem) iv.getTag();
-
- ((TextView) findViewById(R.id.title)).setText(pic.title);
- }
-
- public void onNothingSelected(AdapterView<?> arg0) {
- // TODO Auto-generated method stub
- }
- });
-
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -32,20 +32,12 @@
TextView txt = (TextView) findViewById(R.id.full_text);
txt.setText(pic.selectedPictureName);
-
- /*
- * imagev.setOnClickListener(new View.OnClickListener() { public void
- * onClick(View view) { Intent intent = new Intent();
- * setResult(RESULT_OK, intent); finish(); } });
- */
-
}
@Override
public boolean onTouchEvent(MotionEvent me) {
return gestureScanner.onTouchEvent(me);
- }
-
+ }
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
float velocityY) {
try {
@@ -85,24 +77,17 @@
}
public boolean onDown(MotionEvent arg0) {
- // TODO Auto-generated method stub
return true;
}
public void onLongPress(MotionEvent arg0) {
- // TODO Auto-generated method stub
-
}
public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
float arg3) {
- // TODO Auto-generated method stub
return false;
}
public void onShowPress(MotionEvent arg0) {
- // TODO Auto-generated method stub
-
}
public boolean onSingleTapUp(MotionEvent arg0) {
- // TODO Auto-generated method stub
return false;
}
}
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/remote.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/remote.java 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/remote.java 2010-11-30 07:11:25 UTC (rev 3987)
@@ -1,200 +0,0 @@
-package mediaportal.remote;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import mediaportal.remote.R;
-
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-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;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.AssetManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.Toast;
-
-public class remote extends Activity {
-
- public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.remote);
-
- 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) {
-
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE , MODE_PRIVATE);
-
- String HttpServer = settings.getString("Server", "192.168.0.30");
- String HttpPort = settings.getString("Port", "8200");
-
- HttpParams httpParameters = new BasicHttpParams();
- HttpConnectionParams.setConnectionTimeout(httpParameters, 3000);
- HttpConnectionParams.setSoTimeout(httpParameters, 3000);
-
- HttpClient httpclient = new DefaultHttpClient(httpParameters);
- HttpPost httppost = new HttpPost("http://" + HttpServer + ":"
- + HttpPort);
-
- try {
-
- AssetManager assetManager = getAssets();
-
- InputStream inputStream = null;
- inputStream = assetManager.open("cmd_" + button + ".xml");
-
- int x = inputStream.read();
-
- String xml = "";
-
- while (x != -1) {
- xml = xml + (char) x;
- x = inputStream.read();
- }
-
- StringEntity se = new StringEntity(xml, "UTF-8");
- se.setContentType("application/atom+xml");
-
- httppost.setEntity(se);
-
- // HttpResponse response;
- // response = httpclient.execute(httppost);
- httpclient.execute(httppost);
-
- } catch (ClientProtocolException e) {
- Toast.makeText(remote.this, "ERROR CONNECTION SERVER",
- Toast.LENGTH_LONG).show();
- e.printStackTrace();
- } catch (IOException e) {
- Toast.makeText(remote.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
- .show();
- e.printStackTrace();
- }
- }
-
-}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs 2010-11-30 07:11:25 UTC (rev 3987)
@@ -102,18 +102,26 @@
}
private static void DoAcceptSocketCallback(IAsyncResult ar)
{
- // get socket
TcpListener listener = (TcpListener)ar.AsyncState;
- Socket clientSocket = listener.EndAcceptSocket(ar);
- logDebug("Listener accept connection from " + clientSocket.RemoteEndPoint.ToString());
+ try
+ {
+ // get socket
+ Socket clientSocket = listener.EndAcceptSocket(ar);
- // work on request
- Request req = new Request(clientSocket);
- Thread thread = new Thread(new ThreadStart(req.DoWork));
- thread.Priority = ThreadPriority.BelowNormal;
- thread.Start();
+ logDebug("Listener accept connection from " + clientSocket.RemoteEndPoint.ToString());
+ // work on request
+ Request req = new Request(clientSocket);
+ Thread thread = new Thread(new ThreadStart(req.DoWork));
+ thread.Priority = ThreadPriority.BelowNormal;
+ thread.Start();
+ }
+ catch (Exception ex)
+ {
+ logDebug("Exception on DoAcceptSocketCallback : " + ex.Message);
+ }
+
// restart listener
listener.BeginAcceptSocket(new AsyncCallback(DoAcceptSocketCallback), listener);
}
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-29 13:05:10 UTC (rev 3986)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-30 07:11:25 UTC (rev 3987)
@@ -71,8 +71,12 @@
AndroidServer.logDebug("receive HTTP Continue");
allMessage = allMessage + clientmessage.Substring(0, bytes);
- sendMessage(socket, "HTTP/1.0 100 Continue\r\n");
- sendMessage(socket, "\r\n");
+
+ string msg = string.Empty;
+ msg += "HTTP/1.0 100 Continue\r\n";
+ msg += "Proxy-Connection: close" + "\r\n";
+ msg += "\r\n";
+ sendMessage(socket, msg);
}
else
{
@@ -87,7 +91,7 @@
ExceuteCommand(allMessage);
}
- else
+ else if (clientmessage.Length>0)
{
// GET
int index1 = clientmessage.IndexOf(' ');
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-11-29 13:05:19
|
Revision: 3986
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3986&view=rev
Author: kroko_koenig
Date: 2010-11-29 13:05:10 +0000 (Mon, 29 Nov 2010)
Log Message:
-----------
update quite a lot
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/layout/picturesfullscreen.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml
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/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/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturehandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/remote.java
trunk/plugins/AndroidRemote/Release/Android Server communication.docx
trunk/plugins/AndroidRemote/Release/remote.jpg
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/.settings/org.eclipse.ltk.core.refactoring.prefs
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_contextMenu.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_forward.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextChannel.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextItem.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_parentDir.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevChannel.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevItem.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previousMenu.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_rewind.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_showInfo.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeDown.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeMute.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeUp.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/album.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/album_off.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/artist.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/artist_off.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/audio.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/foldertab.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/foldertab_off.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab1.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab2.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab3.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab4.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/song.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/song_off.png
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/musictab.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/title.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/
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/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ScrollView.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music.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/musichandler.java
trunk/plugins/AndroidRemote/Release/album.jpg
trunk/plugins/AndroidRemote/Release/artist.jpg
trunk/plugins/AndroidRemote/Release/music.jpg
trunk/plugins/AndroidRemote/Release/song.jpg
trunk/plugins/AndroidRemote/Release/splashupdate01.jpg
Removed Paths:
-------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevMenu.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/.settings/org.eclipse.ltk.core.refactoring.prefs
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/.settings/org.eclipse.ltk.core.refactoring.prefs 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,3 @@
+#Thu Nov 25 20:59:35 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="mediaportal.remote" android:versionCode="1"
android:versionName="1.0">
- <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar">
<activity android:name=".splash" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -18,11 +18,18 @@
<activity android:name=".remote"></activity>
<activity android:name=".pictures"></activity>
<activity android:name=".picturesfullscreen"></activity>
+ <activity android:name=".music"></activity>
<activity android:name=".setup"></activity>
<activity android:name=".nowplaying"></activity>
<activity android:name=".nowplaylist"></activity>
+ <activity android:name=".musicArtist"></activity>
+ <activity android:name=".musicAlbum"></activity>
+ <activity android:name=".musicSong"></activity>
+ <activity android:name=".musicTab"></activity>
+ <activity android:name=".musicResults"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
+
</manifest>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_contextMenu.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_contextMenu.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_contextMenu.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_CONTEXT_MENU</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_forward.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_forward.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_forward.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_FORWARD</command>
+</message>
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<message>
- <command>ACTION_NEXT_ITEM</command>
-</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextChannel.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextChannel.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextChannel.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_NEXT_CHANNEL</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextItem.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextItem.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_nextItem.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_NEXT_ITEM</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_parentDir.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_parentDir.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_parentDir.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PARENT_DIR</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevChannel.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevChannel.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevChannel.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PREV_CHANNEL</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevItem.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevItem.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevItem.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PREV_ITEM</command>
+</message>
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevMenu.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevMenu.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_prevMenu.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<message>
- <command>ACTION_PREVIOUS_MENU</command>
-</message>
\ No newline at end of file
Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<message>
- <command>ACTION_PREV_ITEM</command>
-</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previousMenu.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previousMenu.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previousMenu.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PREVIOUS_MENU</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_rewind.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_rewind.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_rewind.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_REWIND</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_showInfo.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_showInfo.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_showInfo.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_SHOW_INFO</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeDown.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeDown.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeDown.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_VOLUME_DOWN</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeMute.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeMute.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeMute.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_VOLUME_MUTE</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeUp.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeUp.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_volumeUp.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_VOLUME_UP</command>
+</message>
\ 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-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-29 13:05:10 UTC (rev 3986)
@@ -12,36 +12,50 @@
}
public static final class drawable {
public static final int accept_icon=0x7f020000;
- public static final int back=0x7f020001;
- public static final int back_icon=0x7f020002;
- public static final int border=0x7f020003;
- public static final int cdcover=0x7f020004;
- public static final int close_icon=0x7f020005;
- public static final int document=0x7f020006;
- public static final int down_icon=0x7f020007;
- public static final int folder=0x7f020008;
- public static final int folderback=0x7f020009;
- public static final int forward=0x7f02000a;
- public static final int icon=0x7f02000b;
- public static final int music_logo=0x7f02000c;
- public static final int next_icon=0x7f02000d;
- public static final int nowplaying_logo=0x7f02000e;
- public static final int pause=0x7f02000f;
- public static final int picture=0x7f020010;
- public static final int pictures_logo=0x7f020011;
- public static final int play=0x7f020012;
- public static final int remote_logo=0x7f020013;
- public static final int rewind=0x7f020014;
- public static final int splash=0x7f020015;
- public static final int stop=0x7f020016;
- public static final int up_icon=0x7f020017;
- public static final int videos_logo=0x7f020018;
+ 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 cdcover=0x7f020009;
+ public static final int close_icon=0x7f02000a;
+ public static final int document=0x7f02000b;
+ public static final int down_icon=0x7f02000c;
+ public static final int folder=0x7f02000d;
+ public static final int folderback=0x7f02000e;
+ public static final int foldertab=0x7f02000f;
+ public static final int foldertab_off=0x7f020010;
+ public static final int forward=0x7f020011;
+ public static final int ic_tab=0x7f020012;
+ public static final int ic_tab1=0x7f020013;
+ public static final int ic_tab2=0x7f020014;
+ public static final int ic_tab3=0x7f020015;
+ public static final int ic_tab4=0x7f020016;
+ public static final int icon=0x7f020017;
+ public static final int music_logo=0x7f020018;
+ public static final int next_icon=0x7f020019;
+ public static final int nowplaying_logo=0x7f02001a;
+ public static final int pause=0x7f02001b;
+ public static final int picture=0x7f02001c;
+ public static final int pictures_logo=0x7f02001d;
+ public static final int play=0x7f02001e;
+ public static final int remote_logo=0x7f02001f;
+ public static final int rewind=0x7f020020;
+ public static final int song=0x7f020021;
+ public static final int song_off=0x7f020022;
+ public static final int splash=0x7f020023;
+ public static final int stop=0x7f020024;
+ public static final int up_icon=0x7f020025;
+ public static final int videos_logo=0x7f020026;
}
public static final class id {
- public static final int GridView01=0x7f05000b;
- public static final int ImageView01=0x7f05000d;
- public static final int LinearLayout01=0x7f05000e;
- public static final int ListView01=0x7f05001d;
+ 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;
@@ -49,47 +63,74 @@
public static final int MainButton5=0x7f050009;
public static final int TextView01=0x7f050003;
public static final int TextView02=0x7f050004;
- public static final int btnCancel=0x7f050020;
- public static final int btnDown=0x7f050022;
- public static final int btnLeft=0x7f050024;
- public static final int btnOk=0x7f050021;
- public static final int btnReturn=0x7f05001f;
- public static final int btnReturnSetup=0x7f050027;
- public static final int btnRight=0x7f050023;
- public static final int btnUp=0x7f05001e;
- public static final int full_text=0x7f05000c;
+ public static final int btnBack=0x7f050037;
+ public static final int btnDown=0x7f050036;
+ public static final int btnFBack=0x7f050024;
+ public static final int btnFForw=0x7f050026;
+ public static final int btnHome=0x7f05002d;
+ public static final int btnInfo=0x7f05002f;
+ public static final int btnLeft=0x7f050031;
+ public static final int btnMenu=0x7f050035;
+ public static final int btnOk=0x7f050032;
+ public static final int btnPause=0x7f05002a;
+ public static final int btnPlay=0x7f050025;
+ public static final int btnReturnSetup=0x7f05003a;
+ public static final int btnRight=0x7f050033;
+ public static final int btnSkipBack=0x7f050028;
+ public static final int btnSkipForw=0x7f05002b;
+ public static final int btnStop=0x7f050029;
+ public static final int btnUp=0x7f05002e;
+ 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 now_album=0x7f050010;
- public static final int now_artist=0x7f050016;
- public static final int now_cd=0x7f050011;
- public static final int now_list=0x7f05001c;
- public static final int now_next=0x7f05001b;
- public static final int now_pause=0x7f050019;
- public static final int now_play=0x7f05001a;
- public static final int now_playing=0x7f05000f;
- public static final int now_playing_right=0x7f050014;
- public static final int now_playing_t_left=0x7f050013;
- public static final int now_prev=0x7f050017;
- public static final int now_progress=0x7f050012;
- public static final int now_stop=0x7f050018;
- public static final int now_title=0x7f050015;
- public static final int server_ip=0x7f050025;
- public static final int server_port=0x7f050026;
+ 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 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=0x7f050038;
+ public static final int server_port=0x7f050039;
+ public static final int title=0x7f05003b;
public static final int widget0=0x7f05000a;
+ public static final int widget00=0x7f050023;
+ public static final int widget01=0x7f050027;
+ public static final int widget02=0x7f05002c;
+ public static final int widget03=0x7f050030;
+ public static final int widget04=0x7f050034;
public static final int widget44=0x7f050000;
}
public static final class layout {
public static final int icon=0x7f030000;
public static final int list_item=0x7f030001;
public static final int main=0x7f030002;
- public static final int pictures=0x7f030003;
- public static final int picturesfullscreen=0x7f030004;
- public static final int playingnow=0x7f030005;
- public static final int playnowlist=0x7f030006;
- public static final int remote=0x7f030007;
- public static final int setup=0x7f030008;
- public static final int splash=0x7f030009;
+ public static final int music=0x7f030003;
+ public static final int music_album=0x7f030004;
+ public static final int music_artist=0x7f030005;
+ public static final int music_results=0x7f030006;
+ public static final int music_song=0x7f030007;
+ public static final int musictab=0x7f030008;
+ public static final int pictures=0x7f030009;
+ public static final int picturesfullscreen=0x7f03000a;
+ public static final int playingnow=0x7f03000b;
+ public static final int playnowlist=0x7f03000c;
+ public static final int remote=0x7f03000d;
+ public static final int setup=0x7f03000e;
+ public static final int splash=0x7f03000f;
+ public static final int title=0x7f030010;
}
public static final class string {
public static final int app_name=0x7f040001;
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/album.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/album.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/album_off.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/album_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/artist.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/artist.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/artist_off.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/artist_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/audio.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/audio.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/foldertab.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/foldertab.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/foldertab_off.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/foldertab_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- When selected, use grey -->
+ <item android:drawable="@drawable/forward"
+ android:state_selected="true" />
+ <!-- When not selected, use white-->
+ <item android:drawable="@drawable/rewind" />
+</selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab1.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab1.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab1.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- When selected, use grey -->
+ <item android:drawable="@drawable/artist"
+ android:state_selected="true" />
+ <!-- When not selected, use white-->
+ <item android:drawable="@drawable/artist_off" />
+</selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab2.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab2.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab2.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- When selected, use grey -->
+ <item android:drawable="@drawable/album"
+ android:state_selected="true" />
+ <!-- When not selected, use white-->
+ <item android:drawable="@drawable/album_off" />
+</selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab3.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab3.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab3.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- When selected, use grey -->
+ <item android:drawable="@drawable/song"
+ android:state_selected="true" />
+ <!-- When not selected, use white-->
+ <item android:drawable="@drawable/song_off" />
+</selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab4.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab4.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_tab4.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- When selected, use grey -->
+ <item android:drawable="@drawable/foldertab"
+ android:state_selected="true" />
+ <!-- When not selected, use white-->
+ <item android:drawable="@drawable/foldertab_off" />
+</selector>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/song.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/song.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/song_off.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/song_off.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-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -3,35 +3,33 @@
android:layout_height="fill_parent" android:background="@drawable/back">
<Button android:id="@+id/MainButton1" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:padding="0dp"
- android:background="@drawable/pictures_logo" />
+ android:layout_height="70dip" android:background="@drawable/pictures_logo" />
- <View android:layout_height="2dp" android:layout_width="fill_parent"
+ <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="wrap_content" android:padding="0dp"
- android:background="@drawable/music_logo" />
+ android:layout_height="70dip" android:background="@drawable/music_logo" />
- <View android:layout_height="2dp" android:layout_width="fill_parent"
+ <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="wrap_content" android:padding="0dp"
- android:background="@drawable/videos_logo" />
+ android:layout_height="70dip" android:background="@drawable/videos_logo" />
- <View android:layout_height="2dp" android:layout_width="fill_parent"
+ <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="wrap_content" android:padding="0dp"
- android:background="@drawable/remote_logo" />
+ android:layout_height="70dip" android:background="@drawable/remote_logo" />
- <View android:layout_height="2dp" android:layout_width="fill_parent"
+ <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="wrap_content" android:padding="0dp"
- android:background="@drawable/nowplaying_logo" />
+ android:layout_height="70dip" android:background="@drawable/nowplaying_logo" />
+ <View android:layout_height="2dip" android:layout_width="fill_parent"
+ android:background="#000" />
+
</LinearLayout>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,12 @@
+<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">
+ <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"
+ android:numColumns="auto_fit" android:verticalSpacing="10dp"
+ android:horizontalSpacing="10dp" android:stretchMode="columnWidth"
+ android:gravity="center">
+ </GridView>
+</AbsoluteLayout>
+
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,10 @@
+<?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"
+ android:layout_width="fill_parent">
+ </ListView>
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,10 @@
+<?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"
+ android:layout_width="fill_parent">
+ </ListView>
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,10 @@
+<?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"
+ android:layout_width="fill_parent">
+ </ListView>
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,10 @@
+<?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"
+ android:layout_width="fill_parent">
+ </ListView>
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/musictab.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/musictab.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/musictab.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/tabhost"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:padding="5dp">
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:padding="5dp" />
+ </LinearLayout>
+</TabHost>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -4,6 +4,7 @@
<TextView android:id="@+id/full_text" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="name"
android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:textSize="20dip"
android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
</TextView>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -18,9 +18,8 @@
android:gravity="center_horizontal">
</TextView>
- <ImageView android:id="@+id/now_cd" android:layout_width="250dip"
- android:layout_height="250dip" 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="200dip" android:layout_width="200dip" android:layout_marginTop="20dip" android:layout_marginBottom="20dip">
</ImageView>
<SeekBar android:id="@+id/now_progress" android:layout_width="fill_parent"
@@ -36,12 +35,12 @@
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="left"
+ android:textSize="12dip" android:textColor="#FF8080ff" android:text="00:00"
android:gravity="left" />
<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="right"
+ android:textColor="#FF8080ff" android:gravity="right" android:text="00:00"
android:singleLine="true" />
</RelativeLayout>
<TextView android:id="@+id/now_title" android:layout_width="fill_parent"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playnowlist.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -1,6 +1,7 @@
<?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">
<TextView android:id="@+id/TextView01" android:layout_height="wrap_content"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml 2010-11-28 20:12:33 UTC (rev 3985)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -1,33 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
-<AbsoluteLayout android:id="@+id/widget0"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:background="@drawable/back" xmlns:android="http://schemas.android.com/apk/res/android">
- <Button android:id="@+id/btnUp" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:background="@drawable/up_icon"
- android:layout_x="130px" android:layout_y="100px">
- </Button>
- <Button android:id="@+id/btnReturn" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:text="Return"
- android:layout_x="10px" android:layout_y="8px">
- </Button>
- <Button android:id="@+id/btnCancel" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:background="@drawable/close_icon"
- android:layout_x="260px" android:layout_y="8px">
- </Button>
- <Button android:id="@+id/btnOk" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:background="@drawable/accept_icon"
- android:layout_x="130px" android:layout_y="175px">
- </Button>
- <Button android:id="@+id/btnDown" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:background="@drawable/down_icon"
- android:layout_x="130px" android:layout_y="250px">
- </Button>
- <Button android:id="@+id/btnRight" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:background="@drawable/next_icon"
- android:layout_x="205px" android:layout_y="175px">
- </Button>
- <Button android:id="@+id/btnLeft" android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:background="@drawable/back_icon"
- android:layout_x="55px" android:layout_y="175px"></Button>
+<LinearLayout
+ android:id="@+id/widget0"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@drawable/back"
+ android:orientation="vertical"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <LinearLayout
+ android:id="@+id/widget00"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ >
+
+ <Button android:id="@+id/btnFBack"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="FBack">
+ </Button>
+
+ <Button android:id="@+id/btnPlay"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:text="Play">
+ </Button>
+
+ <Button android:id="@+id/btnFForw"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="FForw">
+ </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:text="Skp -">
+ </Button>
+
+ <Button android:id="@+id/btnStop"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Stop">
+ </Button>
+
+ <Button android:id="@+id/btnPause"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Pause">
+ </Button>
+
+ <Button android:id="@+id/btnSkipForw"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Skp +">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/widget02"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <Button android:id="@+id/btnHome"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Home">
+ </Button>
+
+ <Button android:id="@+id/btnUp"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/up_icon">
+ </Button>
+
+ <Button android:id="@+id/btnInfo"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Info">
+ </Button>
+
+ </LinearLayout>
-</AbsoluteLayout>
\ No newline at end of file
+ <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:layout_height="120dip"
+ android:background="@drawable/back_icon">
+ </Button>
+
+ <Button android:id="@+id/btnOk"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/accept_icon">
+ </Button>
+
+ <Button android:id="@+id/btnRight"
+ android:layout_width="80dip"
+ android:layout_height="120dip"
+ android:background="@drawable/next_icon">
+ </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:layout_height="60dip"
+ android:text="Menu">
+ </Button>
+
+ <Button android:id="@+id/btnDown"
+ android:layout_width="160dip"
+ android:layout_height="60dip"
+ android:background="@drawable/down_icon">
+ </Button>
+
+ <Button android:id="@+id/btnBack"
+ android:layout_width="80dip"
+ android:layout_height="60dip"
+ android:text="Back">
+ </Button>
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/title.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/title.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/title.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,15 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content" android:gravity="left|center"
+ android:layout_width="fill_parent" android:paddingBottom="0px"
+ android:paddingTop="0px" android:paddingLeft="0px">
+
+ <mediaportal.remote.ScrollView
+ android:id="@+id/title" android:gravity="center_vertical"
+ android:textColor="#000000" android:layout_alignParentRight="true"
+ android:background="#a0a0a0" android:layout_height="wrap_content"
+ android:layout_alignParentTop="true" android:padding="0dip"
+ android:layout_margin="0dip" android:textSize="20px"
+ android:ellipsize="marquee" android:marqueeRepeatLimit="marquee_forever"
+ android:singleLine="true" android:layout_width="fill_parent"
+ android:scrollHorizontally="true" android:text="New Title oder waht" />
+</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,84 @@
+<LinearLayout android:id="@+id/LinearLayout01"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@drawable/back"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <TextView android:id="@+id/now_playing" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="NOW PLAYING"
+ android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:textColor="#FF000000" android:textSize="16dip"
+ android:textColorHighlight="#FFFFFFFF">
+ </TextView>
+
+ <TextView android:id="@+id/now_album" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Album"
+ android:background="#F0F0F0FF" android:textColor="#FF000000"
+ android:textSize="16dip" android:textColorHighlight="#FFFFFFFF"
+ 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>
+
+ <SeekBar android:id="@+id/now_progress" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:max="100"
+ android:paddingLeft="20dip" android:paddingRight="10dip"
+ android:paddingTop="0dip" android:thumbOffset="20dip"
+ android:layout_marginTop="-10dip" />
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="vertical"
+ android:layout_marginTop="-9dip">
+ <RelativeLayout android:layout_width="fill_parent"
+ 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" />
+ <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" />
+ </RelativeLayout>
+ <TextView android:id="@+id/now_title" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:textSize="14dip"
+ android:background="#F0F0F0FF" android:textColor="#FF000000"
+ android:text="Artist" android:gravity="center_horizontal"
+ android:ellipsize="end" android:paddingLeft="25dip"
+ android:paddingRight="22dip" android:layout_marginTop="0dip" />
+ <TextView android:id="@+id/now_artist" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:gravity="center_horizontal"
+ android:textSize="16dip" android:textColor="#FF000000"
+ android:background="#FFFFFFFF" android:text="Title"
+ android:layout_marginTop="0dip" />
+ </LinearLayout>
+
+ <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" />
+ <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" />
+ <ImageButton android:id="@+id/now_play"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/play" />
+ <ImageButton android:id="@+id/now_next"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/forward" />
+ <ImageButton android:id="@+id/now_list"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/document"/>
+ </LinearLayout>
+
+</LinearLayout>
+
+
+
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-11-29 13:05:10 UTC (rev 3986)
@@ -0,0 +1,140 @@
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+
+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;
+
+import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
+
+public class ReceiveDbHandler {
+
+ public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+
+ private static ArrayList<DbItems> Result;
+ private static ReceiveDbHandler instance;
+
+ private String _server;
+ private String _port;
+
+ public int selectedMusic;
+
+ public static ReceiveDbHandler getinstance() {
+ if (instance == null)
+ instance = new ReceiveDbHandler();
+ return instance;
+ }
+
+ public void setconnection(String server, String port) {
+ _server = server;
+ _port = port;
+ }
+
+ public boolean GetAlbums() {
+ fetchData("album.xml");
+ return true;
+ }
+
+ public boolean GetArtist() {
+ fetchData("artist.xml");
+ return true;
+ }
+
+ public boolean GetSongs() {
+ fetchData("song.xml");
+ return true;
+ }
+
+ public boolean GetSongsByArtist(String Artist) {
+ fetchData(...
[truncated message content] |
|
From: <kro...@us...> - 2010-11-28 20:12:39
|
Revision: 3985
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3985&view=rev
Author: kroko_koenig
Date: 2010-11-28 20:12:33 +0000 (Sun, 28 Nov 2010)
Log Message:
-----------
more remote control
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs 2010-11-28 12:47:40 UTC (rev 3984)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs 2010-11-28 20:12:33 UTC (rev 3985)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-28 12:47:40 UTC (rev 3984)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-28 20:12:33 UTC (rev 3985)
@@ -98,8 +98,13 @@
AndroidServer.logDebug("receive HTTP GET : " + req);
+ if (req.StartsWith("/info"))
+ {
+ ReplyInfo();
+ }
+
#region pictures
- if (req.StartsWith("/pictures"))
+ else if (req.StartsWith("/pictures"))
{
// handle pictures
req = req.Replace("/pictures", "");
@@ -160,6 +165,9 @@
}
}
#endregion
+
+ #region music datatbase
+
else if (req.StartsWith("/db_music"))
{
// handle pictures
@@ -179,7 +187,6 @@
ReplyMusicDbSongs();
}
}
- #region music datatbase
#endregion
@@ -232,6 +239,9 @@
private void ExceuteCommand(string Message)
{
AndroidServer.logDebug("execute command");
+ System.Diagnostics.Debug.WriteLine(Message);
+
+ #region player
if (Message.Contains("ACTION_PLAY"))
{
Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
@@ -257,7 +267,19 @@
Action action = new Action(Action.ActionType.ACTION_PREV_ITEM, 0, 0);
GUIGraphicsContext.OnAction(action);
}
+ if (Message.Contains("ACTION_FORWARD"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_FORWARD, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_REWIND"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_REWIND, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ #endregion
+ #region navigate
if (Message.Contains("ACTION_MOVE_RIGHT"))
{
Action action = new Action(Action.ActionType.ACTION_MOVE_RIGHT, 0, 0);
@@ -283,13 +305,87 @@
Action action = new Action(Action.ActionType.ACTION_SELECT_ITEM, 0, 0);
GUIGraphicsContext.OnAction(action);
}
+ #endregion
+
+ #region menu
if (Message.Contains("ACTION_PREVIOUS_MENU"))
{
Action action = new Action(Action.ActionType.ACTION_PREVIOUS_MENU, 0, 0);
GUIGraphicsContext.OnAction(action);
}
+ if (Message.Contains("ACTION_PARENT_DIR"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PARENT_DIR, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_SHOW_INFO"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_SHOW_INFO, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_CONTEXT_MENU"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_CONTEXT_MENU, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ #endregion
+
+ #region volume / programm
+ if (Message.Contains("ACTION_VOLUME_UP"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_VOLUME_UP, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_VOLUME_DOWN"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_VOLUME_DOWN, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_VOLUME_MUTE"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_VOLUME_MUTE, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_NEXT_CHANNEL"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_NEXT_CHANNEL, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_PREV_CHANNEL"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PREV_CHANNEL, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+
+
+ #endregion
+
}
+ private void ReplyInfo()
+ {
+ 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 += "<Info>\r\n";
+
+ string strVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+ msg += "<ServerVersion>" + strVersion + "</ServerVersion>";
+
+ string Computername = System.Windows.Forms.SystemInformation.ComputerName.ToString();
+ msg += "<ComputerName>" + Computername + "</ComputerName>";
+
+ msg += "</Info>\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply info server");
+ }
+
private void ReplyPictureDir(string dir, string request)
{
if (Directory.Exists(dir))
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: <do...@us...> - 2010-11-28 12:47:47
|
Revision: 3984
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3984&view=rev
Author: dot-i
Date: 2010-11-28 12:47:40 +0000 (Sun, 28 Nov 2010)
Log Message:
-----------
Updated to 1.5.0.3 release.
Modified Paths:
--------------
trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideController.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideModel.cs
trunk/plugins/ForTheRecord/ReferencedAssemblies/Core.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Databases.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Dialogs.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/PluginBase.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/SetupControls.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TVDatabase.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TvBusinessLayer.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TvControl.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/TvLibrary.Interfaces.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/Utils.dll
Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-11-27 16:22:51 UTC (rev 3983)
+++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2010-11-28 12:47:40 UTC (rev 3984)
@@ -25,6 +25,7 @@
using System.Threading;
using System.Diagnostics;
using System.Globalization;
+using System.Runtime.InteropServices;
using TvLibrary.Interfaces;
using TvEngine.Events;
@@ -54,6 +55,7 @@
_suggestedBaseFileName = suggestedBaseFileName;
_recordOnCard = recordOnCard;
_channel = channel;
+ SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED | EXECUTION_STATE.ES_AWAYMODE_REQUIRED);
}
#region Overrides
@@ -69,6 +71,12 @@
private User _tve3User;
private string _tve3RecordingFileName;
+ protected override void OnThreadEnding()
+ {
+ base.OnThreadEnding();
+ SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS);
+ }
+
protected override bool OnPrepareRecording(RecorderTunerCallbackServiceAgent callbackAgent, ref string errorMessage)
{
DeleteAllMediaPortalSchedules();
@@ -291,5 +299,21 @@
}
#endregion
+
+ #region P/Invoke
+
+ [FlagsAttribute]
+ private enum EXECUTION_STATE : uint
+ {
+ ES_SYSTEM_REQUIRED = 0x00000001,
+ ES_DISPLAY_REQUIRED = 0x00000002,
+ ES_AWAYMODE_REQUIRED = 0x00000040,
+ ES_CONTINUOUS = 0x80000000
+ }
+
+ [DllImport("Kernel32.DLL", CharSet = CharSet.Auto, SetLastError = true)]
+ private extern static EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE state);
+
+ #endregion
}
}
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs 2010-11-27 16:22:51 UTC (rev 3983)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs 2010-11-28 12:47:40 UTC (rev 3984)
@@ -88,8 +88,7 @@
HORZ_SCROLLBAR = 28,
VERT_SCROLLBAR = 29,
LABEL_TIME1 = 40, // first and template
- IMG_CHAN1 = 50,
- IMG_CHAN1_LABEL = 70,
+ IMG_CHAN1 = 70,
IMG_TIME1 = 90, // first and template
IMG_REC_PIN = 31,
SINGLE_CHANNEL_LABEL = 32,
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideController.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideController.cs 2010-11-27 16:22:51 UTC (rev 3983)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideController.cs 2010-11-28 12:47:40 UTC (rev 3984)
@@ -39,7 +39,13 @@
public void Initialize(ITvSchedulerService tvSchedulerAgent, ChannelType channelType, int epgHours, string allChannelsGroupName)
{
+ Initialize(tvSchedulerAgent, channelType, epgHours, 0, allChannelsGroupName);
+ }
+
+ public void Initialize(ITvSchedulerService tvSchedulerAgent, ChannelType channelType, int epgHours, int epgHoursOffset, string allChannelsGroupName)
+ {
_model.EpgHours = epgHours;
+ _model.EpgHoursOffset = epgHoursOffset;
_model.AllChannelsGroupName = allChannelsGroupName;
ChangeChannelType(tvSchedulerAgent, channelType);
}
@@ -86,6 +92,10 @@
DateTime guideDate = DateTime.Now;
int hours = (int)Math.Floor((decimal)guideDate.TimeOfDay.TotalHours);
_model.GuideDateTime = guideDate.Date.Add(new TimeSpan(hours - hours % _model.EpgHours, 0, 0));
+ if (_model.GuideDateTime.TimeOfDay.TotalHours < _model.EpgHoursOffset)
+ {
+ _model.GuideDateTime = _model.GuideDateTime.AddDays(-1).AddHours(_model.EpgHoursOffset);
+ }
}
public delegate bool CancellationPendingDelegate();
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideModel.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideModel.cs 2010-11-27 16:22:51 UTC (rev 3983)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideModel.cs 2010-11-28 12:47:40 UTC (rev 3984)
@@ -35,6 +35,8 @@
public int EpgHours { get; internal set; }
+ public int EpgHoursOffset { get; internal set; }
+
public string AllChannelsGroupName { get; internal set; }
private List<ChannelGroup> _channelGroups = new List<ChannelGroup>();
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Core.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Databases.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/PluginBase.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/SetupControls.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TVDatabase.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TvBusinessLayer.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TvControl.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/TvLibrary.Interfaces.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/Utils.dll
===================================================================
(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-11-27 16:22:58
|
Revision: 3983
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3983&view=rev
Author: kroko_koenig
Date: 2010-11-27 16:22:51 +0000 (Sat, 27 Nov 2010)
Log Message:
-----------
add database support
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-11-26 12:55:30 UTC (rev 3982)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj 2010-11-27 16:22:51 UTC (rev 3983)
@@ -35,6 +35,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
</Reference>
+ <Reference Include="Databases, Version=1.1.1.11856, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-26 12:55:30 UTC (rev 3982)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-27 16:22:51 UTC (rev 3983)
@@ -23,6 +23,7 @@
#endregion
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Text;
@@ -36,6 +37,7 @@
using MediaPortal.GUI.Library;
using MediaPortal.Utils;
+using MediaPortal.Database;
namespace AndroidRemote
{
@@ -54,147 +56,177 @@
public void DoWork()
{
- string clientmessage = " ";
- string allMessage = string.Empty;
-
- while (socket.Connected)
+ try
{
- read = new byte[1024];
- int bytes = readmessage(read, ref socket, ref clientmessage);
+ string clientmessage = " ";
+ string allMessage = string.Empty;
- if (clientmessage.Contains("Continue"))
+ while (socket.Connected)
{
- AndroidServer.logDebug("receive HTTP Continue");
+ read = new byte[1024];
+ int bytes = readmessage(read, ref socket, ref clientmessage);
- allMessage = allMessage + clientmessage.Substring(0, bytes);
- sendMessage(socket, "HTTP/1.0 100 Continue\r\n");
- sendMessage(socket, "\r\n");
- }
- else
- {
- allMessage = allMessage + clientmessage.Substring(0, bytes);
-
- if (clientmessage.Contains("POST"))
+ if (clientmessage.Contains("Continue"))
{
- AndroidServer.logDebug("receive HTTP POST");
+ AndroidServer.logDebug("receive HTTP Continue");
- sendMessage(socket, "HTTP/1.0 200 OK\r\n");
+ allMessage = allMessage + clientmessage.Substring(0, bytes);
+ sendMessage(socket, "HTTP/1.0 100 Continue\r\n");
sendMessage(socket, "\r\n");
-
- ExceuteCommand(allMessage);
}
else
{
- // GET
- int index1 = clientmessage.IndexOf(' ');
- int index2 = clientmessage.IndexOf(' ', index1 + 1);
- string req = clientmessage.Substring(index1 + 1, index2 - index1).Trim().ToLower();
+ allMessage = allMessage + clientmessage.Substring(0, bytes);
- req = HttpUtility.UrlDecode(req);
+ if (clientmessage.Contains("POST"))
+ {
+ AndroidServer.logDebug("receive HTTP POST");
- AndroidServer.logDebug("receive HTTP GET : " + req);
+ sendMessage(socket, "HTTP/1.0 200 OK\r\n");
+ sendMessage(socket, "\r\n");
- #region pictures
- if (req.StartsWith("/pictures"))
+ ExceuteCommand(allMessage);
+ }
+ else
{
- // handle pictures
- req = req.Replace("/pictures", "");
- if (req.StartsWith("/")) req = req.Substring(1);
+ // GET
+ int index1 = clientmessage.IndexOf(' ');
+ int index2 = clientmessage.IndexOf(' ', index1 + 1);
+ string req = clientmessage.Substring(index1 + 1, index2 - index1).Trim().ToLower();
- if (req == "")
+ req = HttpUtility.UrlDecode(req);
+
+ AndroidServer.logDebug("receive HTTP GET : " + req);
+
+ #region pictures
+ if (req.StartsWith("/pictures"))
{
- // root
- ReplyPictureDir(AndroidServer.PicturePath, "root");
- }
- else
- {
- req = req.Replace("/", "\\");
+ // handle pictures
+ req = req.Replace("/pictures", "");
+ if (req.StartsWith("/")) req = req.Substring(1);
- if (req.EndsWith(".jpg"))
+ if (req == "")
{
- string orgPath = AndroidServer.PicturePath + "\\" + req;
- ReplyPictureFile(orgPath);
+ // root
+ ReplyPictureDir(AndroidServer.PicturePath, "root");
}
- else if (req.EndsWith(".thb"))
- {
- string orgPath = AndroidServer.PicturePath + "\\" + req;
- ReplyPictureThumbFile(orgPath);
- }
else
{
- ReplyPictureDir(AndroidServer.PicturePath + "\\" + req, req);
+ req = req.Replace("/", "\\");
+
+ if (req.EndsWith(".jpg"))
+ {
+ string orgPath = AndroidServer.PicturePath + "\\" + req;
+ ReplyPictureFile(orgPath);
+ }
+ else if (req.EndsWith(".thb"))
+ {
+ string orgPath = AndroidServer.PicturePath + "\\" + req;
+ ReplyPictureThumbFile(orgPath);
+ }
+ else
+ {
+ ReplyPictureDir(AndroidServer.PicturePath + "\\" + req, req);
+ }
}
}
- }
- #endregion
+ #endregion
- #region music
- else if (req.StartsWith("/music"))
- {
- // handle pictures
- req = req.Replace("/music", "");
- if (req.StartsWith("/")) req = req.Substring(1);
+ #region music
+ else if (req.StartsWith("/music"))
+ {
+ // handle pictures
+ req = req.Replace("/music", "");
+ if (req.StartsWith("/")) req = req.Substring(1);
- if (req == "")
- {
- // root
- ReplyMusicDir(AndroidServer.MusicPath, "root");
+ if (req == "")
+ {
+ // root
+ ReplyMusicDir(AndroidServer.MusicPath, "root");
+ }
+ else
+ {
+ req = req.Replace("/", "\\");
+
+ if (req.EndsWith(".mp3"))
+ {
+ string orgPath = AndroidServer.MusicPath + "\\" + req;
+ ReplyMusicFile(orgPath);
+ }
+ else
+ {
+ ReplyMusicDir(AndroidServer.MusicPath + "\\" + req, req);
+ }
+ }
}
- else
+ #endregion
+ else if (req.StartsWith("/db_music"))
{
- req = req.Replace("/", "\\");
+ // handle pictures
+ req = req.Replace("/db_music", "");
+ if (req.StartsWith("/")) req = req.Substring(1);
- if (req.EndsWith(".mp3"))
+ if (req == "artist.xml")
{
- string orgPath = AndroidServer.MusicPath + "\\" + req;
- ReplyMusicFile(orgPath);
+ ReplyMusicDbArtist();
}
- else
+ if (req == "album.xml")
{
- ReplyMusicDir(AndroidServer.MusicPath + "\\" + req, req);
+ ReplyMusicDbAlbum();
}
+ if (req == "song.xml")
+ {
+ ReplyMusicDbSongs();
+ }
}
- }
- #endregion
+ #region music datatbase
- #region nowplaying
- else if (req.StartsWith("/nowplaying/now.xml"))
- {
- ReplyNowPlaying();
- }
- else if (req.StartsWith("/nowplaying/list.xml"))
- {
- ReplyNowPlayingPlaylist();
- }
- else if (req.StartsWith("/nowplaying/cover"))
- {
- ReplyNowCover();
- }
- #endregion
+ #endregion
- #region favicon
- else if (req.StartsWith("/favicon.ico"))
- {
- ReplyFavIcon();
- }
- #endregion
+ #region nowplaying
+ else if (req.StartsWith("/nowplaying/now.xml"))
+ {
+ ReplyNowPlaying();
+ }
+ else if (req.StartsWith("/nowplaying/list.xml"))
+ {
+ ReplyNowPlayingPlaylist();
+ }
+ else if (req.StartsWith("/nowplaying/cover"))
+ {
+ ReplyNowCover();
+ }
+ #endregion
- else
- {
- SendErrorURL(req);
+ #region favicon
+ else if (req.StartsWith("/favicon.ico"))
+ {
+ ReplyFavIcon();
+ }
+ #endregion
+
+ else
+ {
+ SendErrorURL(req);
+ }
+
}
- }
-
- if (socket != null)
- {
- if (socket.Connected)
+ if (socket != null)
{
- socket.Close();
+ if (socket.Connected)
+ {
+ socket.Close();
+ }
}
}
}
}
+ catch (Exception ex)
+ {
+ AndroidServer.logInfo("Error on request : " + ex.Message);
+ AndroidServer.logInfo("Stacktrace : " + ex.StackTrace);
+ }
}
private void ExceuteCommand(string Message)
@@ -281,7 +313,9 @@
string[] files = Directory.GetFiles(dir, "*.jpg", SearchOption.TopDirectoryOnly);
foreach (string f in files)
{
- msg += "<File>" + HttpUtility.HtmlEncode(Path.GetFileName(f)) + "</File>\r\n";
+ 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
@@ -339,6 +373,7 @@
}
private void ReplyPictureThumbFile(string filePath)
{
+ filePath = filePath.Replace("thb", "");
if (File.Exists(filePath))
{
Bitmap bit = (Bitmap)Bitmap.FromFile(filePath);
@@ -397,7 +432,9 @@
string[] files = Directory.GetFiles(dir, "*.mp3", SearchOption.TopDirectoryOnly);
foreach (string f in files)
{
- msg += "<File>" + HttpUtility.HtmlEncode(Path.GetFileName(f)) + "</File>\r\n";
+ 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
@@ -433,6 +470,114 @@
}
}
+ private void ReplyMusicDbArtist()
+ {
+ 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 += "<Database>\r\n";
+
+ MediaPortal.Music.Database.MusicDatabase db = MediaPortal.Music.Database.MusicDatabase.Instance;
+ ArrayList list = new ArrayList();
+ db.GetAllArtists(ref list);
+
+ foreach (string artist in list)
+ {
+ if (artist != string.Empty)
+ {
+ msg += "<Item>\r\n";
+ msg += "<Artist>" + HttpUtility.HtmlEncode(artist) + "</Artist>\r\n";
+ msg += "</Item>\r\n";
+ }
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply music db artist");
+
+ }
+ private void ReplyMusicDbAlbum()
+ {
+ 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 += "<Database>\r\n";
+
+
+ MediaPortal.Music.Database.MusicDatabase db = MediaPortal.Music.Database.MusicDatabase.Instance;
+ List<MediaPortal.Music.Database.AlbumInfo> list = new List<MediaPortal.Music.Database.AlbumInfo>();
+ db.GetAllAlbums(ref list);
+
+ foreach (MediaPortal.Music.Database.AlbumInfo album in list)
+ {
+ string name = album.Album.Replace("|", "").Trim();
+ if (name != string.Empty)
+ {
+ msg += "<Item>\r\n";
+
+ msg += "<Album>" + HttpUtility.HtmlEncode(album.Album.Replace("|", "").Trim()) + "</Album>\r\n";
+ msg += "<AlbumArtist>" + HttpUtility.HtmlEncode(album.AlbumArtist.Replace("|", "").Trim()) + "</AlbumArtist>\r\n";
+ msg += "<Artist>" + HttpUtility.HtmlEncode(album.Artist.Replace("|", "").Trim()) + "</Artist>\r\n";
+ msg += "<Genre>" + HttpUtility.HtmlEncode(album.Genre.Replace("|", "").Trim()) + "</Genre>\r\n";
+ msg += "<Rating>" + HttpUtility.HtmlEncode(album.Rating.ToString()) + "</Rating>\r\n";
+
+ msg += "</Item>\r\n";
+ }
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply music db artist");
+
+ }
+ private void ReplyMusicDbSongs()
+ {
+ 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 += "<Database>\r\n";
+
+ MediaPortal.Music.Database.MusicDatabase db = MediaPortal.Music.Database.MusicDatabase.Instance;
+ List<MediaPortal.Music.Database.Song> list = new List<MediaPortal.Music.Database.Song>();
+ db.GetSongsByArtist("%", ref list);
+
+ foreach (MediaPortal.Music.Database.Song song in list)
+ {
+ msg += "<Item>\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";
+ msg += "<Genre>" + HttpUtility.HtmlEncode(song.Genre) + "</Genre>\r\n";
+ msg += "<Rating>" + HttpUtility.HtmlEncode(song.Rating.ToString()) + "</Rating>\r\n";
+
+ msg += "</Item>\r\n";
+ }
+
+ msg += "</Database>\r\n\r\n";
+ // send
+ sendMessage(socket, msg);
+ AndroidServer.logDebug("Reply music db artist");
+
+ }
+
private void ReplyNowPlaying()
{
string title = GUIPropertyManager.GetProperty("#Play.Current.Title");
@@ -608,7 +753,7 @@
msg += "<h1>Not Found</h1>" + "\r\n";
msg += "<p>The requested URL " + Url + " was not found on this server.</p>" + "\r\n";
msg += "<hr>" + "\r\n";
- msg += "<address>TeamMediaportal Server at 127.0.0.1 Port 5050</address>" + "\r\n";
+ msg += "<address>TeamMediaportal Server at " + AndroidServer.Server + " Port " + AndroidServer.Port + "</address>" + "\r\n";
msg += "</body></html>" + "\r\n";
// send
sendMessage(socket, msg);
@@ -685,10 +830,17 @@
private int readmessage(byte[] ByteArray, ref Socket s, ref String clientmessage)
{
- int bytes = s.Receive(ByteArray, 1024, 0);
- string messagefromclient = Encoding.ASCII.GetString(ByteArray);
- clientmessage = (String)messagefromclient;
- return bytes;
+ try
+ {
+ int bytes = s.Receive(ByteArray, 1024, 0);
+ string messagefromclient = Encoding.ASCII.GetString(ByteArray);
+ clientmessage = (String)messagefromclient;
+ return bytes;
+ }
+ catch { }
+ // if socket exception
+ clientmessage = "";
+ return 0;
}
private void sendMessage(Socket sock, string strMessage)
@@ -701,7 +853,6 @@
sock.Send(buffer, len, 0);
}
catch { }
-
}
private void sendBytes(Socket sock, byte[] Bytes)
{
@@ -710,7 +861,6 @@
sock.Send(Bytes, Bytes.Length, 0);
}
catch { }
-
}
private byte[] FileToByteArray(string _FileName)
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2010-11-26 12:55:30 UTC (rev 3982)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2010-11-27 16:22:51 UTC (rev 3983)
@@ -36,21 +36,27 @@
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.txtPic = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.txtMusic = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.txtVideos = new System.Windows.Forms.Label();
- this.btnPic = new System.Windows.Forms.Button();
- this.btnMusic = new System.Windows.Forms.Button();
- this.btnVideos = new System.Windows.Forms.Button();
+ 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
//
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.btnCopy);
+ this.groupBox1.Controls.Add(this.txtMyIP);
this.groupBox1.Controls.Add(this.txtPort);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtServer);
@@ -138,43 +144,44 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Share";
//
- // label3
+ // btnVideos
//
- 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";
+ 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);
//
- // txtPic
+ // btnMusic
//
- 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 = "...";
+ 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);
//
- // label5
+ // btnPic
//
- 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";
+ 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);
//
- // txtMusic
+ // txtVideos
//
- 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 = "...";
+ 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
//
@@ -186,45 +193,74 @@
this.label7.TabIndex = 5;
this.label7.Text = "Videos";
//
- // txtVideos
+ // txtMusic
//
- 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 = "...";
+ 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 = "...";
//
- // btnPic
+ // label5
//
- 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);
+ 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";
//
- // btnMusic
+ // txtPic
//
- 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);
+ 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 = "...";
//
- // btnVideos
+ // label3
//
- 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);
+ 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);
@@ -270,5 +306,8 @@
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;
}
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2010-11-26 12:55:30 UTC (rev 3982)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2010-11-27 16:22:51 UTC (rev 3983)
@@ -30,6 +30,7 @@
using System.Text;
using System.Windows.Forms;
using System.IO;
+using System.Net;
using MediaPortal.Configuration;
@@ -45,6 +46,12 @@
private void Setup_Load(object sender, EventArgs e)
{
LoadSettings();
+
+ IPHostEntry IPHost = Dns.GetHostByName(Dns.GetHostName());
+ if (IPHost.AddressList.Length > 0)
+ txtMyIP.Text = IPHost.AddressList[0].ToString();
+ else
+ txtMyIP.Text = "no IP adress !";
}
private void LoadSettings()
@@ -120,7 +127,9 @@
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.
|
2 messages has been excluded from this view by a project administrator.
