From: <an...@us...> - 2008-02-11 13:40:28
|
Revision: 1362 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1362&view=rev Author: and-81 Date: 2008-02-11 05:40:23 -0800 (Mon, 11 Feb 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Documentation/new.html trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/MCEReplacement/MCEReplacement.cs Modified: trunk/plugins/IR Server Suite/Documentation/new.html =================================================================== --- trunk/plugins/IR Server Suite/Documentation/new.html 2008-02-10 20:49:15 UTC (rev 1361) +++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-02-11 13:40:23 UTC (rev 1362) @@ -33,6 +33,7 @@ <LI>Translator: Can create a shortcut on the users desktop to launch a macro.</LI> <LI>Documentation: New documentation areas (Troubleshooting FAQ) and improvements.</LI> <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.</LI> </UL></P> <BR> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs 2008-02-10 20:49:15 UTC (rev 1361) +++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs 2008-02-11 13:40:23 UTC (rev 1362) @@ -118,6 +118,9 @@ /// </summary> public IrRemoteWrapper() { + string dllPath = GetDllPath(); + IRSetDllDirectory(dllPath); + _window = new ReceiverWindow(); _window.ProcMsg = new ProcessMessage(WndProc); } Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-02-10 20:49:15 UTC (rev 1361) +++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-02-11 13:40:23 UTC (rev 1362) @@ -383,6 +383,24 @@ Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Media Center Plugins", "Media Center Plugins", "{A4526325-E80D-492A-8D7A-5E791EAF6C73}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCE Control Plugin", "Media Center Plugins\MCE Control Plugin\MCE Control Plugin.csproj", "{4355D0D7-2DF3-437D-90C3-FFD96347D9ED}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STB Blaster Plugin", "Media Center Plugins\STB Blaster Plugin\STB Blaster Plugin.csproj", "{EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -801,6 +819,22 @@ {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Release|Any CPU.Build.0 = Release|Any CPU {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Release|x86.ActiveCfg = Release|x86 {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Release|x86.Build.0 = Release|x86 + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Debug|x86.ActiveCfg = Debug|x86 + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Debug|x86.Build.0 = Debug|x86 + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Release|Any CPU.Build.0 = Release|Any CPU + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Release|x86.ActiveCfg = Release|x86 + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED}.Release|x86.Build.0 = Release|x86 + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Debug|x86.ActiveCfg = Debug|x86 + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Debug|x86.Build.0 = Debug|x86 + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Release|Any CPU.Build.0 = Release|Any CPU + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Release|x86.ActiveCfg = Release|x86 + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -860,5 +894,7 @@ {D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {966281F9-3898-4CB7-9940-99D49C21F170} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {49CF376E-811C-4EB4-817F-A39C9529B608} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} + {4355D0D7-2DF3-437D-90C3-FFD96347D9ED} = {A4526325-E80D-492A-8D7A-5E791EAF6C73} + {EC9F3A8D-3FB5-49EF-B10C-65DB9831B32F} = {A4526325-E80D-492A-8D7A-5E791EAF6C73} EndGlobalSection EndGlobal Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2008-02-10 20:49:15 UTC (rev 1361) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2008-02-11 13:40:23 UTC (rev 1362) @@ -398,6 +398,9 @@ Log.Info("TV2BlasterPlugin: Tune request - Card: {0}, Channel: {1}", msg.Label2, msg.Label); + if (_externalChannelConfigs == null) + throw new ApplicationException("Cannot process tune request, no STB settings are loaded"); + try { Thread newThread = new Thread(new ParameterizedThreadStart(ProcessExternalChannel)); @@ -480,9 +483,12 @@ int card = int.Parse(data[1]); - // To work around a known bug in MediaPortal scheduled recording (Added: 25-Feb-2007) + // To work around a known bug in MediaPortal scheduled recording if (card < 0) - card = 0; + { + card = _externalChannelConfigs[0].CardId; + Log.Warn("TV2BlasterPlugin: MediaPortal reports invalid TV Card ID ({0}), using STB settings for first TV Card ({1})", data[1], card); + } ExternalChannelConfig config = GetExternalChannelConfig(card); Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2008-02-10 20:49:15 UTC (rev 1361) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2008-02-11 13:40:23 UTC (rev 1362) @@ -363,6 +363,9 @@ Log.Info("TV3BlasterPlugin: Tune request - Card: {0}, Channel: {1}, {2}", tvEvent.Card.Id, analogChannel.ChannelNumber, analogChannel.Name); + if (_externalChannelConfigs == null) + throw new ApplicationException("Cannot process tune request, no STB settings are loaded"); + Thread newThread = new Thread(new ParameterizedThreadStart(ProcessExternalChannel)); newThread.Name = "ProcessExternalChannel"; newThread.IsBackground = true; Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs =================================================================== --- trunk/plugins/MCEReplacement/MCEReplacement.cs 2008-02-10 20:49:15 UTC (rev 1361) +++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2008-02-11 13:40:23 UTC (rev 1362) @@ -1006,9 +1006,12 @@ int card = int.Parse(data[1]); - // To work around a known bug in MediaPortal scheduled recording (Added: 25-Feb-2007) + // To work around a known bug in MediaPortal scheduled recording if (card < 0) - card = 0; + { + card = _externalChannelConfigs[0].CardId; + Log.Warn("TV2BlasterPlugin: MediaPortal reports invalid TV Card ID ({0}), using STB settings for first TV Card ({1})", data[1], card); + } ExternalChannelConfig config = GetExternalChannelConfig(card); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |