From: <an...@us...> - 2008-02-19 05:29:07
|
Revision: 1385 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1385&view=rev Author: and-81 Date: 2008-02-18 21:29:01 -0800 (Mon, 18 Feb 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Documentation/new.html trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite - Debug.nsi trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs trunk/plugins/MCEReplacement/Forms/StbSetup.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.xml Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.xml =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.xml (rev 0) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/RC102.xml 2008-02-19 05:29:01 UTC (rev 1385) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<skin> + <button name="Power" code="0" shortcut="None" top="54" left="49" height="37" width="37" /> + <button name="Up" code="1" shortcut="Up" top="54" left="102" height="37" width="37" /> + <button name="Back" code="2" shortcut="Back" top="54" left="155" height="37" width="37" /> +</skin> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Documentation/new.html =================================================================== --- trunk/plugins/IR Server Suite/Documentation/new.html 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-02-19 05:29:01 UTC (rev 1385) @@ -35,7 +35,9 @@ <LI>MCE Remote Receiver: Can now set remote and keyboard repeat rates to mimic system keyboard repeat rate settings.</LI> <LI>IR Server Plugin: Added support for HCW (Hauppauge) Receiver - Experimental.</LI> <LI>Translator: Added a "remap" button for changing the button associated with a command.</LI> -<LI>TCP Comms: Automatically map "localhost" to loopback address, avoiding the lookup process. This <i>might</i> solve a problem for some users.</LI> +<LI>IR Server Plugin: Added support for RC102 and compatible receivers - Experimental.</LI> +<LI>TCP Comms: Automatically maps "localhost" to loopback address, avoiding the lookup process. This <i>might</i> solve a host name lookup problem for some users.</LI> +<LI>IR Server Plugin: Added General HID plugin, should enable mapping special keyboard buttons (like Forward, Back, Play, Stop, Volume, etc...).</LI> </UL></P> <BR> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-02-19 05:29:01 UTC (rev 1385) @@ -63,7 +63,7 @@ /// A description of the IR Server plugin. /// </summary> /// <value>The description.</value> - public override string Description { get { return "Support the Ads Tech PTV-335 Receiver."; } } + public override string Description { get { return "Supports the Ads Tech PTV-335 Receiver"; } } /// <summary> /// Detect the presence of this device. Devices that cannot be detected will always return false. Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-02-19 05:29:01 UTC (rev 1385) @@ -20,16 +20,16 @@ public class CustomHIDReceiver : PluginBase, IConfigure, IRemoteReceiver, IKeyboardReceiver, IMouseReceiver { + #region Debug + static void Remote(string code) { Console.WriteLine("Remote: {0}", code); } - static void Keyboard(int button, bool up) { Console.WriteLine("Keyboard: {0}, {1}", button, up); } - static void Mouse(int x, int y, int buttons) { Console.WriteLine("Mouse: ({0}, {1}) - {2}", x, y, buttons); @@ -45,7 +45,7 @@ c.RemoteCallback += new RemoteHandler(Remote); c.KeyboardCallback += new KeyboardHandler(Keyboard); c.MouseCallback += new MouseHandler(Mouse); - + c.Start(); Application.Run(); @@ -54,6 +54,8 @@ c = null; } + #endregion Debug + #region Constants static readonly string ConfigurationFile = @@ -108,7 +110,7 @@ /// A description of the IR Server plugin. /// </summary> /// <value>The description.</value> - public override string Description { get { return "Supports HID USB devices."; } } + public override string Description { get { return "Supports HID USB devices"; } } /// <summary> /// Start the IR Server plugin. @@ -359,18 +361,14 @@ byte[] newArray = new byte[raw.hid.dwSizeHid]; Array.Copy(bRawData, offset, newArray, 0, newArray.Length); - StringBuilder str = new StringBuilder(); - str.Append("HID: "); + string code = BitConverter.ToString(newArray); - foreach (byte b in newArray) - str.Append(String.Format("{0:X2} ", b)); - #if TRACE - Trace.WriteLine(str.ToString()); + Trace.WriteLine(code); #endif if (_remoteHandler != null) - _remoteHandler(str.ToString()); + _remoteHandler(code); break; } @@ -397,14 +395,14 @@ case RawInput.RawInputType.Keyboard: { #if TRACE - Trace.WriteLine(String.Format("Keyboard Event")); + Trace.WriteLine("Keyboard Event"); #endif switch (raw.keyboard.Flags) { case RawInput.RawKeyboardFlags.KeyBreak: #if TRACE - Trace.WriteLine( String.Format("Break: {0}", raw.keyboard.VKey)); + Trace.WriteLine(String.Format("Break: {0}", raw.keyboard.VKey)); #endif if (_keyboardHandler != null) @@ -414,7 +412,7 @@ case RawInput.RawKeyboardFlags.KeyE0: #if TRACE - Trace.WriteLine( String.Format("E0: {0}", raw.keyboard.MakeCode)); + Trace.WriteLine(String.Format("E0: {0}", raw.keyboard.MakeCode)); #endif if (_keyboardHandler != null) _keyboardHandler(0xE000 | raw.keyboard.MakeCode, true); @@ -423,13 +421,16 @@ case RawInput.RawKeyboardFlags.KeyE1: #if TRACE - Trace.WriteLine( String.Format("E1")); + Trace.WriteLine("E1"); #endif + if (_keyboardHandler != null) + _keyboardHandler(0xE100, true); + break; case RawInput.RawKeyboardFlags.KeyMake: #if TRACE - Trace.WriteLine( String.Format("Make: {0}", raw.keyboard.VKey)); + Trace.WriteLine(String.Format("Make: {0}", raw.keyboard.VKey)); #endif if (_keyboardHandler != null) @@ -439,13 +440,13 @@ case RawInput.RawKeyboardFlags.TerminalServerSetLED: #if TRACE - Trace.WriteLine( String.Format("TerminalServerSetLED")); + Trace.WriteLine("TerminalServerSetLED"); #endif break; case RawInput.RawKeyboardFlags.TerminalServerShadow: #if TRACE - Trace.WriteLine( String.Format("TerminalServerShadow")); + Trace.WriteLine("TerminalServerShadow"); #endif break; } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs 2008-02-19 05:29:01 UTC (rev 1385) @@ -239,53 +239,7 @@ data = null; - StringBuilder irCode = new StringBuilder(4096); - _learnTimedOut = false; - - Timer timer = new Timer(); - timer.Interval = _learnTimeout; - timer.Tick += new EventHandler(timer_Tick); - timer.Enabled = true; - timer.Start(); - - try - { - _abortLearn = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(Int32))); - Marshal.WriteInt32(_abortLearn, AllowLearn); - - result = UUIRTLearnIR( - _usbUirtHandle, // Handle to USB-UIRT - UUIRTDRV_IRFMT_PRONTO, - irCode, // Where to put the IR Code - null, // Learn status callback - IntPtr.Zero, // User data - _abortLearn, // Abort flag? - 0, - IntPtr.Zero, - IntPtr.Zero); - } - finally - { - Marshal.FreeHGlobal(_abortLearn); - _abortLearn = IntPtr.Zero; - } - - timer.Stop(); - - if (_learnTimedOut) - { - return LearnStatus.Timeout; - } - else if (result) - { - data = Encoding.ASCII.GetBytes(irCode.ToString()); - - return LearnStatus.Success; - } - else - { - return LearnStatus.Failure; - } + return LearnStatus.Failure; } /// <summary> Modified: trunk/plugins/IR Server Suite/IR Server Suite - Debug.nsi =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite - Debug.nsi 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/IR Server Suite - Debug.nsi 2008-02-19 05:29:01 UTC (rev 1385) @@ -308,8 +308,7 @@ File "IR Server Plugins\IRTrans Transceiver\bin\Debug\*.*" File "IR Server Plugins\Microsoft MCE Transceiver\bin\Debug\*.*" File "IR Server Plugins\RedEye Blaster\bin\Debug\*.*" - File "IR Server Plugins\Serial IR Blaster\bin\Debug\*.*" - + File "IR Server Plugins\Serial IR Blaster\bin\Debug\*.*" File "IR Server Plugins\USB-UIRT Transceiver\bin\Debug\*.*" File "IR Server Plugins\Wii Remote Receiver\bin\Debug\*.*" File "IR Server Plugins\WiimoteLib\bin\Debug\*.*" Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs 2008-02-19 05:29:01 UTC (rev 1385) @@ -153,6 +153,11 @@ public void SetToCard(int cardId) { ExternalChannelConfig config = TV2BlasterPlugin.GetExternalChannelConfig(cardId); + if (config == null) + { + MessageBox.Show(this, "You must save your card configurations before copying between card setups", "No saved configration to copy from", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } // Setup command list. for (int i = 0; i < 10; i++) Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs 2008-02-19 05:29:01 UTC (rev 1385) @@ -160,6 +160,11 @@ public void SetToCard(int cardId) { ExternalChannelConfig config = TV3BlasterPlugin.GetExternalChannelConfig(cardId); + if (config == null) + { + MessageBox.Show(this, "You must save your card configurations before copying between card setups", "No saved configration to copy from", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } // Setup command list. for (int i = 0; i < 10; i++) Modified: trunk/plugins/MCEReplacement/Forms/StbSetup.cs =================================================================== --- trunk/plugins/MCEReplacement/Forms/StbSetup.cs 2008-02-18 22:37:21 UTC (rev 1384) +++ trunk/plugins/MCEReplacement/Forms/StbSetup.cs 2008-02-19 05:29:01 UTC (rev 1385) @@ -154,6 +154,11 @@ public void SetToCard(int cardId) { ExternalChannelConfig config = MCEReplacement.GetExternalChannelConfig(cardId); + if (config == null) + { + MessageBox.Show(this, "You must save your card configurations before copying between card setups", "No saved configration to copy from", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } // Setup command list. for (int i = 0; i < 10; i++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |