[Mp-plugins-svn] SF.net SVN: mp-plugins:[3655] trunk/plugins/IR Server Suite/IR Server Suite /IR Server Plugins

[<che...@us...>]

Revision: 3655
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3655&view=rev
Author:   chemelli_sf
Date:     2010-06-28 22:52:40 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
Fixed detection logs for some plugins

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs	2010-06-28 22:27:10 UTC (rev 3654)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs	2010-06-28 22:52:40 UTC (rev 3655)
@@ -87,6 +87,13 @@
           throw new FileNotFoundException("FireDTV: Trying to enable FireDTV remote but failed");
         }
       }
+      else
+      {
+        if (!File.Exists(@".\FireSATApi.dll"))
+        {
+          throw new FileNotFoundException("Could not find FireSATApi.dll in current path (32bit version needed)");
+        }
+      }
 
       _windowHandle = windowHandle;
 

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs	2010-06-28 22:27:10 UTC (rev 3654)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs	2010-06-28 22:52:40 UTC (rev 3655)
@@ -149,9 +149,13 @@
       try
       {
         _irRemoteWrapper = new IrRemoteWrapper();
-          return DetectionResult.DevicePresent;
-       
+        return DetectionResult.DevicePresent;
       }
+      catch (DirectoryNotFoundException)
+      {
+        IrssLog.Warn("{0,15}: IrRemote.dll not found", Name);
+        return DetectionResult.DeviceNotFound;
+      }
       catch (Exception ex)
       {
         IrssLog.Error("{0,15}: exception {1} type: {2}", Name, ex.Message, ex.GetType());
@@ -252,7 +256,7 @@
         XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8);
         writer.Formatting = Formatting.Indented;
         writer.Indentation = 1;
-        writer.IndentChar = (char) 9;
+        writer.IndentChar = (char)9;
         writer.WriteStartDocument(true);
         writer.WriteStartElement("settings"); // <settings>
 

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs	2010-06-28 22:27:10 UTC (rev 3654)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs	2010-06-28 22:52:40 UTC (rev 3655)
@@ -190,12 +190,15 @@
       }
       catch (COMException ex)
       {
-        if (ex.ErrorCode != -2147221164)
+        if (ex.ErrorCode == -2147221164)
         {
-          IrssLog.Warn("{0,15}: exception {1}", Name, ex.ErrorCode);
+          IrssLog.Warn("{0,15}: needed interface not found", Name);
+        }
+        else
+        {
+          IrssLog.Debug("{0,15}: exception {1}", Name, ex.ErrorCode);
           return DetectionResult.DeviceException;
         }
-        IrssLog.Debug("{0,15}: exception {1}", Name, ex.ErrorCode);
       }
       catch (Exception ex)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.