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

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

Revision: 2875
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2875&view=rev
Author:   chef_koch
Date:     2009-05-31 11:33:35 +0000 (Sun, 31 May 2009)

Log Message:
-----------
fixed mp control plugin compiling again, after tve2 removal
removed tve2blaster plugin from installer

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
    trunk/plugins/IR Server Suite/setup/setup.nsi

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs	2009-05-31 10:30:57 UTC (rev 2874)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs	2009-05-31 11:33:35 UTC (rev 2875)
@@ -33,7 +33,6 @@
 using MediaPortal.GUI.Library;
 using MediaPortal.Player;
 using MediaPortal.Profile;
-using MediaPortal.TV.Recording;
 using MediaPortal.Util;
 using MPUtils;
 
@@ -434,7 +433,7 @@
                   switch (map.ConProperty)
                   {
                     case "TV":
-                      if (Recorder.IsViewing())
+                      if (g_Player.IsTV)
                         found = map;
                       break;
                     case "DVD":

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj	2009-05-31 10:30:57 UTC (rev 2874)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj	2009-05-31 11:33:35 UTC (rev 2875)
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -109,11 +109,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="TVCapture, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\mediaportal\trunk\mediaportal\xbmc\bin\Release\TVCapture.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Utils, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\mediaportal\trunk\mediaportal\xbmc\bin\Release\Utils.dll</HintPath>

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2009-05-31 10:30:57 UTC (rev 2874)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2009-05-31 11:33:35 UTC (rev 2875)
@@ -186,7 +186,7 @@
   !insertmacro "${MacroName}" "SectionMPCommon"
     !insertmacro "${MacroName}" "SectionMPControlPlugin"
     !insertmacro "${MacroName}" "SectionMPBlastZonePlugin"
-    !insertmacro "${MacroName}" "SectionTV2BlasterPlugin"
+    #!insertmacro "${MacroName}" "SectionTV2BlasterPlugin"
 
   !insertmacro "${MacroName}" "SectionTV3Common"
     !insertmacro "${MacroName}" "SectionTV3BlasterPlugin"
@@ -523,7 +523,7 @@
 !macroend
 
 ;======================================
-
+/*
 ${MementoUnselectedSection} "TV2 Blaster Plugin" SectionTV2BlasterPlugin
   ${LOG_TEXT} "INFO" "Installing TV2 Blaster Plugin..."
 
@@ -541,7 +541,7 @@
 
   Delete /REBOOTOK "$MPdir.Plugins\Process\TV2BlasterPlugin.*"
 !macroend
-
+*/
 ;======================================
 
 SectionGroupEnd
@@ -1097,7 +1097,7 @@
   ; disable/remove common files for MediaPortal plugins if all MediaPortal plugins are unselected
   ${IfNot} ${SectionIsSelected} ${SectionMPControlPlugin}
   ${AndIfNot} ${SectionIsSelected} ${SectionMPBlastZonePlugin}
-  ${AndIfNot} ${SectionIsSelected} ${SectionTV2BlasterPlugin}
+#  ${AndIfNot} ${SectionIsSelected} ${SectionTV2BlasterPlugin}
     !insertmacro UnselectSection ${SectionMPCommon}
   ${Else}
     !insertmacro SelectSection ${SectionMPCommon}
@@ -1238,7 +1238,7 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SectionGroupMP}             "$(DESC_SectionGroupMP)"
     !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPControlPlugin}     "$(DESC_SectionMPControlPlugin)"
     !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPBlastZonePlugin}   "$(DESC_SectionMPBlastZonePlugin)"
-    !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV2BlasterPlugin}    "$(DESC_SectionTV2BlasterPlugin)"
+#    !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV2BlasterPlugin}    "$(DESC_SectionTV2BlasterPlugin)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SectionGroupTV3}            "$(DESC_SectionGroupTV3)"
     !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV3BlasterPlugin}    "$(DESC_SectionTV3BlasterPlugin)"
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${SectionGroupMCE}            "$(DESC_SectionGroupMCE)"


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