From: <an...@us...> - 2008-03-30 12:31:51
|
Revision: 1566 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1566&view=rev Author: and-81 Date: 2008-03-30 05:31:45 -0700 (Sun, 30 Mar 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite.nsi.old trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Abstract Remote Model.xml trunk/plugins/IR Server Suite/setup.nsi trunk/plugins/MCEReplacement/Forms/SetupForm.cs trunk/plugins/MCEReplacement/MCEReplacement.cs trunk/plugins/MCEReplacement/MCEReplacement.csproj trunk/plugins/MCEReplacement/MappedEvent.cs Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs 2008-03-30 12:31:45 UTC (rev 1566) @@ -20,8 +20,8 @@ public class KeyboardInput : PluginBase, IRemoteReceiver { - #region Debug -#if DEBUG + // #define TEST_APPLICATION in the project properties when creating the console test app ... +#if TEST_APPLICATION static void Remote(string deviceName, string code) { @@ -31,19 +31,33 @@ [STAThread] static void Main() { - KeyboardInput c = new KeyboardInput(); - c.RemoteCallback += new RemoteHandler(Remote); + KeyboardInput c; - c.Start(); + try + { + c = new KeyboardInput(); - Application.Run(); + c.RemoteCallback += new RemoteHandler(Remote); - c.Stop(); - c = null; + c.Start(); + + Application.Run(); + + c.Stop(); + } + catch (Exception ex) + { + Console.WriteLine(ex.ToString()); + } + finally + { + c = null; + } + + Console.ReadKey(); } #endif - #endregion Debug #region Interop Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs 2008-03-30 12:31:45 UTC (rev 1566) @@ -17,6 +17,46 @@ public class TechnotrendReceiver : PluginBase, IRemoteReceiver { + // #define TEST_APPLICATION in the project properties when creating the console test app ... +#if TEST_APPLICATION + + static void Remote(string deviceName, string code) + { + Console.WriteLine("Remote: {0}", code); + } + + [STAThread] + static void Main() + { + TechnotrendReceiver c; + + try + { + c = new TechnotrendReceiver(); + + c.RemoteCallback += new RemoteHandler(Remote); + + c.Start(); + + System.Windows.Forms.Application.Run(); + + c.Stop(); + } + catch (Exception ex) + { + Console.WriteLine(ex.ToString()); + } + finally + { + c = null; + } + + Console.ReadKey(); + } + +#endif + + #region Enumerations /// <summary> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2008-03-30 12:31:45 UTC (rev 1566) @@ -62,6 +62,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2008-03-30 12:31:45 UTC (rev 1566) @@ -64,7 +64,6 @@ const int DeviceBufferSize = 7; const string DevicePathVidPid = "vid_045e&pid_0284"; - // const string DevicePathVidPid = "vid_1130&pid_cc00"; Asus DH Remote #endregion Constants Modified: trunk/plugins/IR Server Suite/IR Server Suite.nsi.old =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-03-30 12:31:45 UTC (rev 1566) @@ -427,6 +427,7 @@ File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*" ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*" File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*" + File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll" ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*" File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*" File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*" Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Abstract Remote Model.xml =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Abstract Remote Model.xml 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Abstract Remote Model.xml 2008-03-30 12:31:45 UTC (rev 1566) @@ -44,7 +44,7 @@ <code value="Left" /> </button> <button name="Ok"> - <code value="Ok" /> + <code value="OK" /> </button> <button name="Right"> <code value="Right" /> Modified: trunk/plugins/IR Server Suite/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup.nsi 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/IR Server Suite/setup.nsi 2008-03-30 12:31:45 UTC (rev 1566) @@ -401,6 +401,7 @@ File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*" ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*" File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*" + File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll" ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*" File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*" File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*" Modified: trunk/plugins/MCEReplacement/Forms/SetupForm.cs =================================================================== --- trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2008-03-30 12:31:45 UTC (rev 1566) @@ -646,10 +646,10 @@ MCEReplacement.EventMapperEnabled = checkBoxEventMapper.Checked; MCEReplacement.MouseModeEnabled = checkBoxMouseMode.Checked; - MCEReplacement.MouseModeButton = (RemoteButton)Enum.Parse(typeof(RemoteButton), (string)comboBoxMouseModeButton.SelectedItem); + MCEReplacement.MouseModeButton = (RemoteButton)Enum.Parse(typeof(RemoteButton), (string)comboBoxMouseModeButton.SelectedItem, true); MCEReplacement.MouseModeStep = Decimal.ToInt32(numericUpDownMouseStep.Value); - MCEReplacement.MultiMappingButton = (RemoteButton)Enum.Parse(typeof(RemoteButton), (string)comboBoxMultiButton.SelectedItem); + MCEReplacement.MultiMappingButton = (RemoteButton)Enum.Parse(typeof(RemoteButton), (string)comboBoxMultiButton.SelectedItem, true); SaveMultiMappings(); Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs =================================================================== --- trunk/plugins/MCEReplacement/MCEReplacement.cs 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2008-03-30 12:31:45 UTC (rev 1566) @@ -1272,7 +1272,7 @@ codeValue = -1; remoteMap[i++] = codeValue; - remoteMap[i++] = (int)Enum.Parse(typeof(RemoteButton), name); + remoteMap[i++] = (int)Enum.Parse(typeof(RemoteButton), name, true); } } } Modified: trunk/plugins/MCEReplacement/MCEReplacement.csproj =================================================================== --- trunk/plugins/MCEReplacement/MCEReplacement.csproj 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/MCEReplacement/MCEReplacement.csproj 2008-03-30 12:31:45 UTC (rev 1566) @@ -137,7 +137,6 @@ <Private>False</Private> </Reference> <Reference Include="System" /> - <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> <Reference Include="System.ServiceProcess" /> <Reference Include="System.Windows.Forms" /> Modified: trunk/plugins/MCEReplacement/MappedEvent.cs =================================================================== --- trunk/plugins/MCEReplacement/MappedEvent.cs 2008-03-30 11:51:14 UTC (rev 1565) +++ trunk/plugins/MCEReplacement/MappedEvent.cs 2008-03-30 12:31:45 UTC (rev 1566) @@ -288,7 +288,7 @@ if (String.IsNullOrEmpty(commandString)) return null; - string[] eventStringElements = eventString.Split(new char[] { ',', '=' }, StringSplitOptions.None); + string[] eventStringElements = eventString.Split(',', '='); if (eventStringElements.Length == 1) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |