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

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

Revision: 2982
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2982&view=rev
Author:   chef_koch
Date:     2009-07-05 15:56:50 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
using vs for build for IRSS and mp plugins now
modified some debug compile time statements

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/Build/BuildScript.bat
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs

Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat	2009-07-04 10:16:22 UTC (rev 2981)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat	2009-07-05 15:56:50 UTC (rev 2982)
@@ -42,7 +42,8 @@
 if not %2!==MPplugins! goto NoMPplugins
 echo.
 echo Building MediaPortal plugins...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
+"%ProgramDir%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
+rem "%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
 :NoMPplugins
 
 

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs	2009-07-04 10:16:22 UTC (rev 2981)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs	2009-07-05 15:56:50 UTC (rev 2982)
@@ -259,7 +259,7 @@
       if (map == null)
         return false;
 #if DEBUG
-      Log.Info("{0} / {1} / {2} / {3}", map.Condition, map.ConProperty, map.Command, map.CmdProperty);
+      Log.Debug("{0} / {1} / {2} / {3}", map.Condition, map.ConProperty, map.Command, map.CmdProperty);
 #endif
       Action action;
       if (map.Sound != string.Empty) // && !g_Player.Playing)
@@ -276,7 +276,7 @@
         case "ACTION": // execute Action x
           Key key = new Key(map.CmdKeyChar, map.CmdKeyCode);
 #if DEBUG
-          Log.Info("Executing: key {0} / {1} / Action: {2} / {3}", map.CmdKeyChar, map.CmdKeyCode, map.CmdProperty,
+          Log.Debug("Executing: key {0} / {1} / Action: {2} / {3}", map.CmdKeyChar, map.CmdKeyCode, map.CmdProperty,
                    ((Action.ActionType) Convert.ToInt32(map.CmdProperty)).ToString());
 #endif
           action = new Action(key, (Action.ActionType) Convert.ToInt32(map.CmdProperty), 0, 0);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs	2009-07-04 10:16:22 UTC (rev 2981)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs	2009-07-05 15:56:50 UTC (rev 2982)
@@ -384,20 +384,16 @@
 
     private bool SaveMapping(string xmlFile)
     {
-#if !DEBUG
       try
-#endif
       {
         Directory.CreateDirectory(Config.GetFolder(Config.Dir.CustomInputDevice));
       }
-#if !DEBUG
       catch
       {
         Log.Info("MAP: Error accessing directory \"InputDeviceMappings\\custom\"");
       }
 
-      //try
-#endif
+      try
       {
         using (
           XmlTextWriter writer = new XmlTextWriter(Config.GetFile(Config.Dir.CustomInputDevice, xmlFile), Encoding.UTF8)
@@ -505,13 +501,11 @@
         _changedSettings = false;
         return true;
       }
-#if !DEBUG
-      //catch (Exception ex)
-      //{
-      //  Log.Info("MAP: Error saving mapping to XML file: {0}", ex.Message);
-      //  return false;
-      //}
-#endif
+      catch (Exception ex)
+      {
+        Log.Error("MAP: Error saving mapping to XML file: {0}", ex.Message);
+        return false;
+      }
     }
 
     private void LoadPluginList()


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