Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[1999] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2008-08-04 04:22:55
|
Revision: 1999
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1999&view=rev
Author: and-81
Date: 2008-08-04 04:22:52 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Preparing for 1.4.2.0 Final release
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon/Imon PAD.xml
Added Paths:
-----------
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Imon PAD.xml
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2008-08-04 04:22:52 UTC (rev 1999)
@@ -14,7 +14,7 @@
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2008-08-04 04:22:52 UTC (rev 1999)
@@ -184,6 +184,8 @@
public override void Start()
{
#if DEBUG
+ try
+ {
DebugOpen("MicrosoftMceTransceiver_DriverReplacement.log");
DebugWriteLine("Start()");
DebugWriteLine("Device Guid: {0}", _deviceGuid);
@@ -202,6 +204,14 @@
_notifyWindow.DeviceArrival += new DeviceEventHandler(OnDeviceArrival);
_notifyWindow.DeviceRemoval += new DeviceEventHandler(OnDeviceRemoval);
+#if DEBUG
+ }
+ catch
+ {
+ DebugClose();
+ throw;
+ }
+#endif
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2008-08-04 04:22:52 UTC (rev 1999)
@@ -581,26 +581,36 @@
/// </summary>
public override void Start()
{
+ try
+ {
#if DEBUG
- DebugOpen("MicrosoftMceTransceiver_DriverVista.log");
- DebugWriteLine("Start()");
- DebugWriteLine("Device Guid: {0}", _deviceGuid);
- DebugWriteLine("Device Path: {0}", _devicePath);
+ DebugOpen("MicrosoftMceTransceiver_DriverVista.log");
+ DebugWriteLine("Start()");
+ DebugWriteLine("Device Guid: {0}", _deviceGuid);
+ DebugWriteLine("Device Path: {0}", _devicePath);
#endif
- _notifyWindow = new NotifyWindow();
- _notifyWindow.Create();
- _notifyWindow.Class = _deviceGuid;
- _notifyWindow.RegisterDeviceArrival();
+ _notifyWindow = new NotifyWindow();
+ _notifyWindow.Create();
+ _notifyWindow.Class = _deviceGuid;
+ //_notifyWindow.RegisterDeviceArrival();
- OpenDevice();
- InitializeDevice();
+ OpenDevice();
+ InitializeDevice();
- StartReceive(_receivePort, PacketTimeout);
- StartReadThread(ReadThreadMode.Receiving);
+ StartReceive(_receivePort, PacketTimeout);
+ StartReadThread(ReadThreadMode.Receiving);
- _notifyWindow.DeviceArrival += new DeviceEventHandler(OnDeviceArrival);
- _notifyWindow.DeviceRemoval += new DeviceEventHandler(OnDeviceRemoval);
+ _notifyWindow.DeviceArrival += new DeviceEventHandler(OnDeviceArrival);
+ _notifyWindow.DeviceRemoval += new DeviceEventHandler(OnDeviceRemoval);
+ }
+ catch
+ {
+#if DEBUG
+ DebugClose();
+#endif
+ throw;
+ }
}
/// <summary>
@@ -875,15 +885,18 @@
return;
}
- _readThreadMode = ReadThreadMode.Stop;
+ //if (_eHomeHandle != null)
+ // CancelIo(_eHomeHandle);
- //_readThread.Abort();
+ if (_readThread.IsAlive)
+ {
+ _readThread.Abort();
- if (_eHomeHandle != null)
- CancelIo(_eHomeHandle);
+ if (Thread.CurrentThread != _readThread)
+ _readThread.Join();
+ }
- //if (Thread.CurrentThread != _readThread)
- //_readThread.Join();
+ _readThreadMode = ReadThreadMode.Stop;
_readThread = null;
}
@@ -918,10 +931,15 @@
bool success = false;
_eHomeHandle.DangerousAddRef(ref success);
if (success)
+ {
+ //_notifyWindow.UnregisterDeviceArrival(); // If the device is present then we don't want to monitor arrival.
_notifyWindow.RegisterDeviceRemoval(_eHomeHandle.DangerousGetHandle());
+ }
#if DEBUG
else
+ {
DebugWriteLine("Warning: Failed to initialize device removal notification");
+ }
#endif
Thread.Sleep(PacketTimeout); // Hopefully improves compatibility with Zalman remote which times out retrieving device capabilities. (2008-01-01)
@@ -1061,7 +1079,22 @@
if (receiveParamsPtr != IntPtr.Zero)
Marshal.FreeHGlobal(receiveParamsPtr);
- StopReceive();
+ try
+ {
+ if (_eHomeHandle != null)
+ StopReceive();
+ }
+#if DEBUG
+ catch (Exception ex)
+ {
+ DebugWriteLine(ex.ToString());
+ }
+#else
+ catch
+ {
+ // Ignore this exception, we're closing it down anyway.
+ }
+#endif
}
#if DEBUG
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2008-08-04 04:22:52 UTC (rev 1999)
@@ -183,6 +183,8 @@
public override void Start()
{
#if DEBUG
+ try
+ {
DebugOpen("MicrosoftMceTransceiver_DriverXP.log");
DebugWriteLine("Start()");
DebugWriteLine("Device Guid: {0}", _deviceGuid);
@@ -201,6 +203,14 @@
_notifyWindow.DeviceArrival += new DeviceEventHandler(OnDeviceArrival);
_notifyWindow.DeviceRemoval += new DeviceEventHandler(OnDeviceRemoval);
+#if DEBUG
+ }
+ catch
+ {
+ DebugClose();
+ throw;
+ }
+#endif
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2008-08-04 04:22:52 UTC (rev 1999)
@@ -15,7 +15,7 @@
<ApplicationIcon>Icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-08-04 04:22:52 UTC (rev 1999)
@@ -361,12 +361,6 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media Center Blaster", "Applications\Media Center Blaster\Media Center Blaster.csproj", "{349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}"
- ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imon USB Receivers", "IR Server Plugins\Imon USB Receivers\Imon USB Receivers.csproj", "{EC37743A-64B2-472A-9EB6-CB052AD2B35C}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -611,10 +605,6 @@
{E83E5C73-5F70-4B52-B6BD-E906BAE90DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E83E5C73-5F70-4B52-B6BD-E906BAE90DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E83E5C73-5F70-4B52-B6BD-E906BAE90DF6}.Release|Any CPU.Build.0 = Release|Any CPU
- {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Release|Any CPU.Build.0 = Release|Any CPU
{EC37743A-64B2-472A-9EB6-CB052AD2B35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC37743A-64B2-472A-9EB6-CB052AD2B35C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC37743A-64B2-472A-9EB6-CB052AD2B35C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -646,7 +636,6 @@
{FEB70334-6F8E-41D5-9B0A-D5714A296830} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{4C18B138-BF94-4224-9085-4D3EDA680EDA} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{DCE0C464-3843-45F1-A48B-C1A3FF532C1D} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
- {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4} = {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}
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon/Imon PAD.xml
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon/Imon PAD.xml 2008-08-03 22:07:57 UTC (rev 1998)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon/Imon PAD.xml 2008-08-04 04:22:52 UTC (rev 1999)
@@ -51,4 +51,8 @@
<RemoteTable RawCode="1124" AbstractButton="Teletext" />
<RemoteTable RawCode="1198" AbstractButton="Guide" />
<RemoteTable RawCode="1150" AbstractButton="Home" />
+
+ <RemoteTable RawCode="1226" AbstractButton="LeftClick" />
+ <RemoteTable RawCode="1228" AbstractButton="RightClick" />
+
</DocumentElement>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Imon PAD.xml
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Imon PAD.xml (rev 0)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Imon PAD.xml 2008-08-04 04:22:52 UTC (rev 1999)
@@ -0,0 +1,189 @@
+<?xml version="1.0" standalone="yes"?>
+<remotes>
+ <remote name="iMon Pad">
+
+ <button name="PowerTV">
+ <code value="1002"/>
+ </button>
+ <button name="Power2">
+ <code value="1016"/>
+ </button>
+ <button name="Record">
+ <code value="1064"/>
+ </button>
+ <button name="Play">
+ <code value="1128"/>
+ </button>
+ <button name="Open">
+ <code value="1114"/>
+ </button>
+ <button name="Rewind">
+ <code value="1130"/>
+ </button>
+ <button name="Pause">
+ <code value="1144"/>
+ </button>
+ <button name="Forward">
+ <code value="1192"/>
+ </button>
+ <button name="Replay">
+ <code value="1208"/>
+ </button>
+ <button name="Stop">
+ <code value="1220"/>
+ </button>
+ <button name="Skip">
+ <code value="1066"/>
+ </button>
+
+ <button name="Back">
+ <code value="1032"/>
+ </button>
+ <button name="Ok">
+ <code value="1148"/>
+ </button>
+ <button name="WinStart">
+ <code value="1194"/>
+ </button>
+ <button name="WinMenu">
+ <code value="1060"/>
+ </button>
+
+ <button name="LeftClick">
+ <code value="1226"/>
+ </button>
+ <button name="RightClick">
+ <code value="1228"/>
+ </button>
+
+ <button name="Enter">
+ <code value="1034"/>
+ </button>
+ <button name="Esc">
+ <code value="1252"/>
+ </button>
+ <button name="Eject">
+ <code value="1086"/>
+ </button>
+ <button name="AppLauncher">
+ <code value="1124"/>
+ </button>
+ <button name="Start">
+ <code value="1178"/>
+ </button>
+ <button name="TaskSwitcher">
+ <code value="1150"/>
+ </button>
+
+ <button name="Mute">
+ <code value="1218"/>
+ </button>
+ <button name="VolumeUp">
+ <code value="1038"/>
+ </button>
+ <button name="ChannelUp">
+ <code value="1022"/>
+ </button>
+ <button name="Timer">
+ <code value="1198"/>
+ </button>
+ <button name="VolumeDown">
+ <code value="1042"/>
+ </button>
+ <button name="ChannelDown">
+ <code value="1014"/>
+ </button>
+
+ <button name="NumPad1">
+ <code value="1058"/>
+ </button>
+ <button name="NumPad2">
+ <code value="1242"/>
+ </button>
+ <button name="NumPad3">
+ <code value="1050"/>
+ </button>
+ <button name="NumPad4">
+ <code value="1138"/>
+ </button>
+ <button name="NumPad5">
+ <code value="1090"/>
+ </button>
+ <button name="NumPad6">
+ <code value="1170"/>
+ </button>
+ <button name="NumPad7">
+ <code value="1214"/>
+ </button>
+ <button name="NumPad8">
+ <code value="1136"/>
+ </button>
+ <button name="NumPad9">
+ <code value="1160"/>
+ </button>
+ <button name="ShiftTab">
+ <code value="1096"/>
+ </button>
+ <button name="NumPad0">
+ <code value="1234"/>
+ </button>
+ <button name="Tab">
+ <code value="1056"/>
+ </button>
+
+ <button name="MyVideos">
+ <code value="1200"/>
+ </button>
+ <!-- TeleText Red !-->
+ <button name="MyMusic">
+ <code value="1082"/>
+ </button>
+ <!-- TeleText Green !-->
+ <button name="MyPictures">
+ <code value="1224"/>
+ </button>
+ <!-- TeleText Blue !-->
+ <button name="MyTV">
+ <code value="1040"/>
+ </button>
+ <!-- TeleText Yellow !-->
+ <button name="Bookmark">
+ <code value="1008"/>
+ </button>
+ <button name="Thumbnail">
+ <code value="1188"/>
+ </button>
+ <button name="AspectRatio">
+ <code value="1106"/>
+ </button>
+ <button name="FullScreen">
+ <code value="1166"/>
+ </button>
+ <button name="MyDVD">
+ <code value="1102"/>
+ </button>
+ <button name="Menu">
+ <code value="1230"/>
+ </button>
+ <button name="Caption">
+ <code value="1074"/>
+ </button>
+ <button name="Language">
+ <code value="1202"/>
+ </button>
+
+ <button name="Up">
+ <code value="1250"/>
+ </button>
+ <button name="Down">
+ <code value="1248"/>
+ </button>
+ <button name="Left">
+ <code value="1246"/>
+ </button>
+ <button name="Right">
+ <code value="1244"/>
+ </button>
+
+ </remote>
+</remotes>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
