From: <che...@us...> - 2009-06-19 23:09:22
|
Revision: 2941 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2941&view=rev Author: chef_koch Date: 2009-06-19 23:09:16 +0000 (Fri, 19 Jun 2009) Log Message: ----------- yet another try to resharp Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/SetupForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MceDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/RemoteDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Advanced.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/ExternalChannelConfig.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/StbSetup.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/ButtonMapping.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Configuration.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/CopyDataWM.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/EventSchedule.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/Advanced.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/MappedEvent.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/ProgramSettings.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/RemoteButton.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Client.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/IrssMessage.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/ServerAddress.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Client.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/IrssMessage.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/ServerAddress.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5)/Client.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5)/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5)/IrssMessage.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5)/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/RemoteButton.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Setup.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/WebServer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/CSocketPacket.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DeviceIoOverlapped.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/NotifyWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/RemoteDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs 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/XBCDRC Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.Data; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Windows.Forms; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Data; using System.Diagnostics; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System; using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/SetupForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/SetupForm.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/SetupForm.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.ComponentModel; using System.Data; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Windows.Forms; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System; using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Runtime.InteropServices; using IrssUtils; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System.Reflection; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System; using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System; using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.Globalization; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; namespace IrFileTool Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MceDetectionData.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MceDetectionData.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MceDetectionData.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; namespace IrFileTool Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Threading; using System.Windows.Forms; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System.Reflection; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/RemoteDetectionData.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/RemoteDetectionData.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/RemoteDetectionData.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + namespace IrFileTool { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Advanced.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Advanced.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Advanced.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.Diagnostics; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; @@ -7,9 +29,9 @@ using SourceGrid; using SourceGrid.Cells; using SourceGrid.Cells.Controllers; -using Button = SourceGrid.Cells.Button; -using CheckBox = SourceGrid.Cells.CheckBox; -using ColumnHeader = SourceGrid.Cells.ColumnHeader; +using Button=SourceGrid.Cells.Button; +using CheckBox=SourceGrid.Cells.CheckBox; +using ColumnHeader=SourceGrid.Cells.ColumnHeader; namespace IRServer { @@ -195,8 +217,8 @@ private void buttonClickEvent_Executed(object sender, EventArgs e) { - CellContext context = (CellContext)sender; - Button cell = (Button)context.Cell; + CellContext context = (CellContext) sender; + Button cell = (Button) context.Cell; try { @@ -214,8 +236,8 @@ private void TransmitChanged(object sender, EventArgs e) { - CellContext context = (CellContext)sender; - CheckBox cell = (CheckBox)context.Cell; + CellContext context = (CellContext) sender; + CheckBox cell = (CheckBox) context.Cell; if (cell.Checked != true) return; @@ -234,8 +256,8 @@ private void PluginDoubleClick(object sender, EventArgs e) { - CellContext context = (CellContext)sender; - Cell cell = (Cell)context.Cell; + CellContext context = (CellContext) sender; + Cell cell = (Cell) context.Cell; CheckBox checkBoxReceive = gridPlugins[cell.Row.Index, ColReceive] as CheckBox; if (checkBoxReceive != null) Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.ComponentModel; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.Diagnostics; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System; using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.ComponentModel; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + +using System; using System.Reflection; using System.Resources; using System.Runtime.InteropServices; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Program.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Program.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,3 +1,25 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This Program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with GNU Make; see the file COPYING. If not, write to +// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +// http://www.gnu.org/copyleft/gpl.html + +#endregion + using System; using System.Collections.Generic; using System.IO; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs 2009-06-19 18:37:44 UTC (rev 2940) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs 2009-06-19 23:09:16 UTC (rev 2941) @@ -1,4 +1,26 @@ -using System.Reflection; +#region Copyright (C) 2005-2009 Team MediaPortal + +// Copyright (C) 2005-2009 Team MediaPortal +// http://www.team-mediaportal.com +// +// This Program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later versi... [truncated message content] |
From: <che...@us...> - 2009-06-20 03:12:56
|
Revision: 2948 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2948&view=rev Author: chef_koch Date: 2009-06-20 01:55:12 +0000 (Sat, 20 Jun 2009) Log Message: ----------- added ID to Abbreviation list Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-06-20 01:31:16 UTC (rev 2947) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-06-20 01:55:12 UTC (rev 2948) @@ -86,6 +86,7 @@ <Abbreviation Text="XP" /> <Abbreviation Text="MCE" /> <Abbreviation Text="SVN" /> + <Abbreviation Text="ID" /> </Naming2> </CodeStyleSettings> </Configuration> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper 2009-06-20 01:31:16 UTC (rev 2947) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper 2009-06-20 01:55:12 UTC (rev 2948) @@ -86,6 +86,7 @@ <Abbreviation Text="XP" /> <Abbreviation Text="MCE" /> <Abbreviation Text="SVN" /> + <Abbreviation Text="ID" /> </Naming2> </CodeStyleSettings> </Configuration> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-06-21 18:45:51
|
Revision: 2954 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2954&view=rev Author: chef_koch Date: 2009-06-21 18:45:49 +0000 (Sun, 21 Jun 2009) Log Message: ----------- added spaces around / and % Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-06-21 13:48:56 UTC (rev 2953) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-06-21 18:45:49 UTC (rev 2954) @@ -21,6 +21,7 @@ <Item>unsafe</Item> <Item>volatile</Item> </MODIFIERS_ORDER> + <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP> </FormatSettings> <UsingsSettings /> <Naming2> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper 2009-06-21 13:48:56 UTC (rev 2953) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper 2009-06-21 18:45:49 UTC (rev 2954) @@ -21,6 +21,7 @@ <Item>unsafe</Item> <Item>volatile</Item> </MODIFIERS_ORDER> + <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP> </FormatSettings> <UsingsSettings /> <Naming2> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-06-21 23:40:31
|
Revision: 2958 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2958&view=rev Author: chef_koch Date: 2009-06-21 23:40:27 +0000 (Sun, 21 Jun 2009) Log Message: ----------- refactored using latest coding style Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/CommandSendWOL.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/SmsKeyboard.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/Wiimote.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -167,7 +167,7 @@ } else if (command.StartsWith("~", StringComparison.OrdinalIgnoreCase)) { - Thread.Sleep(command.Length*500); + Thread.Sleep(command.Length * 500); } else { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -166,7 +166,7 @@ } else if (command.StartsWith("~", StringComparison.OrdinalIgnoreCase)) { - Thread.Sleep(command.Length*500); + Thread.Sleep(command.Length * 500); } else { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -528,7 +528,7 @@ { double time = code.TimingData[index]; - byte duration = (byte) Math.Abs(Math.Round(time/50)); + byte duration = (byte) Math.Abs(Math.Round(time / 50)); bool pulse = (time > 0); while (duration > 0x7F) @@ -542,7 +542,7 @@ } // Insert byte count markers into packet data bytes ... - int subpackets = (int) Math.Ceiling(packet.Count/(double) 4); + int subpackets = (int) Math.Ceiling(packet.Count / (double) 4); byte[] output = new byte[packet.Count + subpackets + 1]; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrCode.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -226,13 +226,13 @@ if ((curByte & 0x7F) != 0x7F) { - timingData.Add(len*50); + timingData.Add(len * 50); len = 0; } } if (len != 0) - timingData.Add(len*50); + timingData.Add(len * 50); IrCode newCode = new IrCode(timingData.ToArray()); newCode.FinalizeData(); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -1310,7 +1310,7 @@ #region Data case RemoteDetectionState.Data: - if ((RC6_Data.HalfBit%2) == 0) + if ((RC6_Data.HalfBit % 2) == 0) { if (pulse && IsBetween(duration, 300, 600)) { @@ -1584,7 +1584,7 @@ #region Data case RemoteDetectionState.Data: - if ((RECS80_Data.HalfBit%2) == 0) + if ((RECS80_Data.HalfBit % 2) == 0) { if (!pulse) break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Pronto.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -158,10 +158,10 @@ if (prontoCarrier == 0x0000) prontoCarrier = ConvertToProntoCarrier(IrCode.CarrierFrequencyDefault); - double carrier = prontoCarrier*ProntoClock; + double carrier = prontoCarrier * ProntoClock; - int firstSeq = 2*prontoData[2]; - int repeatSeq = 2*prontoData[3]; + int firstSeq = 2 * prontoData[2]; + int repeatSeq = 2 * prontoData[3]; List<int> timingData = new List<int>(); @@ -184,7 +184,7 @@ while (!done) { - int time = (int) (prontoData[index]*carrier); + int time = (int) (prontoData[index] * carrier); if (pulse) timingData.Add(time); @@ -603,18 +603,18 @@ } prontoCarrier = ConvertToProntoCarrier(irCodeCarrier); - carrier = prontoCarrier*ProntoClock; + carrier = prontoCarrier * ProntoClock; for (int index = 0; index < irCode.TimingData.Length; index++) { int duration = Math.Abs(irCode.TimingData[index]); - prontoData.Add((ushort) Math.Round(duration/carrier)); + prontoData.Add((ushort) Math.Round(duration / carrier)); } - if (prontoData.Count%2 != 0) + if (prontoData.Count % 2 != 0) prontoData.Add(SignalFree); - ushort burstPairs = (ushort) (prontoData.Count/2); + ushort burstPairs = (ushort) (prontoData.Count / 2); prontoData.Insert(0, (ushort) codeType); // Pronto Code Type prontoData.Insert(1, prontoCarrier); // IR Frequency @@ -631,7 +631,7 @@ /// <returns>The carrier frequency as an integer number.</returns> public static int ConvertFromProntoCarrier(ushort prontoCarrier) { - return (int) (1000000/(prontoCarrier*ProntoClock)); + return (int) (1000000 / (prontoCarrier * ProntoClock)); } /// <summary> @@ -641,7 +641,7 @@ /// <returns>The carrier frequency in Pronto format.</returns> public static ushort ConvertToProntoCarrier(int carrierFrequency) { - return (ushort) (1000000/(carrierFrequency*ProntoClock)); + return (ushort) (1000000 / (carrierFrequency * ProntoClock)); } #endregion Public Methods Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -711,8 +711,8 @@ Location = new Point( - workingArea.X + (workingArea.Width/2) - (newWidth/2), - workingArea.Y + (workingArea.Height/2) - (newHeight/2)); + workingArea.X + (workingArea.Width / 2) - (newWidth / 2), + workingArea.Y + (workingArea.Height / 2) - (newHeight / 2)); } private void Launch(string programFile) Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -606,7 +606,7 @@ Win32.GetDesktopWindowHandle(), (int) Win32.WindowsMessage.WM_APPCOMMAND, 0, - 65536*(int) Win32.AppCommand.APPCOMMAND_VOLUME_UP); + 65536 * (int) Win32.AppCommand.APPCOMMAND_VOLUME_UP); break; case "Volume Down": @@ -614,7 +614,7 @@ Win32.GetDesktopWindowHandle(), (int) Win32.WindowsMessage.WM_APPCOMMAND, 0, - 65536*(int) Win32.AppCommand.APPCOMMAND_VOLUME_DOWN); + 65536 * (int) Win32.AppCommand.APPCOMMAND_VOLUME_DOWN); break; case "Volume Mute": @@ -622,7 +622,7 @@ Win32.GetDesktopWindowHandle(), (int) Win32.WindowsMessage.WM_APPCOMMAND, 0, - 65536*(int) Win32.AppCommand.APPCOMMAND_VOLUME_MUTE); + 65536 * (int) Win32.AppCommand.APPCOMMAND_VOLUME_MUTE); break; default: Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -165,7 +165,7 @@ { if (button.StartsWith("~", StringComparison.OrdinalIgnoreCase)) { - Thread.Sleep(button.Length*500); + Thread.Sleep(button.Length * 500); } else { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/CommandSendWOL.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/CommandSendWOL.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/CommandSendWOL.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -147,7 +147,7 @@ if (pass != null && pass.Length != 4 && pass.Length != 6) throw new ArgumentException("Not a valid password (must be null, 4 or 6 bytes)", "password"); - int packetLength = Header.Length + (16*macAddress.Length); + int packetLength = Header.Length + (16 * macAddress.Length); if (pass != null) packetLength += pass.Length; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/SmsKeyboard.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/SmsKeyboard.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/SmsKeyboard.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -208,7 +208,7 @@ _repeated = 0; } - int chrIdx = _repeated%keys.Length; + int chrIdx = _repeated % keys.Length; string chr = keys[chrIdx].ToString(); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Mouse.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Mouse.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Mouse.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -138,8 +138,8 @@ { if (absolute) { - int x = (int) (dx*(65536.0/Screen.PrimaryScreen.Bounds.Width)); - int y = (int) (dy*(65536.0/Screen.PrimaryScreen.Bounds.Height)); + int x = (int) (dx * (65536.0 / Screen.PrimaryScreen.Bounds.Width)); + int y = (int) (dy * (65536.0 / Screen.PrimaryScreen.Bounds.Height)); mouse_event((int) (MouseEvents.Move | MouseEvents.Absolute), x, y, 0, IntPtr.Zero); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -109,7 +109,7 @@ { for (int i = 0; i < totalEntries; i++) { - tmpBuffer = new IntPtr((int) buffer + (i*sizeofINFO)); + tmpBuffer = new IntPtr((int) buffer + (i * sizeofINFO)); _SERVER_INFO_100 svrInfo = (_SERVER_INFO_100) Marshal.PtrToStructure(tmpBuffer, typeof (_SERVER_INFO_100)); if (includeLocalMachine || Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -202,7 +202,7 @@ _processReadThread = false; - if (!_readThread.Join(PacketTimeout*2)) + if (!_readThread.Join(PacketTimeout * 2)) _readThread.Abort(); _readThread = null; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -405,7 +405,7 @@ // then allocate sufficient memory and get the entire list if (GetRawInputDeviceList(IntPtr.Zero, ref deviceCount, (uint) dwSize) == 0) { - IntPtr pRawInputDeviceList = Marshal.AllocHGlobal((int) (dwSize*deviceCount)); + IntPtr pRawInputDeviceList = Marshal.AllocHGlobal((int) (dwSize * deviceCount)); GetRawInputDeviceList(pRawInputDeviceList, ref deviceCount, (uint) dwSize); List<DeviceDetails> devices = new List<DeviceDetails>((int) deviceCount); @@ -420,7 +420,7 @@ RAWINPUTDEVICELIST rid; IntPtr location; - int offset = dwSize*i; + int offset = dwSize * i; if (IntPtr.Size == 4) location = new IntPtr(pRawInputDeviceList.ToInt32() + offset); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/RawInput.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/RawInput.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/RawInput.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -404,7 +404,7 @@ // then allocate sufficient memory and get the entire list if (GetRawInputDeviceList(IntPtr.Zero, ref deviceCount, (uint) dwSize) == 0) { - IntPtr pRawInputDeviceList = Marshal.AllocHGlobal((int) (dwSize*deviceCount)); + IntPtr pRawInputDeviceList = Marshal.AllocHGlobal((int) (dwSize * deviceCount)); GetRawInputDeviceList(pRawInputDeviceList, ref deviceCount, (uint) dwSize); List<DeviceDetails> devices = new List<DeviceDetails>((int) deviceCount); @@ -419,7 +419,7 @@ RAWINPUTDEVICELIST rid; IntPtr location; - int offset = dwSize*i; + int offset = dwSize * i; if (IntPtr.Size == 4) location = new IntPtr(pRawInputDeviceList.ToInt32() + offset); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -241,7 +241,7 @@ TimeSpan timeSpan = DateTime.Now - _lastCodeTime; - StringBuilder keyCode = new StringBuilder(2*DeviceBufferSize); + StringBuilder keyCode = new StringBuilder(2 * DeviceBufferSize); for (int index = 0; index < DeviceBufferSize; index++) keyCode.Append(_deviceBuffer[index].ToString("X2")); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -425,7 +425,7 @@ foreach (byte dataByte in data) { - timingData.Add((int) Math.Round(dataByte*TimeCodeMultiplier*multiplier)); + timingData.Add((int) Math.Round(dataByte * TimeCodeMultiplier * multiplier)); multiplier *= -1; } @@ -535,7 +535,7 @@ i += OutLength; } - j = LastWrittenIndex%BytesToRead; + j = LastWrittenIndex % BytesToRead; k = 0; for (i = j; i < BytesToRead; i++) TimeCodeDiagram[k++] = OutputData[i]; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -1310,7 +1310,7 @@ #region Data case RemoteDetectionState.Data: - if ((RC6_Data.HalfBit%2) == 0) + if ((RC6_Data.HalfBit % 2) == 0) { if (pulse && IsBetween(duration, 300, 600)) { @@ -1584,7 +1584,7 @@ #region Data case RemoteDetectionState.Data: - if ((RECS80_Data.HalfBit%2) == 0) + if ((RECS80_Data.HalfBit % 2) == 0) { if (!pulse) break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -816,7 +816,7 @@ bool right = ((dataBytes[1] & 0x04) != 0); bool left = ((dataBytes[1] & 0x01) != 0); - MouseEvent(xSign*xSize, ySign*ySize, right, left); + MouseEvent(xSign * xSize, ySign * ySize, right, left); } else if (dataBytes[7] == 0xAE) { @@ -849,7 +849,7 @@ bool right = (dataBytes[3] & 0x40) != 0; bool left = (dataBytes[3] & 0x20) != 0; - MouseEvent(xSign*xSize, ySign*ySize, right, left); + MouseEvent(xSign * xSize, ySign * ySize, right, left); } else if (dataBytes[7] == 0xEE) { @@ -1070,8 +1070,8 @@ int heldRepeats = _remoteHeldRepeats; if (_useSystemRatesRemote) { - firstRepeat = 250 + (SystemInformation.KeyboardDelay*250); - heldRepeats = (int) (1000.0/(2.5 + (SystemInformation.KeyboardSpeed*0.888))); + firstRepeat = 250 + (SystemInformation.KeyboardDelay * 250); + heldRepeats = (int) (1000.0 / (2.5 + (SystemInformation.KeyboardSpeed * 0.888))); } if (!_remoteButtonRepeated && timeBetween.TotalMilliseconds < firstRepeat) @@ -1176,8 +1176,8 @@ int heldRepeats = _keyboardHeldRepeats; if (_useSystemRatesRemote) { - firstRepeat = 250 + (SystemInformation.KeyboardDelay*250); - heldRepeats = (int) (1000.0/(2.5 + (SystemInformation.KeyboardSpeed*0.888))); + firstRepeat = 250 + (SystemInformation.KeyboardDelay * 250); + heldRepeats = (int) (1000.0 / (2.5 + (SystemInformation.KeyboardSpeed * 0.888))); } if (!_keyboardKeyRepeated && timeBetween.TotalMilliseconds < firstRepeat) @@ -1258,8 +1258,8 @@ #region Movement Delta - deltaX = (int) ((double) deltaX*_mouseSensitivity); - deltaY = (int) ((double) deltaY*_mouseSensitivity); + deltaX = (int) ((double) deltaX * _mouseSensitivity); + deltaY = (int) ((double) deltaY * _mouseSensitivity); if (deltaX != 0 || deltaY != 0) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Mouse.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Mouse.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/Mouse.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -135,8 +135,8 @@ if (absolute) { - int x = dx*65536/Screen.PrimaryScreen.Bounds.Width; - int y = dy*65536/Screen.PrimaryScreen.Bounds.Height; + int x = dx * 65536 / Screen.PrimaryScreen.Bounds.Width; + int y = dy * 65536 / Screen.PrimaryScreen.Bounds.Height; mouse_event((int) (MouseEvents.Move | MouseEvents.Absolute), x, y, 0, IntPtr.Zero); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -858,7 +858,7 @@ bool right = ((dataBytes[3] & 0x40) != 0); bool left = ((dataBytes[3] & 0x20) != 0); - MouseEvent(xSign*xSize, ySign*ySize, right, left); + MouseEvent(xSign * xSize, ySign * ySize, right, left); } else if (dataBytes[7] == 0xEE) { @@ -2069,7 +2069,7 @@ } else { - MouseEvent(xSign*xSize, ySign*ySize, rightButton, leftButton); + MouseEvent(xSign * xSize, ySign * ySize, rightButton, leftButton); //if (_mouseHandler != null) _mouseHandler(this.Name, raw.mouse.lLastX, raw.mouse.lLastY, (int)raw.mouse.ulButtons); } } @@ -2228,7 +2228,7 @@ bool right = (newArray[4] & 0x40) != 0; bool left = (newArray[4] & 0x20) != 0; - MouseEvent(xSign*xSize, ySign*ySize, right, left); + MouseEvent(xSign * xSize, ySign * ySize, right, left); } else if (newArray[8] == 0xEE) // Front panel buttons/volume knob { @@ -2702,8 +2702,8 @@ int heldRepeats = _remoteHeldRepeats; if (_useSystemRatesRemote) { - firstRepeat = 250 + (SystemInformation.KeyboardDelay*250); - heldRepeats = (int) (1000.0/(2.5 + (SystemInformation.KeyboardSpeed*0.888))); + firstRepeat = 250 + (SystemInformation.KeyboardDelay * 250); + heldRepeats = (int) (1000.0 / (2.5 + (SystemInformation.KeyboardSpeed * 0.888))); } if (!_remoteButtonRepeated && timeBetween.TotalMilliseconds < firstRepeat) @@ -2821,8 +2821,8 @@ int heldRepeats = _keyboardHeldRepeats; if (_useSystemRatesRemote) { - firstRepeat = 250 + (SystemInformation.KeyboardDelay*250); - heldRepeats = (int) (1000.0/(2.5 + (SystemInformation.KeyboardSpeed*0.888))); + firstRepeat = 250 + (SystemInformation.KeyboardDelay * 250); + heldRepeats = (int) (1000.0 / (2.5 + (SystemInformation.KeyboardSpeed * 0.888))); } if (!_keyboardKeyRepeated && timeBetween.TotalMilliseconds < firstRepeat) @@ -3036,8 +3036,8 @@ #region Movement Delta - deltaX = (int) (deltaX*_mouseSensitivity); - deltaY = (int) (deltaY*_mouseSensitivity); + deltaX = (int) (deltaX * _mouseSensitivity); + deltaY = (int) (deltaY * _mouseSensitivity); if (deltaX != 0 || deltaY != 0) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Mouse.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Mouse.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Mouse.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -138,8 +138,8 @@ { if (absolute) { - int x = dx*65536/Screen.PrimaryScreen.Bounds.Width; - int y = dy*65536/Screen.PrimaryScreen.Bounds.Height; + int x = dx * 65536 / Screen.PrimaryScreen.Bounds.Width; + int y = dy * 65536 / Screen.PrimaryScreen.Bounds.Height; mouse_event((int) (MouseEvents.Move | MouseEvents.Absolute), x, y, 0, IntPtr.Zero); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/RawInput.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/RawInput.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/RawInput.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -405,7 +405,7 @@ // then allocate sufficient memory and get the entire list if (GetRawInputDeviceList(IntPtr.Zero, ref deviceCount, (uint) dwSize) == 0) { - IntPtr pRawInputDeviceList = Marshal.AllocHGlobal((int) (dwSize*deviceCount)); + IntPtr pRawInputDeviceList = Marshal.AllocHGlobal((int) (dwSize * deviceCount)); GetRawInputDeviceList(pRawInputDeviceList, ref deviceCount, (uint) dwSize); List<DeviceDetails> devices = new List<DeviceDetails>((int) deviceCount); @@ -420,7 +420,7 @@ RAWINPUTDEVICELIST rid; IntPtr location; - int offset = dwSize*i; + int offset = dwSize * i; if (IntPtr.Size == 4) location = new IntPtr(pRawInputDeviceList.ToInt32() + offset); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -484,7 +484,7 @@ WriteSync(new byte[] {0x9F, 0x0D}); WriteSync(new byte[] {0x9F, 0x13}); - Thread.Sleep(4*PacketTimeout); + Thread.Sleep(4 * PacketTimeout); SetTimeout(PacketTimeout); SetInputPort(InputPort.Receive); @@ -511,11 +511,11 @@ { double time = code.TimingData[index]; - byte duration = (byte) Math.Abs(Math.Round(time/TimingResolution)); + byte duration = (byte) Math.Abs(Math.Round(time / TimingResolution)); bool pulse = (time > 0); #if DEBUG - DebugWrite("{0}{1}, ", pulse ? '+' : '-', duration*TimingResolution); + DebugWrite("{0}{1}, ", pulse ? '+' : '-', duration * TimingResolution); #endif while (duration > 0x7F) @@ -533,7 +533,7 @@ #endif // Insert byte count markers into packet data bytes ... - int subpackets = (int) Math.Ceiling(packet.Count/(double) 4); + int subpackets = (int) Math.Ceiling(packet.Count / (double) 4); byte[] output = new byte[packet.Count + subpackets + 1]; @@ -563,7 +563,7 @@ byte[] timeoutPacket = new byte[SetTimeoutPacket.Length]; SetTimeoutPacket.CopyTo(timeoutPacket, 0); - int timeoutSamples = 1000*timeout/TimingResolution; // Timeout as a multiple of the timing resolution + int timeoutSamples = 1000 * timeout / TimingResolution; // Timeout as a multiple of the timing resolution timeoutPacket[2] = (byte) (timeoutSamples >> 8); timeoutPacket[3] = (byte) (timeoutSamples & 0xFF); @@ -634,7 +634,7 @@ { for (int scaler = 1; scaler <= 4; scaler++) { - int divisor = (10000000 >> (2*scaler))/carrier; + int divisor = (10000000 >> (2 * scaler)) / carrier; if (divisor <= 0xFF) { @@ -696,7 +696,7 @@ _readThreadMode = ReadThreadMode.Stop; _stopReadThread.Set(); if (Thread.CurrentThread != _readThread) - _readThread.Join(PacketTimeout*2); + _readThread.Join(PacketTimeout * 2); //_readThread.Abort(); } @@ -877,7 +877,7 @@ while (true) { - int handle = WaitHandle.WaitAny(waitHandles, 2*PacketTimeout, false); + int handle = WaitHandle.WaitAny(waitHandles, 2 * PacketTimeout, false); if (handle == ErrorWaitTimeout) continue; @@ -927,7 +927,7 @@ { byte b1 = packetBytes[indexOfFF + 2]; - firmware += (b1 >> 4) + (0.1*(b1 & 0x0F)); + firmware += (b1 >> 4) + (0.1 * (b1 & 0x0F)); DebugWriteLine("Firmware: {0}", firmware); } @@ -935,7 +935,7 @@ { byte b1 = packetBytes[indexOfFF + 2]; - firmware += (0.01*(b1 >> 4)) + (0.001*(b1 & 0x0F)); + firmware += (0.01 * (b1 >> 4)) + (0.001 * (b1 & 0x0F)); DebugWriteLine("Firmware: {0}", firmware); } @@ -984,20 +984,20 @@ int onTime, onCount; GetIrCodeLengths(_learningCode, out onTime, out onCount); - double carrierCount = (b1*256) + b2; + double carrierCount = (b1 * 256) + b2; - if (carrierCount/onCount < 2.0) + if (carrierCount / onCount < 2.0) { _learningCode.Carrier = IrCode.CarrierFrequencyDCMode; } else { - double carrier = 1000000*carrierCount/onTime; + double carrier = 1000000 * carrierCount / onTime; // TODO: Double-Check this calculation. if (carrier > 32000) { - _learningCode.Carrier = (int) (carrier + 0.05*carrier - 0.666667); + _learningCode.Carrier = (int) (carrier + 0.05 * carrier - 0.666667); // was: _learningCode.Carrier = (int) (carrier + 0.05*carrier - 32000/48000); } else @@ -1198,7 +1198,7 @@ if ((curByte & 0x7F) != 0x7F) { - timingData.Add(len*TimingResolution); + timingData.Add(len * TimingResolution); len = 0; } } @@ -1207,7 +1207,7 @@ } if (len != 0) - timingData.Add(len*TimingResolution); + timingData.Add(len * TimingResolution); #if DEBUG DebugWrite("Received timing: "); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -918,12 +918,12 @@ if (code.TimingData.Length == 0) return null; - byte[] data = new byte[code.TimingData.Length*4]; + byte[] data = new byte[code.TimingData.Length * 4]; int dataIndex = 0; for (int timeIndex = 0; timeIndex < code.TimingData.Length; timeIndex++) { - uint time = (uint) (50*(int) Math.Round((double) code.TimingData[timeIndex]/50)); + uint time = (uint) (50 * (int) Math.Round((double) code.TimingData[timeIndex] / 50)); for (int timeShift = 0; timeShift < 4; timeShift++) { @@ -1294,7 +1294,7 @@ private static int GetCarrierPeriod(int carrier) { - return (int) Math.Round(1000000.0/carrier); + return (int) Math.Round(1000000.0 / carrier); } private static TransmitMode GetTransmitMode(int carrier) @@ -1307,7 +1307,7 @@ private static int[] GetTimingDataFromPacket(byte[] packetBytes) { - int[] timingData = new int[packetBytes.Length/4]; + int[] timingData = new int[packetBytes.Length / 4]; int timingDataIndex = 0; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -482,7 +482,7 @@ WriteSync(new byte[] {0x9F, 0x0D}); WriteSync(new byte[] {0x9F, 0x13}); - Thread.Sleep(4*PacketTimeout); + Thread.Sleep(4 * PacketTimeout); SetTimeout(PacketTimeout); SetInputPort(InputPort.Receive); @@ -509,11 +509,11 @@ { double time = code.TimingData[index]; - byte duration = (byte) Math.Abs(Math.Round(time/TimingResolution)); + byte duration = (byte) Math.Abs(Math.Round(time / TimingResolution)); bool pulse = (time > 0); #if DEBUG - DebugWrite("{0}{1}, ", pulse ? '+' : '-', duration*TimingResolution); + DebugWrite("{0}{1}, ", pulse ? '+' : '-', duration * TimingResolution); #endif while (duration > 0x7F) @@ -531,7 +531,7 @@ #endif // Insert byte count markers into packet data bytes ... - int subpackets = (int) Math.Ceiling(packet.Count/(double) 4); + int subpackets = (int) Math.Ceiling(packet.Count / (double) 4); byte[] output = new byte[packet.Count + subpackets + 1]; @@ -561,7 +561,7 @@ byte[] timeoutPacket = new byte[SetTimeoutPacket.Length]; SetTimeoutPacket.CopyTo(timeoutPacket, 0); - int timeoutSamples = 1000*timeout/TimingResolution; // Timeout as a multiple of the timing resolution + int timeoutSamples = 1000 * timeout / TimingResolution; // Timeout as a multiple of the timing resolution timeoutPacket[2] = (byte) (timeoutSamples >> 8); timeoutPacket[3] = (byte) (timeoutSamples & 0xFF); @@ -632,7 +632,7 @@ { for (int scaler = 1; scaler <= 4; scaler++) { - int divisor = (10000000 >> (2*scaler))/carrier; + int divisor = (10000000 >> (2 * scaler)) / carrier; if (divisor <= 0xFF) { @@ -694,7 +694,7 @@ _readThreadMode = ReadThreadMode.Stop; _stopReadThread.Set(); if (Thread.CurrentThread != _readThread) - _readThread.Join(PacketTimeout*2); + _readThread.Join(PacketTimeout * 2); //_readThread.Abort(); } @@ -856,7 +856,7 @@ while (true) { - int handle = WaitHandle.WaitAny(waitHandles, 2*PacketTimeout, false); + int handle = WaitHandle.WaitAny(waitHandles, 2 * PacketTimeout, false); if (handle == ErrorWaitTimeout) continue; @@ -906,7 +906,7 @@ { byte b1 = packetBytes[indexOfFF + 2]; - firmware += (b1 >> 4) + (0.1*(b1 & 0x0F)); + firmware += (b1 >> 4) + (0.1 * (b1 & 0x0F)); DebugWriteLine("Firmware: {0}", firmware); } @@ -914,7 +914,7 @@ { byte b1 = packetBytes[indexOfFF + 2]; - firmware += (0.01*(b1 >> 4)) + (0.001*(b1 & 0x0F)); + firmware += (0.01 * (b1 >> 4)) + (0.001 * (b1 & 0x0F)); DebugWriteLine("Firmware: {0}", firmware); } @@ -963,20 +963,20 @@ int onTime, onCount; GetIrCodeLengths(_learningCode, out onTime, out onCount); - double carrierCount = (b1*256) + b2; + double carrierCount = (b1 * 256) + b2; - if (carrierCount/onCount < 2.0) + if (carrierCount / onCount < 2.0) { _learningCode.Carrier = IrCode.CarrierFrequencyDCMode; } else { - double carrier = 1000000*carrierCount/onTime; + double carrier = 1000000 * carrierCount / onTime; // TODO: Double-Check this calculation. if (carrier > 32000) { - _learningCode.Carrier = (int) (carrier + 0.05*carrier - 0.666667); + _learningCode.Carrier = (int) (carrier + 0.05 * carrier - 0.666667); // was: _learningCode.Carrier = (int) (carrier + 0.05*carrier - 32000/48000); } else @@ -1177,7 +1177,7 @@ if ((curByte & 0x7F) != 0x7F) { - timingData.Add(len*TimingResolution); + timingData.Add(len * TimingResolution); len = 0; } } @@ -1186,7 +1186,7 @@ } if (len != 0) - timingData.Add(len*TimingResolution); + timingData.Add(len * TimingResolution); #if DEBUG DebugWrite("Received timing: "); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -226,13 +226,13 @@ if ((curByte & 0x7F) != 0x7F) { - timingData.Add(len*50); + timingData.Add(len * 50); len = 0; } } if (len != 0) - timingData.Add(len*50); + timingData.Add(len * 50); IrCode newCode = new IrCode(timingData.ToArray()); newCode.FinalizeData(); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -1310,7 +1310,7 @@ #region Data case RemoteDetectionState.Data: - if ((RC6_Data.HalfBit%2) == 0) + if ((RC6_Data.HalfBit % 2) == 0) { if (pulse && IsBetween(duration, 300, 600)) { @@ -1584,7 +1584,7 @@ #region Data case RemoteDetectionState.Data: - if ((RECS80_Data.HalfBit%2) == 0) + if ((RECS80_Data.HalfBit % 2) == 0) { if (!pulse) break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -708,8 +708,8 @@ int heldRepeats = _remoteHeldRepeats; if (_useSystemRatesRemote) { - firstRepeat = 250 + (SystemInformation.KeyboardDelay*250); - heldRepeats = (int) (1000.0/(2.5 + (SystemInformation.KeyboardSpeed*0.888))); + firstRepeat = 250 + (SystemInformation.KeyboardDelay * 250); + heldRepeats = (int) (1000.0 / (2.5 + (SystemInformation.KeyboardSpeed * 0.888))); } if (!_remoteButtonRepeated && timeBetween.TotalMilliseconds < firstRepeat) @@ -815,8 +815,8 @@ int heldRepeats = _keyboardHeldRepeats; if (_useSystemRatesRemote) { - firstRepeat = 250 + (SystemInformation.KeyboardDelay*250); - heldRepeats = (int) (1000.0/(2.5 + (SystemInformation.KeyboardSpeed*0.888))); + firstRepeat = 250 + (SystemInformation.KeyboardDelay * 250); + heldRepeats = (int) (1000.0 / (2.5 + (SystemInformation.KeyboardSpeed * 0.888))); } if (!_keyboardKeyRepeated && timeBetween.TotalMilliseconds < firstRepeat) @@ -897,8 +897,8 @@ #region Movement Delta - deltaX = (int) (deltaX*_mouseSensitivity); - deltaY = (int) (deltaY*_mouseSensitivity); + deltaX = (int) (deltaX * _mouseSensitivity); + deltaY = (int) (deltaY * _mouseSensitivity); if (deltaX != 0 || deltaY != 0) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -138,8 +138,8 @@ { if (absolute) { - int x = dx*65536/Screen.PrimaryScreen.Bounds.Width; - int y = dy*65536/Screen.PrimaryScreen.Bounds.Height; + int x = dx * 65536 / Screen.PrimaryScreen.Bounds.Width; + int y = dy * 65536 / Screen.PrimaryScreen.Bounds.Height; mouse_event((int) (MouseEvents.Move | MouseEvents.Absolute), x, y, 0, IntPtr.Zero); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -160,10 +160,10 @@ if (prontoCarrier == 0x0000) prontoCarrier = ConvertToProntoCarrier(IrCode.CarrierFrequencyDefault); - double carrier = prontoCarrier*ProntoClock; + double carrier = prontoCarrier * ProntoClock; - int firstSeq = 2*prontoData[2]; - int repeatSeq = 2*prontoData[3]; + int firstSeq = 2 * prontoData[2]; + int repeatSeq = 2 * prontoData[3]; List<int> timingData = new List<int>(); @@ -186,7 +186,7 @@ while (!done) { - int time = (int) (prontoData[index]*carrier); + int time = (int) (prontoData[index] * carrier); if (pulse) timingData.Add(time); @@ -605,18 +605,18 @@ } prontoCarrier = ConvertToProntoCarrier(irCodeCarrier); - carrier = prontoCarrier*ProntoClock; + carrier = prontoCarrier * ProntoClock; for (int index = 0; index < irCode.TimingData.Length; index++) { int duration = Math.Abs(irCode.TimingData[index]); - prontoData.Add((ushort) Math.Round(duration/carrier)); + prontoData.Add((ushort) Math.Round(duration / carrier)); } - if (prontoData.Count%2 != 0) + if (prontoData.Count % 2 != 0) prontoData.Add(SignalFree); - ushort burstPairs = (ushort) (prontoData.Count/2); + ushort burstPairs = (ushort) (prontoData.Count / 2); prontoData.Insert(0, (ushort) codeType); // Pronto Code Type prontoData.Insert(1, prontoCarrier); // IR Frequency @@ -633,7 +633,7 @@ /// <returns>The carrier frequency as an integer number.</returns> public static int ConvertFromProntoCarrier(ushort prontoCarrier) { - return (int) (1000000/(prontoCarrier*ProntoClock)); + return (int) (1000000 / (prontoCarrier * ProntoClock)); } /// <summary> @@ -643,7 +643,7 @@ /// <returns>The carrier frequency in Pronto format.</returns> public static ushort ConvertToProntoCarrier(int carrierFrequency) { - return (ushort) (1000000/(carrierFrequency*ProntoClock)); + return (ushort) (1000000 / (carrierFrequency * ProntoClock)); } #endregion Public Methods Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -240,7 +240,7 @@ } else { - StringBuilder keyCode = new StringBuilder(2*bytes); + StringBuilder keyCode = new StringBuilder(2 * bytes); for (int index = 0; index < bytes; index++) keyCode.Append(_deviceBuffer[index].ToString("X2")); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -143,8 +143,8 @@ if (absolute) { - int x = dx*65536/Screen.PrimaryScreen.Bounds.Width; - int y = dy*65536/Screen.PrimaryScreen.Bounds.Height; + int x = dx * 65536 / Screen.PrimaryScreen.Bounds.Width; + int y = dy * 65536 / Screen.PrimaryScreen.Bounds.Height; mouse_event((int) (MouseEvents.Move | MouseEvents.Absolute), x, y, 0, IntPtr.Zero); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -376,8 +376,8 @@ if (ws.NunchukState.Z != _previousState.NunchukState.Z) mouseButtons |= ws.NunchukState.Z ? Mouse.MouseEvents.LeftDown : Mouse.MouseEvents.LeftUp; - int deltaX = (int) (ws.NunchukState.X*10*_mouseSensitivity); - int deltaY = (int) (ws.NunchukState.Y*-10*_mouseSensitivity); + int deltaX = (int) (ws.NunchukState.X * 10 * _mouseSensitivity); + int deltaY = (int) (ws.NunchukState.Y * -10 * _mouseSensitivity); if (_handleMouseLocally) { @@ -439,8 +439,8 @@ if (ws.IRState.Found1 && ws.IRState.Found2) { - int x = (int) (ScreenWidth - (ws.IRState.X1 + ws.IRState.X2)/2*ScreenWidth); - int y = (int) ((ws.IRState.Y1 + ws.IRState.Y2)/2*ScreenHeight); + int x = (int) (ScreenWidth - (ws.IRState.X1 + ws.IRState.X2) / 2 * ScreenWidth); + int y = (int) ((ws.IRState.Y1 + ws.IRState.Y2) / 2 * ScreenHeight); if (_handleMouseLocally) { @@ -448,8 +448,8 @@ } else { - int prevX = (int) (ScreenWidth - (_previousState.IRState.X1 + _previousState.IRState.X2)/2*ScreenWidth); - int prevY = (int) ((_previousState.IRState.Y1 + _previousState.IRState.Y2)/2*ScreenHeight); + int prevX = (int) (ScreenWidth - (_previousState.IRState.X1 + _previousState.IRState.X2) / 2 * ScreenWidth); + int prevY = (int) ((_previousState.IRState.Y1 + _previousState.IRState.Y2) / 2 * ScreenHeight); int deltaX = x - prevX; int deltaY = y - prevY; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/Wiimote.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/Wiimote.cs 2009-06-21 19:17:03 UTC (rev 2957) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/Wiimote.cs 2009-06-21 23:40:27 UTC (rev 2958) @@ -521,13 +521,13 @@ mWiimoteState.AccelState.RawY = buff[4]; mWiimoteState.AccelState.RawZ = buff[5]; - mWiimoteState.AccelState.X = ((float) mWiimoteState.AccelState.RawX - mWiimoteState.AccelCalibrationInfo.X0)/ + mWiimoteState.AccelState.X = ((float) mWiimoteState.AccelState.RawX - mWiimoteState.AccelCalibrationInfo.X0) / ((float) mWiimoteState.AccelCalibrationInfo.XG - mWiimoteState.AccelCalibrationInfo.X0); - mWiimoteState.AccelState.Y = ((float) mWiimoteState.AccelState.RawY - mWiimoteState.AccelCalibrationInfo.Y0)/ + mWiimoteState.AccelState.Y = ((float) mWiimoteState.AccelState.RawY - mWiimoteState.AccelCalibrationInfo.Y0) / ((float) mWiimoteState.AccelCalibrationInfo.YG - mWiimoteState.AccelCalibrationInfo.Y0); - mWiimoteState.AccelState.Z = ((float) mWiimoteState.AccelState.RawZ - mWiimoteState.AccelCalibrationInfo.Z0)/ + mWiimoteState.AccelState.Z = ((float) mWiimoteState.AccelState.RawZ - mWiimoteState.AccelCalibrationInfo.Z0) / ((float) mWiimoteState.AccelCalibrationInfo.ZG - mWiimoteState.AccelCalibrationInfo.Z0); } @@ -565,18 +565,18 @@ break; } - mWiimoteState.IRState.X1 = (mWiimoteState.IRState.RawX1/1023.5f); - mWiimoteState.IRState.X2 = (mWiimoteState.IRState.RawX2/1023.5f); - mWiimoteState.IRState.Y1 = (mWiimoteState.IRState.RawY1/767.5f); - mWiimoteState.IRState.Y2 = (mWiimoteState.IRState.RawY2/767.5f); + mWiimoteState.IRState.X1 = (mWiimoteState.IRState.RawX1 / 1023.5f); + mWiimoteState.IRState.X2 = (mWiimoteState.IRState.RawX2 / 1023.5f); + mWiimoteState.IRState.Y1 = (mWiimoteState.IRState.RawY1 / 767.5f); + mWiimoteState.IRState.Y2 = (mWiimoteState.IRState.RawY2 / 767.5f); if (mWiimoteState.IRState.Found1 && mWiimoteState.IRState.Found2) { - mWiimoteState.IRState.RawMidX = (mWiimoteState.IRState.RawX2 + mWiimoteState.IRState.RawX1)/2; - mWiimoteState.IRState.RawMidY = (mWiimoteState.IRState.RawY2 + mWiimoteState.IRState.RawY1)/2; + mWiimoteState.IRState.RawMidX = (mWiimoteState.IRState.RawX2 + mWiimoteState.IRState.RawX1) / 2; + mWiimoteState.IRState.RawMidY = (mWiimoteState.IRState.RawY2 + mWiimoteState.IRState.RawY1) / 2; - mWiimoteState.IRState.MidX = (mWiimoteState.IRState.X2 + mWiimoteState.IRState.X1)/2.0f; - mWiimoteState.IRState.MidY = (mWiimoteState.IRState.Y2 + mWiimoteState.IRState.Y1)/2.0f; + mWiimoteState.IRState.MidX = (mWiimoteState.IRState.X2 + mWiimoteState.IRState.X1) / 2.0f; + mWiimoteState.IRState.MidY = (mWiimoteState.IRState.Y2 + mWiimoteState.IRState.Y1) / 2.0f; } else mWiimoteState.IRState.MidX = mWiimoteState.IRState.MidY = 0.0f; @@ -602,30 +602,30 @@ mWiimoteState.NunchukState.Z = (buff[offset + 5] & 0x01) == 0; mWiimoteState.NunchukState.AccelState.X = ((float) mWiimoteState.NunchukState.AccelState.RawX - - mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.X0)/ + mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.X0) / ((float) mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.XG - mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.X0); mWiimoteState.NunchukState.AccelState.Y = ((float) mWiimoteState.NunchukState.AccelState.RawY - - mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.Y0)/ + mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.Y0) / ((float) mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.YG - mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.Y0); mWiimoteState.NunchukState.AccelState.Z = ((float) mWiimoteState.NunchukState.AccelState.RawZ - - mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.Z0)/ + mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.Z0) / ((float) mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.ZG - mWiimoteState.NunchukState.CalibrationInfo.AccelCalibration.Z0); if (mWiimoteState.NunchukState.CalibrationInfo.MaxX != 0x00) mWiimoteState.NunchukState.X = ((float) mWiimoteState.NunchukState.RawX - - mWiimoteState.NunchukState.CalibrationInfo.MidX)/ + mWiimoteState.NunchukState.CalibrationInfo.MidX) / ((float) mWiimoteState.NunchukState.CalibrationInfo.MaxX - mWiimoteState.NunchukState.CalibrationInfo.MinX); if (mWiimoteState.NunchukState.CalibrationInfo.MaxY != 0x00) mWiimoteState.NunchukState.Y = ((float) mWiimoteState.NunchukState.RawY - - mWiimoteState.NunchukState.CalibrationInfo.MidY)/ + mWiimoteState.NunchukState.CalibrationInfo.MidY) / ((float) mWiimoteState.NunchukState.CalibrationInfo.MaxY - mWiimoteState.NunchukState.CalibrationInfo.MinY); @@ -660,30 +660,30 @@ if (mWiimoteState.ClassicControllerState.CalibrationInfo.MaxXL != 0x00) mWiimoteState.ClassicControllerState.XL = ((float) mWiimoteState.ClassicControllerState.RawXL - - mWiimoteState.ClassicControllerState.CalibrationInfo.MidXL)/ + mWiimoteState.ClassicControllerState.CalibrationInfo.MidXL) / (mWiimoteState.ClassicControllerState.CalibrationInfo.MaxXL - mWiimoteState.ClassicControllerState.CalibrationInfo.MinXL); if (mWiimoteStat... [truncated message content] |
From: <che...@us...> - 2009-06-22 22:01:54
|
Revision: 2960 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2960&view=rev Author: chemelli_sf Date: 2009-06-22 22:00:47 +0000 (Mon, 22 Jun 2009) Log Message: ----------- Removed old unused iMON plugin Modified Paths: -------------- trunk/plugins/IR Server Suite/setup/setup.nsi Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon Receiver/ Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-06-22 21:53:04 UTC (rev 2959) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-06-22 22:00:47 UTC (rev 2960) @@ -379,7 +379,6 @@ File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*" File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*" File "..\IR Server Suite\IR Server Plugins\IgorPlug Receiver\bin\${Build_Type}\IgorPlug Receiver.*" - ;File "..\IR Server Suite\IR Server Plugins\Imon Receiver\bin\${Build_Type}\Imon Receiver.*" File "..\IR Server Suite\IR Server Plugins\Imon USB Receivers\bin\${Build_Type}\Imon USB Receivers.*" ;File "..\IR Server Suite\IR Server Plugins\IR501 Receiver\bin\${Build_Type}\IR501 Receiver.*" File "..\IR Server Suite\IR Server Plugins\IR507 Receiver\bin\${Build_Type}\IR507 Receiver.*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-07-05 15:56:51
|
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. |
From: <che...@us...> - 2009-07-05 19:01:32
|
Revision: 2987 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2987&view=rev Author: chef_koch Date: 2009-07-05 19:01:22 +0000 (Sun, 05 Jul 2009) Log Message: ----------- removed #IF DEBUG compile time statements Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Program.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -85,11 +85,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Append("Dbox Tuner.log"); LoadSettings(); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -83,11 +83,7 @@ Console.WriteLine("HCW PVR Tuner"); Console.WriteLine(); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Append("Dbox Tuner.log"); if (args.Length != 1) Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -54,11 +54,7 @@ [STAThread] private static void Main(string[] args) { -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Append("IR Blast.log"); ShowHeader(); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -55,11 +55,7 @@ [STAThread] private static void Main(string[] args) { -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Append("IR Blast (No Window).log"); try Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -38,11 +38,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("IR File Tool.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -60,11 +60,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("IR Server.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -70,11 +70,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Keyboard Input Relay.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -38,11 +38,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open(Common.FolderIrssLogs + "MacroScope.log"); Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -43,11 +43,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Media Center Blaster.log"); Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -476,9 +476,7 @@ /// <param name="channelFull">The channel full ID.</param> internal static void ProcessExternalCommand(string command, int channelDigit, string channelFull) { -#if DEBUG IrssLog.Debug("ProcessExternalCommand(\"{0}\", {1}, {2})", command, channelDigit, channelFull); -#endif if (command.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase)) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -155,11 +155,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Translator.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -46,11 +46,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Tray Launcher.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -107,11 +107,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Virtual Remote.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -38,11 +38,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Virtual Remote Skin Editor.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -118,11 +118,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Web Remote.log"); Application.ThreadException += Application_ThreadException; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -38,8 +38,6 @@ { #region Debug -#if DEBUG - private static void Remote(string deviceName, string code) { Console.WriteLine("Remote: {0}", code); @@ -68,8 +66,6 @@ c = null; } -#endif - #endregion Debug #region Constants Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -259,10 +259,8 @@ /// </summary> public override void Start() { -#if DEBUG DebugOpen("IgorPlug Receiver.log"); DebugWriteLine("Start()"); -#endif if (!Detect()) throw new InvalidOperationException("IgorPlug not found"); @@ -278,9 +276,7 @@ /// </summary> public override void Suspend() { -#if DEBUG DebugWriteLine("Suspend()"); -#endif Stop(); } @@ -290,9 +286,7 @@ /// </summary> public override void Resume() { -#if DEBUG DebugWriteLine("Resume()"); -#endif Start(); } @@ -302,18 +296,14 @@ /// </summary> public override void Stop() { -#if DEBUG DebugWriteLine("Stop()"); -#endif _readThread.Abort(); if (_readThread.IsAlive) _readThread.Join(); -#if DEBUG DebugClose(); -#endif } private void ReadThread() @@ -553,8 +543,6 @@ #region Debug -#if DEBUG - private static StreamWriter _debugFile; /// <summary> @@ -674,8 +662,6 @@ DebugWriteNewLine(); } -#endif - #endregion Debug // #define TEST_APPLICATION in the project properties when creating the console test app ... Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -7,9 +7,7 @@ { public partial class iMonUSBReceivers { -#if DEBUG private static StreamWriter _debugFile; -#endif /// <summary> /// Opens a debug output file. @@ -17,7 +15,6 @@ /// <param name="fileName">Name of the file.</param> private static void DebugOpen(string fileName) { -#if DEBUG if (_debugFile != null) return; try { @@ -30,7 +27,6 @@ { _debugFile = null; } -#endif } /// <summary> @@ -38,14 +34,12 @@ /// </summary> private static void DebugClose() { -#if DEBUG if (_debugFile != null) { _debugFile.Close(); _debugFile.Dispose(); _debugFile = null; } -#endif } /// <summary> @@ -55,13 +49,11 @@ /// <param name="args">Formatting arguments.</param> private static void DebugWriteLine(string line, params object[] args) { -#if DEBUG if (_debugFile != null) { _debugFile.Write("{0:yyyy-MM-dd HH:mm:ss.ffffff} - ", DateTime.Now); _debugFile.WriteLine(line, args); } -#endif #if TEST_APPLICATION Console.Write("{0:yyyy-MM-dd HH:mm:ss.ffffff} - ", DateTime.Now); Console.WriteLine(line, args); @@ -75,12 +67,10 @@ /// <param name="args">Formatting arguments.</param> private static void DebugWrite(string text, params object[] args) { -#if DEBUG if (_debugFile != null) { _debugFile.Write(text, args); } -#endif #if TEST_APPLICATION Console.Write(text, args); #endif @@ -91,12 +81,10 @@ /// </summary> private static void DebugWriteNewLine() { -#if DEBUG if (_debugFile != null) { _debugFile.WriteLine(); } -#endif #if TEST_APPLICATION Console.WriteLine(); #endif Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -425,8 +425,6 @@ #region Debug -#if DEBUG - protected static StreamWriter _debugFile; /// <summary> @@ -546,8 +544,6 @@ DebugWriteNewLine(); } -#endif - #endregion Debug } } \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -214,7 +214,6 @@ /// </summary> public override void Start() { -#if DEBUG try { DebugOpen("MicrosoftMceTransceiver_DriverReplacement.log"); @@ -222,7 +221,6 @@ DebugWriteLine("Device Guid: {0}", _deviceGuid); DebugWriteLine("Device Path: {0}", _devicePath); DebugWriteLine("Device Type: {0}", Enum.GetName(typeof (DeviceType), _deviceType)); -#endif _notifyWindow = new NotifyWindow(); _notifyWindow.Create(); @@ -235,14 +233,12 @@ _notifyWindow.DeviceArrival += OnDeviceArrival; _notifyWindow.DeviceRemoval += OnDeviceRemoval; -#if DEBUG } catch { DebugClose(); throw; } -#endif } /// <summary> @@ -250,9 +246,7 @@ /// </summary> public override void Stop() { -#if DEBUG DebugWriteLine("Stop()"); -#endif try { @@ -266,27 +260,18 @@ StopReadThread(); CloseDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif finally { _notifyWindow.UnregisterDeviceArrival(); _notifyWindow.Dispose(); _notifyWindow = null; -#if DEBUG DebugClose(); -#endif } } @@ -295,17 +280,13 @@ /// </summary> public override void Suspend() { -#if DEBUG DebugWriteLine("Suspend()"); -#endif try { if (_readHandle == null) { -#if DEBUG DebugWriteLine("Warning: Device is not active"); -#endif return; } @@ -314,18 +295,11 @@ StopReadThread(); CloseDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif } /// <summary> @@ -333,17 +307,13 @@ /// </summary> public override void Resume() { -#if DEBUG DebugWriteLine("Resume()"); -#endif try { if (String.IsNullOrEmpty(Find(_deviceGuid))) { -#if DEBUG DebugWriteLine("Device not found"); -#endif return; } @@ -356,18 +326,11 @@ StartReadThread(); InitializeDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif } /// <summary> @@ -378,9 +341,7 @@ /// <returns>Learn status.</returns> public override LearnStatus Learn(int learnTimeout, out IrCode learned) { -#if DEBUG DebugWriteLine("Learn()"); -#endif learned = null; _learningCode = new IrCode(); @@ -394,9 +355,7 @@ while (_readThreadMode == ReadThreadMode.Learning && Environment.TickCount < learnStartTick + learnTimeout) Thread.Sleep(PacketTimeout); -#if DEBUG DebugWriteLine("End Learn"); -#endif ReadThreadMode modeWas = _readThreadMode; @@ -416,9 +375,7 @@ break; case ReadThreadMode.LearningDone: -#if DEBUG DebugDump(_learningCode.TimingData); -#endif if (_learningCode.FinalizeData()) { learned = _learningCode; @@ -438,10 +395,8 @@ /// <param name="port">IR port to send to.</param> public override void Send(IrCode code, int port) { -#if DEBUG DebugWrite("Send(): "); DebugDump(code.TimingData); -#endif // Reset device (hopefully this will stop the blaster from stalling) //WriteSync(ResetPacket); @@ -472,9 +427,7 @@ /// </summary> private void InitializeDevice() { -#if DEBUG DebugWriteLine("InitializeDevice()"); -#endif WriteSync(StartPacket); @@ -497,9 +450,7 @@ /// <returns>Raw device data.</returns> private static byte[] DataPacket(IrCode code) { -#if DEBUG DebugWriteLine("DataPacket()"); -#endif if (code.TimingData.Length == 0) return null; @@ -514,9 +465,7 @@ byte duration = (byte) Math.Abs(Math.Round(time / TimingResolution)); bool pulse = (time > 0); -#if DEBUG DebugWrite("{0}{1}, ", pulse ? '+' : '-', duration * TimingResolution); -#endif while (duration > 0x7F) { @@ -528,9 +477,7 @@ packet.Add((byte) (pulse ? 0x80 | duration : duration)); } -#if DEBUG DebugWriteNewLine(); -#endif // Insert byte count markers into packet data bytes ... int subpackets = (int) Math.Ceiling(packet.Count / (double) 4); @@ -616,16 +563,12 @@ if (carrier == IrCode.CarrierFrequencyUnknown) { carrier = IrCode.CarrierFrequencyDefault; -#if DEBUG DebugWriteLine("SetCarrierFrequency(): No carrier frequency specificied, using default ({0})", carrier); -#endif } -#if DEBUG else { DebugWriteLine("SetCarrierFrequency({0})", carrier); } -#endif byte[] carrierPacket = new byte[SetCarrierFreqPacket.Length]; SetCarrierFreqPacket.CopyTo(carrierPacket, 0); @@ -653,15 +596,11 @@ /// </summary> private void StartReadThread() { -#if DEBUG DebugWriteLine("StartReadThread()"); -#endif if (_readThread != null) { -#if DEBUG DebugWriteLine("Read thread already started"); -#endif return; } @@ -679,15 +618,11 @@ /// </summary> private void StopReadThread() { -#if DEBUG DebugWriteLine("StopReadThread()"); -#endif if (_readThread == null) { -#if DEBUG DebugWriteLine("Read thread already stopped"); -#endif return; } @@ -700,17 +635,10 @@ //_readThread.Abort(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); } -#else - catch - { - // Ignore exceptions while terminating read thread - } -#endif finally { _stopReadThread.Close(); @@ -725,15 +653,11 @@ /// </summary> private void OpenDevice() { -#if DEBUG DebugWriteLine("OpenDevice()"); -#endif if (_readHandle != null) { -#if DEBUG DebugWriteLine("Device already open"); -#endif return; } @@ -764,10 +688,8 @@ _readHandle.DangerousAddRef(ref success); if (success) _notifyWindow.RegisterDeviceRemoval(_readHandle.DangerousGetHandle()); -#if DEBUG else DebugWriteLine("Warning: Failed to initialize device removal notification"); -#endif _deviceAvailable = true; } @@ -777,17 +699,13 @@ /// </summary> private void CloseDevice() { -#if DEBUG DebugWriteLine("CloseDevice()"); -#endif _deviceAvailable = false; if (_readHandle == null && _writeHandle == null) { -#if DEBUG DebugWriteLine("Device already closed"); -#endif return; } @@ -813,9 +731,7 @@ /// </summary> private void OnDeviceArrival() { -#if DEBUG DebugWriteLine("OnDeviceArrival()"); -#endif OpenDevice(); StartReadThread(); @@ -827,9 +743,7 @@ /// </summary> private void OnDeviceRemoval() { -#if DEBUG DebugWriteLine("OnDeviceRemoval()"); -#endif StopReadThread(); CloseDevice(); @@ -904,10 +818,8 @@ packetBytes = new byte[bytesRead]; Marshal.Copy(deviceBufferPtr, packetBytes, 0, bytesRead); -#if DEBUG DebugWrite("Received bytes ({0}): ", bytesRead); DebugDump(packetBytes); -#endif int[] timingData = null; @@ -915,7 +827,6 @@ { timingData = GetTimingDataFromPacket(packetBytes); } -#if DEBUG else { double firmware = 0.0; @@ -945,7 +856,6 @@ break; } } -#endif switch (_readThreadMode) { @@ -1026,7 +936,6 @@ } } } -#if DEBUG catch (ThreadInterruptedException ex) { DebugWriteLine(ex.Message); @@ -1041,13 +950,6 @@ if (_readHandle != null) CancelIo(_readHandle); } -#else - catch (Exception) - { - if (_readHandle != null) - CancelIo(_readHandle); - } -#endif finally { if (deviceBufferPtr != IntPtr.Zero) @@ -1057,9 +959,7 @@ waitHandle.Close(); } -#if DEBUG DebugWriteLine("Read Thread Ended"); -#endif } /// <summary> @@ -1068,10 +968,8 @@ /// <param name="data">Packet to write to device.</param> private void WriteSync(byte[] data) { -#if DEBUG DebugWrite("WriteSync({0}): ", data.Length); DebugDump(data); -#endif if (!_deviceAvailable) throw new InvalidOperationException("Device not available"); @@ -1139,18 +1037,14 @@ /// <returns>Timing data.</returns> private int[] GetTimingDataFromPacket(byte[] packet) { -#if DEBUG // TODO: Remove this try/catch block once the IndexOutOfRangeException is corrected... try -#endif { -#if DEBUG if (_decodeCarry != 0) { DebugWriteLine("Decode Carry EXISTS: {0}", _decodeCarry); DebugDump(packet); } -#endif List<int> timingData = new List<int>(); @@ -1180,10 +1074,8 @@ _decodeCarry = (index + bytes + 1) - packet.Length; bytes -= _decodeCarry; -#if DEBUG DebugWriteLine("Decode Carry SET: {0}", _decodeCarry); DebugDump(packet); -#endif } int j; @@ -1209,14 +1101,11 @@ if (len != 0) timingData.Add(len * TimingResolution); -#if DEBUG DebugWrite("Received timing: "); DebugDump(timingData.ToArray()); -#endif return timingData.ToArray(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); @@ -1225,7 +1114,6 @@ return null; } -#endif } /// <summary> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -478,7 +478,6 @@ //_legacyDevice = (int)(flags & DeviceCapabilityFlags.Legacy) != 0; //_canFlashLed = (int)(flags & DeviceCapabilityFlags.FlashLed) != 0; -#if DEBUG DebugWriteLine("Device Capabilities:"); DebugWriteLine("NumTxPorts: {0}", _numTxPorts); DebugWriteLine("NumRxPorts: {0}", structure.ReceivePorts.ToInt32()); @@ -486,7 +485,6 @@ DebugWriteLine("ReceivePort: {0}", _receivePort); DebugWriteLine("LearnPort: {0}", _learnPort); DebugWriteLine("DetailsFlags: {0}", structure.DetailsFlags.ToInt32()); -#endif } private void GetBlasters() @@ -520,16 +518,12 @@ _txPortMask = structure.Blasters.ToInt32(); -#if DEBUG DebugWriteLine("TxPortMask: {0}", _txPortMask); -#endif } private void TransmitIR(byte[] irData, int carrier, int transmitPortMask) { -#if DEBUG DebugWriteLine("TransmitIR({0} bytes, carrier: {1}, port: {2})", irData.Length, carrier, transmitPortMask); -#endif if (!_deviceAvailable) throw new InvalidOperationException("Device not available"); @@ -683,12 +677,10 @@ { try { -#if DEBUG DebugOpen("MicrosoftMceTransceiver_DriverVista.log"); DebugWriteLine("Start()"); DebugWriteLine("Device Guid: {0}", _deviceGuid); DebugWriteLine("Device Path: {0}", _devicePath); -#endif _notifyWindow = new NotifyWindow(); _notifyWindow.Create(); @@ -705,9 +697,7 @@ } catch { -#if DEBUG DebugClose(); -#endif throw; } } @@ -717,9 +707,7 @@ /// </summary> public override void Stop() { -#if DEBUG DebugWriteLine("Stop()"); -#endif try { @@ -729,27 +717,18 @@ StopReadThread(); CloseDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif finally { _notifyWindow.UnregisterDeviceArrival(); _notifyWindow.Dispose(); _notifyWindow = null; -#if DEBUG DebugClose(); -#endif } } @@ -758,9 +737,7 @@ /// </summary> public override void Suspend() { -#if DEBUG DebugWriteLine("Suspend()"); -#endif } /// <summary> @@ -768,32 +745,21 @@ /// </summary> public override void Resume() { -#if DEBUG DebugWriteLine("Resume()"); -#endif try { if (String.IsNullOrEmpty(Find(_deviceGuid))) { -#if DEBUG DebugWriteLine("Device not found"); -#endif return; } } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif } /// <summary> @@ -804,9 +770,7 @@ /// <returns>Learn status.</returns> public override LearnStatus Learn(int learnTimeout, out IrCode learned) { -#if DEBUG DebugWriteLine("Learn()"); -#endif RestartReadThread(ReadThreadMode.Learning); @@ -819,9 +783,7 @@ while (_readThreadMode == ReadThreadMode.Learning && Environment.TickCount < learnStartTick + learnTimeout) Thread.Sleep(PacketTimeout); -#if DEBUG DebugWriteLine("End Learn"); -#endif ReadThreadMode modeWas = _readThreadMode; @@ -840,9 +802,7 @@ break; case ReadThreadMode.LearningDone: -#if DEBUG DebugDump(_learningCode.TimingData); -#endif if (_learningCode.FinalizeData()) { learned = _learningCode; @@ -862,10 +822,8 @@ /// <param name="port">IR port to send to.</param> public override void Send(IrCode code, int port) { -#if DEBUG DebugWrite("Send(): "); DebugDump(code.TimingData); -#endif byte[] data = DataPacket(code); @@ -896,9 +854,7 @@ /// </summary> private void InitializeDevice() { -#if DEBUG DebugWriteLine("InitializeDevice()"); -#endif GetDeviceCapabilities(); GetBlasters(); @@ -911,9 +867,7 @@ /// <returns>Raw device data.</returns> private static byte[] DataPacket(IrCode code) { -#if DEBUG DebugWriteLine("DataPacket()"); -#endif if (code.TimingData.Length == 0) return null; @@ -940,15 +894,11 @@ /// </summary> private void StartReadThread(ReadThreadMode mode) { -#if DEBUG DebugWriteLine("StartReadThread({0})", Enum.GetName(typeof (ReadThreadMode), mode)); -#endif if (_readThread != null) { -#if DEBUG DebugWriteLine("Read thread already started"); -#endif return; } @@ -989,15 +939,11 @@ /// </summary> private void StopReadThread() { -#if DEBUG DebugWriteLine("StopReadThread()"); -#endif if (_readThread == null) { -#if DEBUG DebugWriteLine("Read thread already stopped"); -#endif return; } @@ -1022,15 +968,11 @@ /// </summary> private void OpenDevice() { -#if DEBUG DebugWriteLine("OpenDevice()"); -#endif if (_eHomeHandle != null) { -#if DEBUG DebugWriteLine("Device already open"); -#endif return; } @@ -1053,12 +995,10 @@ //_notifyWindow.UnregisterDeviceArrival(); // If the device is present then we don't want to monitor arrival. _notifyWindow.RegisterDeviceRemoval(_eHomeHandle.DangerousGetHandle()); } -#if DEBUG else { DebugWriteLine("Warning: Failed to initialize device removal notification"); } -#endif Thread.Sleep(PacketTimeout); // Hopefully improves compatibility with Zalman remote which times out retrieving device capabilities. (2008-01-01) @@ -1071,17 +1011,13 @@ /// </summary> private void CloseDevice() { -#if DEBUG DebugWriteLine("CloseDevice()"); -#endif _deviceAvailable = false; if (_eHomeHandle == null) { -#if DEBUG DebugWriteLine("Device already closed"); -#endif return; } @@ -1098,9 +1034,7 @@ /// </summary> private void OnDeviceArrival() { -#if DEBUG DebugWriteLine("OnDeviceArrival()"); -#endif OpenDevice(); InitializeDevice(); @@ -1113,9 +1047,7 @@ /// </summary> private void OnDeviceRemoval() { -#if DEBUG DebugWriteLine("OnDeviceRemoval()"); -#endif StopReadThread(); CloseDevice(); @@ -1169,10 +1101,8 @@ int[] timingData = GetTimingDataFromPacket(packetBytes); -#if DEBUG DebugWrite("Received timing: "); DebugDump(timingData); -#endif if (_readThreadMode == ReadThreadMode.Learning) _learningCode.AddTimingData(timingData); @@ -1194,14 +1124,9 @@ } } } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); -#else - catch (Exception) - { -#endif if (_eHomeHandle != null) CancelIo(_eHomeHandle); @@ -1216,22 +1141,13 @@ if (_eHomeHandle != null) StopReceive(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); } -#else - catch - { - // Ignore this exception, we're closing it down anyway. - } -#endif } -#if DEBUG DebugWriteLine("Read Thread Ended"); -#endif } #endregion Implementation Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -212,7 +212,6 @@ /// </summary> public override void Start() { -#if DEBUG try { DebugOpen("MicrosoftMceTransceiver_DriverXP.log"); @@ -220,7 +219,6 @@ DebugWriteLine("Device Guid: {0}", _deviceGuid); DebugWriteLine("Device Path: {0}", _devicePath); DebugWriteLine("Device Type: {0}", Enum.GetName(typeof (DeviceType), _deviceType)); -#endif _notifyWindow = new NotifyWindow(); _notifyWindow.Create(); @@ -233,14 +231,12 @@ _notifyWindow.DeviceArrival += OnDeviceArrival; _notifyWindow.DeviceRemoval += OnDeviceRemoval; -#if DEBUG } catch { DebugClose(); throw; } -#endif } /// <summary> @@ -248,9 +244,7 @@ /// </summary> public override void Stop() { -#if DEBUG DebugWriteLine("Stop()"); -#endif try { @@ -264,27 +258,18 @@ StopReadThread(); CloseDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif finally { _notifyWindow.UnregisterDeviceArrival(); _notifyWindow.Dispose(); _notifyWindow = null; -#if DEBUG DebugClose(); -#endif } } @@ -293,17 +278,13 @@ /// </summary> public override void Suspend() { -#if DEBUG DebugWriteLine("Suspend()"); -#endif try { if (_eHomeHandle == null) { -#if DEBUG DebugWriteLine("Warning: Device is not active"); -#endif return; } @@ -312,18 +293,11 @@ StopReadThread(); CloseDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif } /// <summary> @@ -331,17 +305,13 @@ /// </summary> public override void Resume() { -#if DEBUG DebugWriteLine("Resume()"); -#endif try { if (String.IsNullOrEmpty(Find(_deviceGuid))) { -#if DEBUG DebugWriteLine("Device not found"); -#endif return; } @@ -354,18 +324,11 @@ StartReadThread(); InitializeDevice(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); throw; } -#else - catch - { - throw; - } -#endif } /// <summary> @@ -376,9 +339,7 @@ /// <returns>Learn status.</returns> public override LearnStatus Learn(int learnTimeout, out IrCode learned) { -#if DEBUG DebugWriteLine("Learn()"); -#endif learned = null; _learningCode = new IrCode(); @@ -392,9 +353,7 @@ while (_readThreadMode == ReadThreadMode.Learning && Environment.TickCount < learnStartTick + learnTimeout) Thread.Sleep(PacketTimeout); -#if DEBUG DebugWriteLine("End Learn"); -#endif ReadThreadMode modeWas = _readThreadMode; @@ -414,9 +373,7 @@ break; case ReadThreadMode.LearningDone: -#if DEBUG DebugDump(_learningCode.TimingData); -#endif if (_learningCode.FinalizeData()) { learned = _learningCode; @@ -436,10 +393,8 @@ /// <param name="port">IR port to send to.</param> public override void Send(IrCode code, int port) { -#if DEBUG DebugWrite("Send(): "); DebugDump(code.TimingData); -#endif // Reset device (hopefully this will stop the blaster from stalling) //WriteSync(ResetPacket); @@ -470,9 +425,7 @@ /// </summary> private void InitializeDevice() { -#if DEBUG DebugWriteLine("InitializeDevice()"); -#endif WriteSync(StartPacket); @@ -495,9 +448,7 @@ /// <returns>Raw device data.</returns> private static byte[] DataPacket(IrCode code) { -#if DEBUG DebugWriteLine("DataPacket()"); -#endif if (code.TimingData.Length == 0) return null; @@ -512,9 +463,7 @@ byte duration = (byte) Math.Abs(Math.Round(time / TimingResolution)); bool pulse = (time > 0); -#if DEBUG DebugWrite("{0}{1}, ", pulse ? '+' : '-', duration * TimingResolution); -#endif while (duration > 0x7F) { @@ -526,9 +475,7 @@ packet.Add((byte) (pulse ? 0x80 | duration : duration)); } -#if DEBUG DebugWriteNewLine(); -#endif // Insert byte count markers into packet data bytes ... int subpackets = (int) Math.Ceiling(packet.Count / (double) 4); @@ -614,16 +561,12 @@ if (carrier == IrCode.CarrierFrequencyUnknown) { carrier = IrCode.CarrierFrequencyDefault; -#if DEBUG DebugWriteLine("SetCarrierFrequency(): No carrier frequency specificied, using default ({0})", carrier); -#endif } -#if DEBUG else { DebugWriteLine("SetCarrierFrequency({0})", carrier); } -#endif byte[] carrierPacket = new byte[SetCarrierFreqPacket.Length]; SetCarrierFreqPacket.CopyTo(carrierPacket, 0); @@ -651,15 +594,11 @@ /// </summary> private void StartReadThread() { -#if DEBUG DebugWriteLine("StartReadThread()"); -#endif if (_readThread != null) { -#if DEBUG DebugWriteLine("Read thread already started"); -#endif return; } @@ -677,15 +616,11 @@ /// </summary> private void StopReadThread() { -#if DEBUG DebugWriteLine("StopReadThread()"); -#endif if (_readThread == null) { -#if DEBUG DebugWriteLine("Read thread already stopped"); -#endif return; } @@ -698,17 +633,10 @@ //_readThread.Abort(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); } -#else - catch - { - // Ignore exceptions while terminating read thread - } -#endif finally { _stopReadThread.Close(); @@ -723,15 +651,11 @@ /// </summary> private void OpenDevice() { -#if DEBUG DebugWriteLine("OpenDevice()"); -#endif if (_eHomeHandle != null) { -#if DEBUG DebugWriteLine("Device already open"); -#endif return; } @@ -751,10 +675,8 @@ _eHomeHandle.DangerousAddRef(ref success); if (success) _notifyWindow.RegisterDeviceRemoval(_eHomeHandle.DangerousGetHandle()); -#if DEBUG else DebugWriteLine("Warning: Failed to initialize device removal notification"); -#endif _deviceAvailable = true; } @@ -764,17 +686,13 @@ /// </summary> private void CloseDevice() { -#if DEBUG DebugWriteLine("CloseDevice()"); -#endif _deviceAvailable = false; if (_eHomeHandle == null) { -#if DEBUG DebugWriteLine("Device already closed"); -#endif return; } @@ -791,9 +709,7 @@ /// </summary> private void OnDeviceArrival() { -#if DEBUG DebugWriteLine("OnDeviceArrival()"); -#endif OpenDevice(); StartReadThread(); @@ -805,9 +721,7 @@ /// </summary> private void OnDeviceRemoval() { -#if DEBUG DebugWriteLine("OnDeviceRemoval()"); -#endif StopReadThread(); CloseDevice(); @@ -883,10 +797,8 @@ packetBytes = new byte[bytesRead]; Marshal.Copy(deviceBufferPtr, packetBytes, 0, bytesRead); -#if DEBUG DebugWrite("Received bytes ({0}): ", bytesRead); DebugDump(packetBytes); -#endif int[] timingData = null; @@ -894,7 +806,6 @@ { timingData = GetTimingDataFromPacket(packetBytes); } -#if DEBUG else { double firmware = 0.0; @@ -924,7 +835,6 @@ break; } } -#endif switch (_readThreadMode) { @@ -1005,7 +915,6 @@ } } } -#if DEBUG catch (ThreadInterruptedException ex) { DebugWriteLine(ex.Message); @@ -1020,13 +929,6 @@ if (_eHomeHandle != null) CancelIo(_eHomeHandle); } -#else - catch (Exception) - { - if (_eHomeHandle != null) - CancelIo(_eHomeHandle); - } -#endif finally { if (deviceBufferPtr != IntPtr.Zero) @@ -1036,9 +938,7 @@ waitHandle.Close(); } -#if DEBUG DebugWriteLine("Read Thread Ended"); -#endif } /// <summary> @@ -1047,10 +947,8 @@ /// <param name="data">Packet to write to device.</param> private void WriteSync(byte[] data) { -#if DEBUG DebugWrite("WriteSync({0}): ", data.Length); DebugDump(data); -#endif if (!_deviceAvailable) throw new InvalidOperationException("Device not available"); @@ -1118,18 +1016,14 @@ /// <returns>Timing data.</returns> private int[] GetTimingDataFromPacket(byte[] packet) { -#if DEBUG // TODO: Remove this try/catch block once the IndexOutOfRangeException is corrected... try -#endif { -#if DEBUG if (_decodeCarry != 0) { DebugWriteLine("Decode Carry EXISTS: {0}", _decodeCarry); DebugDump(packet); } -#endif List<int> timingData = new List<int>(); @@ -1159,10 +1053,8 @@ _decodeCarry = (index + bytes + 1) - packet.Length; bytes -= _decodeCarry; -#if DEBUG DebugWriteLine("Decode Carry SET: {0}", _decodeCarry); DebugDump(packet); -#endif } int j; @@ -1188,14 +1080,11 @@ if (len != 0) timingData.Add(len * TimingResolution); -#if DEBUG DebugWrite("Received timing: "); DebugDump(timingData.ToArray()); -#endif return timingData.ToArray(); } -#if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); @@ -1204,7 +1093,6 @@ return null; } -#endif } /// <summary> Modified: trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -50,11 +50,7 @@ /// <param name="args">Command line parameters.</param> private static void Main(string[] args) { -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif try { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Program.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Program.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -107,11 +107,7 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); -#if DEBUG IrssLog.LogLevel = IrssLog.Level.Debug; -#else - IrssLog.LogLevel = IrssLog.Level.Info; -#endif IrssLog.Open("Input Service Configuration.log"); LoadSettings(); 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-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -258,9 +258,9 @@ map = GetMapping(btnCode); if (map == null) return false; -#if DEBUG + 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) Util.Utils.PlaySound(map.Sound, false, true); @@ -275,10 +275,10 @@ { case "ACTION": // execute Action x Key key = new Key(map.CmdKeyChar, map.CmdKeyCode); -#if DEBUG + 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); GUIGraphicsContext.OnAction(action); break; Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -591,9 +591,7 @@ /// <param name="channelFull">The channel full ID.</param> internal static void ProcessExternalCommand(string command, int channelDigit, string channelFull) { -#if DEBUG Log.Debug("TV2BlasterPlugin: ProcessExternalCommand(\"{0}\", {1}, {2})", command, channelDigit, channelFull); -#endif if (command.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase)) { Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2009-07-05 17:45:35 UTC (rev 2986) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2009-07-05 19:01:22 UTC (rev 2987) @@ -346,10 +346,8 @@ { TvServerEventArgs tvEvent = (TvServerEventArgs) eventArgs; -#if DEBUG Log.Debug("TV3BlasterPlugin: Received TV Server Event \"{0}\"", Enum.GetName(typeof (TvServerEventType), tvEvent.EventType)); -#endif if (tvEvent.EventType != TvServerEventType.StartZapChannel) return; @@ -358,10 +356,8 @@ if (analogChannel == null) return; -#if DEBUG Log.Debug("TV3BlasterPlugin: Analog channel input source \"{0}\"", Enum.GetName(typeof (AnalogChannel.VideoInputType), analogChannel.VideoSource)); -#endif //if (analogChannel.VideoSource == AnalogChannel.VideoInputType.Tuner) //return; @@ -533,9 +529,7 @@ /// <param name="channelFull">The channel full ID.</param> internal static void ProcessExternalCommand(string command, int channelDigit, string channelFull) { -#if DEBUG Log.Debug("TV3BlasterPlugin: ProcessExternalCommand(\"{0}\", {1}, {2})", command, channelDigit, channelFull); -#endif if (command.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-07-07 00:53:09
|
Revision: 2991 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2991&view=rev Author: chef_koch Date: 2009-07-07 00:21:16 +0000 (Tue, 07 Jul 2009) Log Message: ----------- added reference to MediaPortal's shared coding style definition file Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-07-06 23:34:48 UTC (rev 2990) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-07-07 00:21:16 UTC (rev 2991) @@ -1,93 +1,6 @@ <Configuration> <CodeStyleSettings> - <ExternalPath IsNull="False"> - </ExternalPath> - <Sharing>SOLUTION</Sharing> - <CSharp> - <FormatSettings> - <MODIFIERS_ORDER IsNull="False"> - <Item>public</Item> - <Item>protected</Item> - <Item>internal</Item> - <Item>private</Item> - <Item>new</Item> - <Item>abstract</Item> - <Item>virtual</Item> - <Item>override</Item> - <Item>sealed</Item> - <Item>static</Item> - <Item>readonly</Item> - <Item>extern</Item> - <Item>unsafe</Item> - <Item>volatile</Item> - </MODIFIERS_ORDER> - <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP> - </FormatSettings> - <UsingsSettings /> - <Naming2> - <ExceptionName IsNull="False"> - </ExceptionName> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" /> - <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" /> - <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicStaticFields" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicInstanceFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" /> - </Naming2> - </CSharp> - <VB> - <FormatSettings /> - <ImportsSettings /> - <Naming2 /> - </VB> - <FileHeader Region="Copyright (C) 2005-2009 Team MediaPortal"><![CDATA[Copyright (C) 2005-2009 Team MediaPortal -http://www.team-mediaportal.com - -This Program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -This Program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -http://www.gnu.org/copyleft/gpl.html]]></FileHeader> - <GenerateMemberBody /> - <Naming2> - <ExceptionName IsNull="False"> - </ExceptionName> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicInstanceFields" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicStaticFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" /> - <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" /> - <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AA_BB" ElementKind="Constants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" /> - <Abbreviation Text="MP" /> - <Abbreviation Text="XP" /> - <Abbreviation Text="MCE" /> - <Abbreviation Text="SVN" /> - <Abbreviation Text="ID" /> - </Naming2> + <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath> + <Sharing>EXTERNAL</Sharing> </CodeStyleSettings> </Configuration> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper 2009-07-06 23:34:48 UTC (rev 2990) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.4.5.resharper 2009-07-07 00:21:16 UTC (rev 2991) @@ -1,93 +1,6 @@ <Configuration> <CodeStyleSettings> - <ExternalPath IsNull="False"> - </ExternalPath> - <Sharing>SOLUTION</Sharing> - <CSharp> - <FormatSettings> - <MODIFIERS_ORDER IsNull="False"> - <Item>public</Item> - <Item>protected</Item> - <Item>internal</Item> - <Item>private</Item> - <Item>new</Item> - <Item>abstract</Item> - <Item>virtual</Item> - <Item>override</Item> - <Item>sealed</Item> - <Item>static</Item> - <Item>readonly</Item> - <Item>extern</Item> - <Item>unsafe</Item> - <Item>volatile</Item> - </MODIFIERS_ORDER> - <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP> - </FormatSettings> - <UsingsSettings /> - <Naming2> - <ExceptionName IsNull="False"> - </ExceptionName> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" /> - <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" /> - <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicStaticFields" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicInstanceFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" /> - </Naming2> - </CSharp> - <VB> - <FormatSettings /> - <ImportsSettings /> - <Naming2 /> - </VB> - <FileHeader Region="Copyright (C) 2005-2009 Team MediaPortal"><![CDATA[Copyright (C) 2005-2009 Team MediaPortal -http://www.team-mediaportal.com - -This Program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -This Program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -http://www.gnu.org/copyleft/gpl.html]]></FileHeader> - <GenerateMemberBody /> - <Naming2> - <ExceptionName IsNull="False"> - </ExceptionName> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicInstanceFields" /> - <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicStaticFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" /> - <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" /> - <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AA_BB" ElementKind="Constants" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" /> - <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" /> - <Abbreviation Text="MP" /> - <Abbreviation Text="XP" /> - <Abbreviation Text="MCE" /> - <Abbreviation Text="SVN" /> - <Abbreviation Text="ID" /> - </Naming2> + <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath> + <Sharing>EXTERNAL</Sharing> </CodeStyleSettings> </Configuration> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-07-10 22:39:24
|
Revision: 3000 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3000&view=rev Author: chef_koch Date: 2009-07-10 22:39:20 +0000 (Fri, 10 Jul 2009) Log Message: ----------- separated compactFramework stuff into it's own solution file Modified Paths: -------------- trunk/plugins/IR Server Suite/setup/setup.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/Virtual Remote/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003) Installer/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003) Installer/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5) Installer/ trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.4.5.resharper trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.sln Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (PocketPC2003) Installer/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (Smartphone2003) Installer/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5)/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote (WinCE5) Installer/ Copied: trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.4.5.resharper (from rev 2999, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper) =================================================================== --- trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.4.5.resharper (rev 0) +++ trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.4.5.resharper 2009-07-10 22:39:20 UTC (rev 3000) @@ -0,0 +1,6 @@ +<Configuration> + <CodeStyleSettings> + <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath> + <Sharing>EXTERNAL</Sharing> + </CodeStyleSettings> +</Configuration> \ No newline at end of file Copied: trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.sln (from rev 2999, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln) =================================================================== --- trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.sln (rev 0) +++ trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.sln 2009-07-10 22:39:20 UTC (rev 3000) @@ -0,0 +1,114 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{0C209E91-5AD5-4662-AD0E-976A940D4806}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote (PocketPC2003)", "Applications\Virtual Remote (PocketPC2003)\Virtual Remote (PocketPC2003).csproj", "{48839540-780F-4323-8F50-68E2A2385502}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote (WinCE5)", "Applications\Virtual Remote (WinCE5)\Virtual Remote (WinCE5).csproj", "{3BB1C204-D08E-43E5-AC68-DCDD624404A5}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote (Smartphone2003)", "Applications\Virtual Remote (Smartphone2003)\Virtual Remote (Smartphone2003).csproj", "{BA322C1E-D7C6-4673-80E2-123B7714B0DB}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{B900F1C2-3D47-4FEC-85B3-04AAF18C3634}") = "Virtual Remote (PocketPC2003) Installer", "Applications\Virtual Remote (PocketPC2003) Installer\Virtual Remote (PocketPC2003) Installer.vddproj", "{FEB70334-6F8E-41D5-9B0A-D5714A296830}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{B900F1C2-3D47-4FEC-85B3-04AAF18C3634}") = "Virtual Remote (Smartphone2003) Installer", "Applications\Virtual Remote (Smartphone2003) Installer\Virtual Remote (Smartphone2003) Installer.vddproj", "{4C18B138-BF94-4224-9085-4D3EDA680EDA}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{B900F1C2-3D47-4FEC-85B3-04AAF18C3634}") = "Virtual Remote (WinCE5) Installer", "Applications\Virtual Remote (WinCE5) Installer\Virtual Remote (WinCE5) Installer.vddproj", "{DCE0C464-3843-45F1-A48B-C1A3FF532C1D}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {48839540-780F-4323-8F50-68E2A2385502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Debug|x86.ActiveCfg = Debug|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Release|Any CPU.Build.0 = Release|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Release|Any CPU.Deploy.0 = Release|Any CPU + {48839540-780F-4323-8F50-68E2A2385502}.Release|x86.ActiveCfg = Release|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Debug|x86.ActiveCfg = Debug|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Release|Any CPU.Build.0 = Release|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Release|Any CPU.Deploy.0 = Release|Any CPU + {3BB1C204-D08E-43E5-AC68-DCDD624404A5}.Release|x86.ActiveCfg = Release|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Debug|x86.ActiveCfg = Debug|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Release|Any CPU.Build.0 = Release|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {BA322C1E-D7C6-4673-80E2-123B7714B0DB}.Release|x86.ActiveCfg = Release|Any CPU + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Debug|Any CPU.ActiveCfg = Debug + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Debug|Any CPU.Build.0 = Debug + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Debug|x86.ActiveCfg = Debug + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Debug|x86.Build.0 = Debug + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Release|Any CPU.ActiveCfg = Release + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Release|Any CPU.Build.0 = Release + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Release|x86.ActiveCfg = Release + {FEB70334-6F8E-41D5-9B0A-D5714A296830}.Release|x86.Build.0 = Release + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Debug|Any CPU.ActiveCfg = Debug + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Debug|Any CPU.Build.0 = Debug + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Debug|x86.ActiveCfg = Debug + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Debug|x86.Build.0 = Debug + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Release|Any CPU.ActiveCfg = Release + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Release|Any CPU.Build.0 = Release + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Release|x86.ActiveCfg = Release + {4C18B138-BF94-4224-9085-4D3EDA680EDA}.Release|x86.Build.0 = Release + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Debug|Any CPU.ActiveCfg = Debug + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Debug|Any CPU.Build.0 = Debug + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Debug|x86.ActiveCfg = Debug + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Debug|x86.Build.0 = Debug + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Release|Any CPU.ActiveCfg = Release + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Release|Any CPU.Build.0 = Release + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Release|x86.ActiveCfg = Release + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D}.Release|x86.Build.0 = Release + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {48839540-780F-4323-8F50-68E2A2385502} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {3BB1C204-D08E-43E5-AC68-DCDD624404A5} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {BA322C1E-D7C6-4673-80E2-123B7714B0DB} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {FEB70334-6F8E-41D5-9B0A-D5714A296830} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {4C18B138-BF94-4224-9085-4D3EDA680EDA} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {DCE0C464-3843-45F1-A48B-C1A3FF532C1D} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + EndGlobalSection +EndGlobal Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-10 19:03:22 UTC (rev 2999) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-10 22:39:20 UTC (rev 3000) @@ -914,9 +914,9 @@ ; Installing Virtual Remote for Smart Devices SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices" - File "..\IR Server Suite\Applications\Virtual Remote (PocketPC2003) Installer\${Build_Type}\*.cab" - File "..\IR Server Suite\Applications\Virtual Remote (Smartphone2003) Installer\${Build_Type}\*.cab" - File "..\IR Server Suite\Applications\Virtual Remote (WinCE5) Installer\${Build_Type}\*.cab" + File "..\Virtual Remote\Applications\Virtual Remote (PocketPC2003) Installer\${Build_Type}\*.cab" + File "..\Virtual Remote\Applications\Virtual Remote (Smartphone2003) Installer\${Build_Type}\*.cab" + File "..\Virtual Remote\Applications\Virtual Remote (WinCE5) Installer\${Build_Type}\*.cab" ; create folders CreateDirectory "$APPDATA\${PRODUCT_NAME}\Virtual Remote" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-07-11 02:04:46
|
Revision: 3002 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3002&view=rev Author: chef_koch Date: 2009-07-11 02:04:42 +0000 (Sat, 11 Jul 2009) Log Message: ----------- removed documentation from installation, it's located in wiki now Modified Paths: -------------- trunk/plugins/IR Server Suite/setup/setup.nsi Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Common/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.chm trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhc trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhp trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Input Service/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Plugins/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Sage Setup/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Translator/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Tray Launcher/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/Virtual Remote/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/abstract_remote_model.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/ehome_driver.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/introduction.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/irblast.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/legal.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/new.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/pronto.html trunk/plugins/IR Server Suite/IR Server Suite/Documentation/troubleshooting.html Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.chm =================================================================== (Binary files differ) Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhc =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhc 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhc 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,106 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> -<HTML> -<HEAD> -<meta name="GENERATOR" content="Microsoft® HTML Help Workshop 4.1"> -<!-- Sitemap 1.0 --> -</HEAD><BODY> -<OBJECT type="text/site properties"> - <param name="Window Styles" value="0x800025"> -<param name="Font" value="Arial,8,0"> -</OBJECT> -<UL> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Introduction"> - <param name="Local" value="introduction.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Input Service"> - <param name="Local" value="Input Service\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Tray Launcher"> - <param name="Local" value="Tray Launcher\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Translator"> - <param name="Local" value="Translator\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Virtual Remote"> - <param name="Local" value="Virtual Remote\index.html"> - </OBJECT> - <UL> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Skin Editor"> - <param name="Local" value="Virtual Remote\Skin Editor\index.html"> - </OBJECT> - </UL> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Plugins"> - <param name="Local" value="Plugins\index.html"> - </OBJECT> - <UL> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="MP Control Plugin"> - <param name="Local" value="Plugins\MP Control Plugin\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="MP Blast Zone Plugin"> - <param name="Local" value="Plugins\MP Blast Zone Plugin\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="TV2 Blaster Plugin"> - <param name="Local" value="Plugins\TV2 Blaster Plugin\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="TV3 Blaster Plugin"> - <param name="Local" value="Plugins\TV3 Blaster Plugin\index.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Known Set Top Boxes"> - <param name="Local" value="Plugins\stb.html"> - </OBJECT> - </UL> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="What's new?"> - <param name="Local" value="new.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Legal"> - <param name="Local" value="legal.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Appendices"> - </OBJECT> - <UL> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="The Macro Editor"> - <param name="Local" value="Common\macro_editor.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Using Philips Pronto CCF files"> - <param name="Local" value="pronto.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Tutorial: MP Control Plugin event mapper"> - <param name="Local" value="Plugins\MP Control Plugin\event_tutorial.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="IR Blast (Command line tool)"> - <param name="Local" value="irblast.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="MCE IR device driver improvement"> - <param name="Local" value="ehome_driver.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Abstract Remote Model"> - <param name="Local" value="abstract_remote_model.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Troubleshooting"> - <param name="Local" value="troubleshooting.html"> - </OBJECT> - </UL> -</UL> -</BODY></HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhp =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhp 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/IR Server Suite.hhp 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,44 +0,0 @@ -[OPTIONS] -Auto Index=Yes -Compatibility=1.1 or later -Compiled file=IR Server Suite.chm -Contents file=IR Server Suite.hhc -Default Font=Arial,8,0 -Default topic=introduction.html -Display compile progress=No -Full-text search=Yes -Language=0xc09 English (Australia) -Title=IR Server Suite - - -[FILES] -introduction.html -new.html -Input Service\index.html -Plugins\index.html -Plugins\MP Blast Zone Plugin\index.html -Plugins\MP Control Plugin\index.html -Plugins\MP Control Plugin\event_tutorial.html -Plugins\TV2 Blaster Plugin\index.html -Plugins\TV3 Blaster Plugin\index.html -Translator\index.html -Tray Launcher\index.html -Virtual Remote\index.html -Virtual Remote\Skin Editor\index.html -Plugins\stb.html -Common\external_program.html -Common\keystrokes.html -Common\keystrokes_info.html -Common\learn_ir.html -Common\macro_editor.html -Common\message_command.html -Common\serial_command.html -pronto.html -irblast.html -ehome_driver.html -legal.html -troubleshooting.html -abstract_remote_model.html - -[INFOTYPES] - Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/abstract_remote_model.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/abstract_remote_model.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/abstract_remote_model.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,108 +0,0 @@ -<HTML> -<HEAD><TITLE>Abstract Remote Model</TITLE></HEAD> -<BODY> - -<H2>Abstract Remote Model<BR><HR COLOR="RED"></H2> - -<P>The biggest problem with PC remote control applications is the configuration process. They generally fall into one of two categories. The first category is the \x93easy to setup but inflexible\x94 category, and the second is the \x93difficult to setup but highly flexible\x94 category.</P> - -<P><B>Case in point: ByRemote HIP vs Promixis Girder.</B></P> - -<P>HIP is easy to setup without any prior knowledge, but HIP is not as feature rich or flexible as Girder. Don't get me wrong here, it's a fantastic program which I highly recommend, but it's not <I>as</I> feature rich as Girder.</P> - -<P>Girder on the other hand is very difficult to setup <I>compared to HIP</I>, it has a steep learning curve, but is feature rich and flexible.</P> - -<P>This document does not seek to make a value judgement on either application. Both have their advantages and disadvantages.</P> - -<P>One of the goals in software development is to produce software that "just works". Software that is easy to use but also powerful enough to be adapted different situations.</P> - -<P>For PC Remote Control software one solution to the traditional trade-off between usability and flexibility is the subject of this document, the Abstract Remote Model.</P> - -<P>By agreeing on the most common remote buttons and including a collection of mappings to make all the supported remotes fit the common model we can provide a default configuration that will work on all supported remotes with no setup required. Default configurations would be supplied for a large number of common PC applications, as well as general OS navigation and use.</P> - -<P>The drawback with other simplified systems of this nature is that you lose the flexibility to define different buttons and functions outside the simplified model, but with the Abstract Remote Model proposed any remote button that is not mapped onto the abstract model will be passed on in it\x92s raw form, thereby enabling the user to customize beyond the default configuration.</P> - -<P>What follows is the Abstract Remote Model button list as of Version 0.1 of the Abstract Remote Model.</P> - -<!-- - - - ---> - -<TABLE> -<TR><TD>Abstract Button Name</TD><TD>Brief description</TD><TD>Explanation</TD></TR> -<TR><TD>Up</TD><TD>Up Arrow</TD><TD>A feature of almost all PC remote controls, the arrow buttons are generally used to control the on screen cursor or item selection.</TD></TR> -<TR><TD>Down</TD><TD>Down Arrow</TD><TD> -<TR><TD>Left</TD><TD>Left Arrow</TD><TD> -<TR><TD>Right</TD><TD>Right Arrow</TD><TD> -<TR><TD>OK</TD><TD>OK / Select</TD><TD>Used to make a selection.</TD></TR> -<TR><TD>VolumeUp</TD><TD>Increase Volume</TD><TD>Increase the system or application volume.</TD></TR> -<TR><TD>VolumeDown</TD><TD>Decrease Volume</TD><TD>Decrease the system or application volume.</TD></TR> -<TR><TD>ChannelUp</TD><TD>Channel Up</TD><TD>In TV systems this button is used to increment the channel.</TD></TR> -<TR><TD>ChannelDown</TD><TD>Channel Down</TD><TD>In TV systems this button is used to decrement the channel.</TD></TR> -<TR><TD>PreviousChannel</TD><TD>Return to the Previous Channel</TD><TD>In TV systems this button is used to go back to the last channel.</TD></TR> -<TR><TD>Start</TD><TD>Start / Home / Go</TD><TD>This button may appear under many labels, in MCE convention it is referred to as the Start button and is used to launch a common application or while in that application it is also used to return to the main menu or home screen.</TD></TR> -<TR><TD>Back</TD><TD>Back</TD><TD>Often mapped as the keyboard Escape key, this buttons most common function is to leave a menu or abort an operation or selection.</TD></TR> -<TR><TD>Info</TD><TD>Info / More</TD><TD> -<TR><TD>Mute</TD><TD>Mute Volume</TD><TD>Mute either the system or application volume.</TD></TR> -<TR><TD>Number0</TD><TD>0</TD><TD>Numbers from 0 through to 9 are used as either simple numerical text input, as channel number entry, or as an \x93sms-style\x94 alpha-numeric text entry system.</TD></TR> -<TR><TD>Number1</TD><TD>1</TD><TD> -<TR><TD>Number2</TD><TD>2</TD><TD> -<TR><TD>Number3</TD><TD>3</TD><TD> -<TR><TD>Number4</TD><TD>4</TD><TD> -<TR><TD>Number5</TD><TD>5</TD><TD> -<TR><TD>Number6</TD><TD>6</TD><TD> -<TR><TD>Number7</TD><TD>7</TD><TD> -<TR><TD>Number8</TD><TD>8</TD><TD> -<TR><TD>Number9</TD><TD>9</TD><TD> -<TR><TD>Play</TD><TD>Play</TD><TD>Used to commence playback.</TD></TR> -<TR><TD>Pause</TD><TD>Pause</TD><TD>Used to pause playback.</TD></TR> -<TR><TD>PlayPause</TD><TD>Play / Pause</TD><TD>Many remotes will combine play and the pause functions into one button that pauses when playback is already running and commences playback when it is not. -<TR><TD>Stop</TD><TD>Stop</TD><TD>Stop playback.</TD></TR> -<TR><TD>FastForward</TD><TD>Fast Forward</TD><TD>Increase the playback rate.</TD></TR> -<TR><TD>Rewind</TD><TD>Rewind</TD><TD>Reverse the playback and increase the rate.</TD></TR> -<TR><TD>Record</TD><TD>Record</TD><TD>Record.</TD></TR> -<TR><TD>NextChapter</TD><TD>Chapter +</TD><TD>Skip to the next chapter or item in a playlist, can also be used as a Page Up or Down.</TD></TR> -<TR><TD>PreviousChapter</TD><TD>Chapter -</TD><TD>Skip back to the previous chapter or item in a playlist, can also be used as a Page Up or Down.</TD></TR> -<TR><TD>Power</TD><TD>Power (Software)</TD><TD>Power button. For this purpose we will assume it refers to the running software.</TD></TR> -<TR><TD>Power2</TD><TD>Power (PC)</TD><TD>Second Power button. For this purpose we will assume it always refers to the PCs power state.</TD></TR> -<TR><TD>Power3</TD><TD>Power (Other)</TD><TD>Third Power button. User definable. Remove?</TD></TR> -<TR><TD>Teletext</TD><TD>Teletext</TD><TD>Turns Teletext (or can be subtitles) on or off.</TD></TR> -<TR><TD>Red</TD><TD>Red Teletext Button</TD><TD>When used in a teletext system these buttons each serve a purpose, however in systems or situations that do not have teletext these buttons can be given user-defined functions.</TD></TR> -<TR><TD>Green</TD><TD>Green Teletext Button</TD><TD> -<TR><TD>Yellow</TD><TD>Yellow Teletext Button</TD><TD> -<TR><TD>Blue</TD><TD>Blue Teletext Button</TD><TD> -<TR><TD>Subtitles</TD><TD>Subtitles</TD><TD>Toggle or Cycle subtitles.</TD></TR> -<TR><TD>Menu</TD><TD>Menu</TD><TD>Go to Menu (often DVD Menu).</TD></TR> -<TR><TD>Clear</TD><TD>Clear / Delete</TD><TD>Clear a text entry or delete a single character (backspace).</TD></TR> -<TR><TD>Enter</TD><TD>Enter</TD><TD>Simulates a keyboard Enter button press, or is used to add a carriage return to a block of text, where as pressing OK/Select would finish the text entry mode.</TD></TR> -<TR><TD>Hash</TD><TD>#</TD><TD>Used for special functions in alpha-numeric text entry modes. Or simply as a special character.</TD></TR> -<TR><TD>Star</TD><TD>*</TD><TD>Used for special functions in alpha-numeric text entry modes. Or simply as a special character.</TD></TR> -<TR><TD>TaskSwap</TD><TD>Task Swap / Alt-Tab</TD><TD>Used to switch between running applications on the PC.</TD></TR> -<TR><TD>Fullscreen</TD><TD>Toggle Fullscreen</TD><TD>Toggle video playback or window size between fullscreen and windowed.</TD></TR> -<TR><TD>AspectRatio</TD><TD>Toggle Aspect Ratio</TD><TD>Cycle the video aspect ratio between available values.</TD></TR> -<TR><TD>Setup</TD><TD>Setup</TD><TD>Setup. General configuration button.</TD></TR> -<TR><TD>Music</TD><TD>Music</TD><TD>Go to the Music section of a program, or used to launch a music application.</TD></TR> -<TR><TD>Pictures</TD><TD>Pictures</TD><TD>Go to the Pictures section of a program, or used to launch a picture viewer application.</TD></TR> -<TR><TD>Videos</TD><TD>Videos</TD><TD>Go to the Videos section of a program, or used to launch a video player application.</TD></TR> -<TR><TD>DVD</TD><TD>DVD</TD><TD>Go to the DVD section of a program, or used to launch a DVD player application.</TD></TR> -<TR><TD>TV</TD><TD>Television</TD><TD>Go to the Television section of a program, or used to launch a television application.</TD></TR> -<TR><TD>Guide</TD><TD>Guide / EPG</TD><TD>Go to the Guide or EPG section of a program.</TD></TR> -<TR><TD>LiveTV</TD><TD>Live TV</TD><TD>Go to the Live TV section of a program, or used to launch a live TV application.</TD></TR> -<TR><TD>RecordedTV</TD><TD>Recorded TV programs</TD><TD>Go to the Recorded TV section of a program, or used to launch a video playback application.</TD></TR> -<TR><TD>Radio</TD><TD>Radio</TD><TD>Go to the Radio section of a program, or used to launch a radio application.</TD></TR> -<TR><TD>Print</TD><TD>Print</TD><TD>Print the current view/document.</TD></TR> -<TR><TD>Snapshot</TD><TD>Create Snapshot</TD><TD>Create an image snapshot of the current view.</TD></TR> -<TR><TD>Open</TD><TD>Open</TD><TD>Open a file/program.</TD></TR> -<TR><TD>Close</TD><TD>Close</TD><TD>Close a file/program.</TD></TR> -<TR><TD>Eject</TD><TD>Eject</TD><TD>Eject a CD/DVD.</TD></TR> -<TR><TD>ScrollUp</TD><TD>Scroll Up</TD><TD>Scroll the view up. Remove?</TD></TR> -<TR><TD>ScrollDown</TD><TD>Scroll Down</TD><TD>Scroll the view down. Remove?</TD></TR> -<TR><TD>PageUp</TD><TD>Page Up</TD><TD>Page Up. Remove?</TD></TR> -<TR><TD>PageDown</TD><TD>Page Down</TD><TD>Page Down. Remove?</TD></TR> - -</TABLE> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/ehome_driver.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/ehome_driver.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/ehome_driver.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,40 +0,0 @@ -<HTML> -<HEAD><TITLE>MCE IR device driver improvement</TITLE></HEAD> -<BODY> - -<H2>MCE IR device driver improvement<BR><HR COLOR="RED"></H2> - -<H3>With IR Server Suite there is no reason to use the MCE Replacement Driver.</H3> - -<P>By default Windows will handle most of the MCE Remote buttons, the arrow buttons, number buttons, etc ...<BR> -But I've now figured out a way to stop this behaviour ...</P> - -<P>To handle the MCE device Windows loads a series of device drivers onto the system.<BR> -The main driver is the USB device driver, it provides access to the MCE device. Without it you can't use the device at all.</P> - -<P>There are also a series of Human Interface Device (HID) drivers that are there to translate raw information from the USB device into remote button presses, keyboard and mouse inputs.</P> - -<P>You can't disable the HID drivers but you can alter their settings to prevent them from acting on the button presses coming from the remote.</P> - -<P>This process should work on all version of Windows that support the Microsoft eHome Infrared Transceiver. I've tested on Windows XP Pro and Windows Vista Home Premium and it worked on both.</P> - -<P>However, please note that HIP, Girder and EventGhost can't use the default Windows eHome driver in Vista. On Windows XP these programs are fine, but these programs need the Replacement driver for Vista and I haven't been able to get the Replacement driver to work on 64-bit Vista yet, only 32-bit Vista.</P> - -<H3>How to ...<BR><HR COLOR="RED"></H3> - -<P>Load "regedit.exe" and navigate to:</P> - -<P>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\HidIr\Remotes\745a17a0-74d3-11d0-b6fe-00a0c90f57da</P> - -<P>Then delete the keys from "CodeSetNum0" to "CodeSetNum3".</P> - -<P>To make sure you can recover these keys easily should you want to you should save them by using the export function in the file menu.</P> - -<P>Once the registry has been changed you will need to reboot for the change to take effect.</P> - -<P>This same process can be applied to disable automatic keyboard handling. Just look at the other registry sections under the "Remotes" sections.</P> - -<P>Now if you ever want to re-enable the automatic handling of the MCE Remote and MCE Keyboard you just need to put those registry keys back.</P> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/introduction.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/introduction.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/introduction.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,61 +0,0 @@ -<HTML> -<HEAD><TITLE>Introduction</TITLE></HEAD> -<BODY> - -<H2>Introduction<BR><HR COLOR="RED"></H2> - -<P><I>Congratulations!<BR> -You are the privileged owner of IR Server Suite, a PC remote control suite of applications and plugins designed for MediaPortal.<BR> -If used and maintained in accordance with normal operating practices, IR Server Suite will provide many months of trouble-free operation.</I></P> - -<P>The original reason for developing this system was to extend the capabilities of the MCE Replacement Plugin for MediaPortal. The project was started only a few short weeks after the MCE Replacement Plugin was started when limitations of that implementation became obvious. However, IR Server Suite is now a fully-featured PC remote control suite.</P> - -<P><B>How does this work?</B><BR> -<BR> -You install Input Service on a computer that has an IR Device attached to it. Input Service then provides access to that IR Device for all the plugins and applications in the suite, no matter where those applications and plugins are running on your network.<BR> -<BR> -You don't have to have a LAN (Network) to use IR Server Suite, because all the applications and plugins can operate on the one machine too.<BR> -<BR> -By having one point of access to the IR Device, Input Service regulates the communications with the IR Device. This means that multiple plugins and applications can be accessing the device at effectively the same time without interfering with each other.<BR> -<BR> -This means, for example, the MediaPortal TV Server as well as the MediaPortal client can share the device. And by using other applications in the suite you can control your whole PC.<BR> -</P> - -<P><B>System requirements</B><BR> -<UL> -<LI>Windows XP or Vista</LI> -<LI>Microsoft .net 2.0</LI> -<LI>A supported remote control or input device</LI> -</UL> - -<P><B>Suite Overview</B><BR> -<BR> -<A HREF="Input Service\index.html">Input Service</A><BR> -Input Service is the centre-piece of the system. As the name suggests, it is a windows service that provides access to the IR device. Other applications and plugins communicate with the Input Service to receive button press notification and to blast (transmit) or learn IR commands.<BR> -<BR> -<A HREF="Translator\index.html">Translator</A><BR> -This is a program in the same style as HIP and to a lesser extent Girder. It is designed to control your whole PC by Remote Control.<BR> -<BR> -<A HREF="Tray Launcher\index.html">Tray Launcher</A><BR> -This application loads into the system tray and waits for a user defined button to be pressed and then launches an application of your choosing. It's function is duplicated by Translator, but in some cases people just want a simple application to do this.<BR> -<BR> -<A HREF="Virtual Remote\index.html">Virtual Remote</A><BR> -Virtual Remote is a software remote control, styled as an Infrared remote control. It lets you simulate remote control commands either locally or over a network. It also includes Web Remote that hosts the Virtual Remote as a web page.<BR> -<BR> -<A HREF="Plugins\MP Control Plugin\index.html">MP Control Plugin</A><BR> -This MediaPortal plugin is the equivalent of the MediaPortal MCE Replacement Plugin, it is used to control MediaPortal.<BR> -<BR> -<A HREF="Plugins\MP Blast Zone Plugin\index.html">MP Blast Zone Plugin</A><BR> -This MediaPortal plugin lets you control your IR devices from within the MediaPortal GUI. By organising a menu structure inside the plugin you can blast IR commands, execute macros, launch applications, send windows messages, and jump to other screens within MediaPortal.<BR> -<BR> -<A HREF="Plugins\TV2 Blaster Plugin\index.html">TV2 Blaster Plugin</A><BR> -This MediaPortal plugin is for tuning external channels (on Set Top Boxes) for the MediaPortal TV Engine 2 (the default TV system built into MediaPortal 0.2.3.0).<BR> -<BR> -<A HREF="Plugins\TV3 Blaster Plugin\index.html">TV3 Blaster Plugin</A><BR> -This MediaPortal TV Server plugin is for tuning external channels (on Set Top Boxes) for the TV Engine 3 (the MediaPortal TV Server).<BR> -<BR> - -</P> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/irblast.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/irblast.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/irblast.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,40 +0,0 @@ -<HTML> -<HEAD><TITLE>IR Blast (Command line tool)</TITLE></HEAD> -<BODY> - -<H2>IR Blast (Command line tool)<BR><HR COLOR="RED"></H2> -<P>IR Blast is for blasting IR commands from the command line.</P> - -<P>But really IR Blast is to interface with other software that can launch external applications for IR Blasting.</P> - -<P>Usage:<BR> -<BR> -IRBlast -host {server} [-port x] [-pad x] [-channel] {commands}<BR> -<BR> -Use -host to specify the computer that is hosting the IR Server.<BR> -Use -port to blast to a particular blaster port (optional).<BR> -Use -channel to tell IR Blast to break apart the following IR Command and use each digit for a separate IR blast (optional).<BR> -Use -delay to specify a time to delay between each command or digit in a channel number (Optional).<BR> -Use -pad to tell IR Blast to pad channel numbers to a certain length (Optional, Requires -channel).<BR> -Use a tilde ~ between commands to insert half second pauses.</P> - -<P>Examples:<BR> -<BR> -IRBlast -host HTPC TV_Power.IR<BR> -<BR> -This would blast the TV_Power.IR command on the HTPC computer to the default blaster port.<BR> -<BR> -IRBlast -host MEDIAPC -port Port_2 "Turn on surround.IR"<BR> -<BR> -This would blast the "Turn on surround.IR" command on the MEDIAPC computer to blaster port 2.<BR> -<BR> -IRBlast -host HTPC -pad 4 -channel 302<BR> -<BR> -This would blast the 3.IR, 0.IR, and 2.IR commands on the HTPC computer to the default blaster port.</P> - -<BR> -<P>There is also a windowless version of IR Blast in the same folder as "IRBlast.exe" called "IRBlast-NoWindow.exe"</P> -<P>IR Blast (No Window) uses the exact same command line parameters as IRBlast, but when called from another application it will not create a command prompt window.</P> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/legal.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/legal.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/legal.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,42 +0,0 @@ -<HTML> -<HEAD><TITLE>Legal</TITLE></HEAD> -<BODY> - -<H2>Legal<BR><HR COLOR="RED"></H2> -<P> - -You may use, distribute and copy IR Server Suite under the terms of <a href="LICENSE.GPL">GNU General Public License version 2</a>.<br> -<br> - -<I>Microsoft</I>, <I>Windows</I>, <I>Hotmail</I>, <I>Xbox</I> and <I>Windows Media Center</I> are trademarks of <a href="http://www.microsoft.com/">Microsoft Corporation</a>.<br> -<I>Hauppauge</I> and <I>WinTV</I> are trademarks of <a href="http://www.hauppauge.com/">Hauppauge Computer Works, Inc</a>.<br> -<I>Pace</I> is a trademark of <a href="http://www.pacemicro.com/">Pace Micro Technology</a>.<br> -<I>Telewest</I> is a trademark of <a href="http://www.telewest.co.uk/">Telewest</a>.<br> -<I>NTL</I> is a trademark of <a href="http://ntl.co.uk">NTL</a>.<br> -<I>IRDA</I> is a trademark of the <a href="http://www.irda.org/">Infra Red Data Association</a>.<br> -<I>SKY</I> is a trademark of <a href="http://www.sky.com/skycom/home/">British Sky Broadcasting</a>.<br> -<I>Pronto</I> is a trademark of <a href="http://www.pronto.philips.com/">Koninklijke Philips Electronics N.V</a>.<br> -<I>DViCO</I>, <I>FusionHDTV</I>, and <I>FusionREMOTE</I> are trademarks of <a href="http://www.dvico.com/">DViCO Inc</a>.<br> -<I>Promixis</I>, <I>Girder</I> and <I>NetRemote</I> are trademarks of <a href="http://www.promixis.com/">Promixis, LLC</a>.<br> -<I>HIP</I> and <I>ByRemote</I> are trademarks of <a href="http://www.btmi.com.au/">BTM Innovation Pty Ltd</a>.<br> -<I>IrMan</I> is a trademark of <a href="http://www.evation.com/">Evation</a>.<br> -<I>Intelliremote</I> is a trademark of <a href="http://melloware.com/">Melloware</a>.<br> -<I>Red-Eye</I> is a trademark of <a href="http://www.redremote.co.uk/">White Wing Logic</a>.<br> -<I>MediaPortal</I> is a trademark of <a href="http://www.team-mediaportal.com/">Team MediaPortal</a>.<br> -<I>USB-UIRT</I> is a trademark of <a href="http://www.usbuirt.com/">Jon Rhees</a>.<br> -<I>Nintendo</I> and <I>Wii</I> are trademarks of <a href="http://www.nintendo.com/">Nintendo</a>.<br> -<br> -<I>MCE Standby Tool</I> is Copyright 2006, 2007 <a href="http://www.xs4all.nl/~hveijk/mst/indexe.htm">Herman van Eijk</a>.<br> - -<br> -Other product and company names mentioned may be the trademarks of their respective owners. All efforts are made to ensure correctness and attribution, however errors or ommisions may occur. Please report any errors or ommisions by getting in touch with me through the <a href="http://forum.team-mediaportal.com/forumdisplay.php?f=165">MediaPortal forums</a>. -</P> - -<P>Input Service uses <a href="http://blogs.msdn.com/coding4fun/archive/2007/03/14/1879033.aspx">WiimoteLib</a> which is Copyright Brian Peek and used under the terms of the <a href="LICENSE.MS-PL">MS-PL License</a>.</P> - -<P>Input Service configuration uses <a href="http://www.devage.com/">SourceGrid</a> which is Copyright 2007 Davide Icardi and distributed under the terms of the <a href="LICENSE.MIT">MIT License</a>.</P> - -<P>Translator uses <a href="http://www.msjogren.net/dotnet/eng/samples/dotnet_shelllink.asp">ShellLink sample</a> which is Copyright Mattias Sj\xF6gren.</P> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/new.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/new.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/new.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,222 +0,0 @@ -<HTML> -<HEAD><TITLE>What's new?</TITLE></HEAD> -<BODY> - -<H2>What's new?<BR><HR COLOR="RED"></H2> - -<!-- -<P>Version 1.5.0 -<UL> -<LI>Macros: Major overhaul of macro and command structures (WARNING: This breaks compatibility with existing macro files).</LI> -<LI>Macros: Variable assignment, a data stack and conditional execution statements in macros are now available. See documentation for more info.</LI> -<LI>Macros: Stack tracing macro execution for loop detection has been removed now that legitimate recursion is provided for through variables and conditional statements.</LI> -<LI>New Command: Send WakeOnLan.</LI> -<LI>New Command: Speak Text.</LI> -</UL></P> -<BR> ---> - -<P>Version 1.4.2 -<UL> -<LI>MP Control plugin: Fixed Macro command for Multi-Mapping.</LI> -<LI>MCE Remote Receiver: Fixed XP and Replacement driver blasting bug that has existed since October.</LI> -<LI>AdsTech 335 Receiver: Attempted to fix a bug that caused Input Service to crash roughly every 5 minutes.</LI> -<LI>Installer: New IR Server Suite installer. It looks more professional and you can now change the MediaPortal plugin install paths.</LI> -<LI>General: Fixed the "pause" macro command.</LI> -<LI>MCE Remote Receiver: Fixed another XP and Vista suspend/resume bug. When will it all end? ;)</LI> -<LI>Input plugins: Modified some method signatures.</LI> -<LI>TV3 Blaster Plugin: Fixed a fatal error.</LI> -<LI>General: Anywhere that previously took user input for a command and could include escape codes can now also include Environment Variables (including clipboard contents, date, time, and others). See documentation for more info.</LI> -<LI>IR Blast: Now defaults to "localhost" if no host is specified on the command line (this will make it simpler to use on most setups).</LI> -<LI>MP Control plugin: Multi-Mapping command can now jump to a specific mapping set (or "Toggle").</LI> -<LI>MediaPortal plugins: New macro commands (Send MP Action and Send MP Message).</LI> -<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>New Input 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>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>USB-UIRT: Fixed a bug that caused the receive callback to get garbage collected, crashing the Input Service.</LI> -<LI>FusionREMOTE: Can now tell the difference between different DViCo remotes (You will need to re-teach the button keycodes).</LI> -<LI>General: Receiving device name is now sent along with remote button codes, this is in preparation for a major overhaul of the remote mapping system to facilitate automatic configuration for controlling your whole PC! This feature will not be completed until 1.0.4.3 or 1.0.5.0 but it will be very big if it comes together as planned.</LI> -<LI>New Prorgam: Added Keyboard Input Relay, to enable mapping special (App Command) keyboard buttons (like Forward, Back, Play, Stop, Volume, etc...) as well as basic key combinations as if they are remote button presses.</LI> -<LI>New Input Plugin: Direct Input. This allows the user to map game controllers (gamepads, joysticks, etc...) as remotes. First version is basic, next version will allow button combos and controlling the mouse with analog sticks.</LI> -<LI>General: Implemented first draft of Abstract Remote Model. This will be expanded on in Version 1.4.3 to provide a superior automatic configuration method for all Applications and Plugins.</LI> -<LI>MCE Transceiver: No longer sends those remote buttons that are being automatically handled, if automatic handling is disabled it will send the full set. This will prevent double presses from occurring. Note that this only effects the buttons that are automatically handled, the other buttons will continue to be sent regardless.</LI> -<LI>New Input Plugin: Added Experimental Mac Mini receiver support.</LI> -<LI>New Input Plugin: Added Experimental Leadtek CoolCommand receiver support.</LI> -<LI>New Input Plugin: Added Technotrend Receiver support. Thanks to AlexPlas, KayDiefenthal, and kvaes.</LI> -<LI>WM Message Plugin: Will always show up as being detected, so by default users can simulate button presses with Windows Messages.</LI> -<LI>Dbox Tuner: Added a Command Line Dbox Tuner application to the installer.</LI> -<LI>Hcw Pvr Tuner: Added a Command Line HCW PVR Tuner application to the installer.</LI> -<LI>Girder Plugin: Fixed the girder plugin to work as an IR receiver. Still haven't completed the blaster/command functions yet.</LI> -<LI>Installer: Fixed a registry setting so that Input Service should autoconfigure correctly from now on.</LI> -<LI>Direct Input Plugin: Fixed a detection and configuration bug.</LI> -<LI>Translator: Fixed a critical bug.</LI> -<LI>Translator: Added process priority adjustment (under the new Advanced configuration menu item).</LI> -<LI>WinLirc Plugin: Changed suspend/resume behaviour to fix a bug with repeated buttons after resume from standby.</LI> -<LI>MCE Remote Receiver: Fixed an SMK brand receiver issue that was preventing some from receiving remote buttons.</LI> -<LI>Translator: Fixed broken misc command types on the button mapping form.</LI> -<LI>Translator: Added option to hide the tray icon in Advanced configuration. To reveal the icon just run the Translator application again.</LI> -<LI>Input Service Configuration: Added Start and Stop buttons to the toolbar.</LI> -<LI>Girder Plugin: Fixed a few bugs.</LI> -<LI>Installer: More installer improvements thanks to Chef_Koch.</LI> -<LI>Installer: Added a required file for Technotrend remote.</LI> -<LI>Abstract Remote Model: Corrected a bug in the Abstract Remote Map for MP Control Plugin.</LI> -<LI>Run Command: Fixed a Force Focus bug.</LI> -<LI>Misc: Updated SourceGrid component to version 4.11</LI> -<LI>New Input Plugin: Added experimental Imon support (thanks to Cybrmage for helping).</LI> -<LI>Version Numbering: Changed version numbering scheme to use last digit as SVN version number. With zero for release builds. Now Version 1.0.4.2 becomes 1.4.2</LI> -<LI>Input Service: Fixed some small plugin loading issues.</LI> -<LI>Imon input plugin: Improved Imon plugin, now supports MCE and Imon PAD remote hardware.</LI> -<LI>Tray Launcher: Now uses the Common program launching code (includes new focus forcing code).</LI> -<LI>Translator: Fixed a bug with the tray icon not re-appearing correctly after being hidden.</LI> -<LI>Installer: Fixed an x64 bug.</LI> -<LI>Translator: Fixed an x64 bug.</LI> -<LI>Input Service: Now enables "Interact with desktop" setting for service, this should get MCE Replacement Driver users the ability to use the Remote Keyboard properly.</LI> -<LI>New Input Plugin: Pinnacle Serial Receiver is now supported.</LI> -<LI>MP Control Plugin: Fixed remote mapping bug (in plugin configuration).</LI> -<LI>iMon Plugin: Better support for iMon PAD remote when using Abstract Remote Model (thanks to chemelli).</LI> -<LI>Lirc/WinLirc Plugin: Improved support for Lirc/WinLirc (thanks to zaphman). All WinLirc users please test.</LI> -<LI>IR Blast: Corrected documentation and command line help.</LI> -<LI>Translator: Changed "-channel" command line parameter to have four parameters (Channel, Padding, Port, Delay).</LI> -<LI>IR Blast: Now has a default delay between blasts of 250 milliseconds, this can be customized by the command line parameter "-delay x", where x is a delay in milliseconds (0 for no delay).</LI> -</UL></P> -<BR> - -<!-- -<P>Known Issues (1.4.2): -<UL> -<LI>Standby and Resume with some MCE remote setups is crashing the Input Service.</LI> -</UL></P> -<BR> ---> - -<P>Version 1.0.4.1 -<UL> -<LI>Minor bug fixes.</LI> -<LI>Made MCE Remote XP/Replacement driver support more forgiving of malformed/unusual data from device.</LI> -<LI>Raised thread priorities from Below Normal to Normal (Hopefully to improve responsiveness, if there are any ill side effects I'll revert this change) and made all threads "Background" (to prevent them from living on after the thread spawner has closed).</LI> -<LI>Made error logging more uniform (makes code comparisons between similar libraries easier too, this should make it less likely that a change in, for example, TV2 Blaster plugin would not get made in TV3 Blaster plugin).</LI> -<LI>Moved Input Server Plugins from "\IR Server Suite\IR Server" to "\IR Server Suite\Input Service" to bring them in-line with the move from IR Server to Input Service. Existing users will need to move their configuration files (*.xml) across or reconfigure their transceiver.</LI> -<LI>Changed timestamps in log files to same format as MediaPortal's in preperation for new log file analysing tool I'm writing.</LI> -<LI>Added support for the Ads Tech PTV-335's IR Receiver. You must copy the ADS_335_RCPLIB.dll from (usually) "\Program Files\Ulead Systems\Ulead InstaMedia 2.1" to the IR Server Plugins folder in your IR Server Suite install location.</LI> -<LI>Fixed Vista MCE Suspend/Resume handling.</LI> -</UL></P> -<BR> - -<P>Version 1.0.4.0 -<UL> -<LI>Replaced "IR Server" application with "Input Service".</LI> -</UL></P> -<BR> - -<P>Version 1.0.3.5 -<UL> -<LI>Fixed a bug in the macro and IR command renaming.</LI> -<LI>Modified IR learn method for MCE device. This should improve blasting for some people.</LI> -<LI>Fixed repeating IR decoding in JVC, RC5, RC6 and NEC protocols on MCE device.</LI> -<LI>Fixed Sony SIRC IR decoding on MCE device, now works for 8, 12, 15 and 20 bit protocol variations (instead of just 15-bit).</LI> -<LI>Added Daewoo, Matsushita, Mitsubishi, Nokia NRC17, Panasonic, and Toshiba protocol decoding on MCE device.</LI> -<LI>Made IR and Macro file renaming more intelligent.</LI> -<LI>Made more macro commands available in Translator and the Plugins (Mouse commands, CD Eject, TCP Messages).</LI> -<LI>Modified IR Blasting to set Carrier Frequency more accurately.</LI> -<LI>Added command line options to Translator to let you blast IR Commands and execute macros.</LI> -<LI>Reworked the Translator program list interface slightly.</LI> -<LI>Reworked and reintroduced IgorPlug device plugin.</LI> -<LI>Looks like 64-bit support wasn't working, so I've had another try.</LI> -<LI>Added a Translator OSD that can task swap, run macros and some other useful things.</LI> -<LI>Added some new macro commands (HTTP requests, beep sound, wave file playback).</LI> -<LI>Commands (including macros) now execute on separate threads. In the past calling a macro for example would block the caller until it finished, now the caller can continue while the macro executes independantly. Note that this will cause a subtle change in flow control, but shouldn't effect anyone.</LI> -<LI>Added support for Girder 3.x plugins, still experimental at this stage. Expect to see improvements in this area, like multiple Girder plugins active at the same time.</LI> -<LI>Virtual Remote now has a companion application called Web Remote, with a built in web server for simulating a remote control over the web.</LI> -<LI>Added support for the RedEye blaster device.</LI> -<LI>Added support for the Nintendo Wii Remote (no classic controller or accelerometer support yet).</LI> -<LI>Improved suspend/resume handling ... again ... hopefully this works!</LI> -<LI>Re-synchronized InputHandler with MediaPortal.</LI> -<LI>Jens has helped me get 64-bit MCE remote support working properly, finally! :)</LI> -<LI>Added a swag of new STB presets.</LI> -<LI>Added RC6 Foxtel variation support for MCE Remote protocol decoding.</LI> -<LI>Simplified Macro file format. Old macro's must be converted or rebuilt. This change will speed up the introduction of new features.</LI> -</UL></P> -<BR> - -<P>Version 1.0.3.4 -<UL> -<LI>No longer uses Named Pipes IPC, now uses TCP for communications between server and clients. This should solve a lot of problems.</LI> -<LI>The Vista eHome MCE device driver (default driver) is now supported!</LI> -<LI>Automatic OS, driver and blaster manufacturer detection. Supporting XP & Vista with eHome or Replacement driver.</LI> -<LI>Documentation now includes information on how to make eHome driver act like Replacement Driver. Replacement Driver is obsolete.</LI> -<LI>No longer includes MCE Replacement Driver files in package, but does still support using the driver.</LI> -<LI>MCE Transceiver plugin now stores IR Commands in Philips Pronto format, but still supports old files.</LI> -<LI>Re-learning IR codes is highly recommended to improve IR blasting accuracy.</LI> -<LI>More improvements to MCE device interface.</LI> -<LI>Improved support for suspend/resume, should positively effect all devices but especially with MCE device.</LI> -<LI>Fixed several bugs in USB-UIRT support, including learning IR Commands.</LI> -<LI>WinLirc IR Server plugin configuration now can create IR Command files for blasting.</LI> -<LI>Now IR Server only restarts it's Comms if you change settings.</LI> -<LI>Fixed program launching bug in Translator.</LI> -<LI>Moved to typed messages, this will not effect the end user.</LI> -<LI>Refactored some more dialog boxes into a common code library.</LI> -<LI>Added a use for all option for the blaster port selection when importing a quick-setup option in the TV2 & TV3 blaster plugins.</LI> -<LI>Fixed an IR testing bug in the TV2 & TV3 blaster plugins.</LI> -<LI>You can now select multiple IR Server Receiver plugins at the same time.</LI> -<LI>Fixed a startup bug in Tray Launcher that was related to the new tcp comms system.</LI> -<LI>Fix a bug in IRMan support that was stopping IR Server form starting if the device wasn't pluged in / responding / configured correctly.</LI> -<LI>Removed local machine name from server host lists. Added localhost instead, which should be more robust.</LI> -<LI>Added experimental Serial IR Blaster support.</LI> -<LI>Attempted to fix Tray Launcher focus issue.</LI> -<LI>Added several new Set Top Box Quick-Setup options.</LI> -<LI>Added Automatic Detection of IR Devices.</LI> -<LI>Fixed a bug in setting up Windows Message commands in Translator.</LI> -<LI>Added the ability to nest macros. Looping macros will fail at runtime producing an error log entry, so you should always test your macros.</LI> -<LI>Can now rename IR Commands and Macros by clicking on them in their lists. Just like renaming a file in Windows Explorer.</LI> -</UL></P> -<BR> - -<P>Version 1.0.3.3 -<UL> -<LI>New Microsoft MCE Transceiver plugin for IR Server. -<UL> -<LI>Now supports Microsoft MCE Remote Keyboard (with mouse), for both the eHome (XP) and Replacement driver (XP & Vista).</LI> -<LI>Supports additional IR Protocols for remote button presses.</LI> -<LI>Improved IR Blasting and IR <B>Learning</B>.</LI> -<LI>Uses correct IR Carrier Frequency for Pronto IR Codes, but fixes to 38khz for learned IR codes <I>for now</I>.</LI> -<LI>This is still a work in progress ...</LI> -</UL></LI> -<LI>Removed "MCE Replacement" IR Server plugin, the replacement (and eHome) driver is now supported by "Microsoft MCE" IR Server plugin.</LI> -<LI>Removed Blaster Speed settings, which was only there to support MCE blasting without a known IR carrier frequency.</LI> -<LI>Added a "Wait for response" option to Serial Commands.</LI> -<LI>Now targeted specifically for x86 32-bit platform. Which should force it to run in emulated 32-bit on 64-bit platforms.</LI> -<LI>IR Blast now appends log entries, instead of starting a new log every run (logs are restarted after 1 week).</LI> -<LI>Unhandled exceptions are now logged.</LI> -<LI>Fixed a major bug in the TV2 and TV3 Blaster plugins.</LI> -</UL></P> -<BR> - -<P>Version 1.0.3.2 -<UL> -<LI>Translator can now control the mouse.</LI> -<LI>Added configurable learn IR timeout for MCE and USBUIRT reciever types.</LI> -<LI>New command line application "IR Blast" for interfacing with other software.</LI> -<LI>Virtual Remote now accepts command line parameters for simulating button presses.</LI> -<LI>Each installation now has one location for Set Top Box setups and one location for IR codes.</LI> -<LI>Standardized GUI components and broke out common forms and code into a common library.</LI> -<LI>Improved comms down situation with Apps and Plugins.</LI> -<LI>Reduced CPU load of applications and plugins.</LI> -<LI>Enabled selecting a separate receiver and transmitter of IR codes.</LI> -<LI>Completed first draft of documentation.</LI> -<LI>Fixed bug in MP Control Plugin mapping blast commands to remote buttons.</LI> -</UL></P> -<BR> - -<P>Version 1.0.3.1 -<UL> -<LI>Microsoft MCE IR Server Plugin now stops Microsoft Windows MCE ehRecvr service before starting.</LI> -<LI>Fixed a major bug in the IR command learning in each of the MediaPortal plugins.</LI> -</UL></P> -<BR> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/pronto.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/pronto.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/pronto.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,32 +0,0 @@ -<HTML> -<HEAD><TITLE>Using Philips Pronto CCF files</TITLE></HEAD> -<BODY> - -<H2>Using Philips Pronto CCF files<BR><HR COLOR="RED"></H2> -<P>If you have or find IR codes for your equipment in Philips Pronto CCF format then you can extract those codes and use them with most of the IR blaster types supported by the IR Server.</P> - -<P>Pronto IR codes can be cut and pasted into notepad (or any text editor) and then used with the plugin. Just put the "0000 006D 0022 ..." style code into a text file, save it with a ".IR" extension in the "Application Data\IR Server Suite\IR Commands\" folder and the code will be instantly available for use.</P> - -<P>The following Pronto IR code types are supported for blasting:<BR> -<UL> -<LI>0000 - Raw Oscillated</LI> -<LI>0100 - Raw Unmodulated</LI> -<LI>5000 - RC5</LI> -<LI>5001 - RC5X</LI> -<LI>6000 - RC6</LI> -<LI>6001 - RC6A</LI> -</UL> -</P> - -<P>To extract codes from a ".CCF" file I recommend you download CCF Extractor from <A HREF="http://www.byremote.com.au/">www.ByRemote.com.au</A> here:<BR> -<A HREF="http://www.byremote.com.au/downloads/download.asp?SID=25">http://www.byremote.com.au/downloads/download.asp?SID=25</A></P> - -<P>Use CCF Extractor and put the codes it finds into text files with the same process outlined above.</P> - -<P>To get CCF files for your equipment try Remote Central. They have an enormous library of IR codes in Pronto CCF format. Try:<BR> -<A HREF="http://www.remotecentral.com/cgi-bin/files/rcfiles.cgi?area=pronto&db=devices&br=&fc=">http://www.remotecentral.com/cgi-bin/files/rcfiles.cgi?area=pronto&db=devices&br=&fc=</A><BR> -and<BR> -<A HREF="http://www.remotecentral.com/cgi-bin/mboard/rc-discrete/list.cgi">http://www.remotecentral.com/cgi-bin/mboard/rc-discrete/list.cgi</A></P> - -</BODY> -</HTML> Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Documentation/troubleshooting.html =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Documentation/troubleshooting.html 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/troubleshooting.html 2009-07-11 02:04:42 UTC (rev 3002) @@ -1,129 +0,0 @@ -<HTML> -<HEAD><TITLE>Troubleshooting</TITLE></HEAD> -<BODY> - -<H2>Troubleshooting<BR><HR COLOR="RED"></H2> - -<H3>Contents</H3> -<!-- -<UL> -<B>Input Service</B> -<LI><A HREF="#1.1">Can't do this</A></LI> -<LI><A HREF="#1.2">Can't do this</A></LI> -</UL> ---> - -<UL> -<B>Translator</B> -<LI><A HREF="#2.1">Stop system-wide mappings from effecting a program</A></LI> -</UL> - - -<UL> -<B>Microsoft MCE Remote</B> -<LI><A HREF="#3.1">IR Learning</A></LI> -<LI><A HREF="#3.2">IR Blasting</A></LI> -<LI><A HREF="#3.3">Suspend and Resume</A></LI> -<LI><A HREF="#3.4">Remote buttons execute twice</A></LI> -</UL> - - -<UL> -<B>Miscellaneous</B> -<LI><A HREF="#4.1">How to get additional help or send a bug report</A></LI> -</UL> - - -<!-- - -<BR> -<HR COLOR="BLUE" SIZE="1"> - -<H3>Input Service</H3> - -<P><B><A NAME="1.1">Input Service crashes unexpectedly</A></B><BR> -blah blah blah, blah blah blah</P> - -<P><B><A NAME="1.2">Can't do this</A></B><BR> -blah blah blah, blah blah blah</P> ---> - -<BR> -<HR COLOR="BLUE" SIZE="1"> - -<H3>Translator</H3> - -<P><B><A NAME="2.1">Stop system-wide mappings from effecting a program</A></B><BR> -System-wide mappings in Translator will, as the name suggests, effect the entire system. However, this is not always convenient.<BR> -To disable the system-wide mappings for a particular program all you need to do is create (or edit) a program item and check the box labeled "Ignore System-Wide mappings".</P> - -<BR> -<HR COLOR="BLUE" SIZE="1"> - -<H3>Microsoft MCE Remote</H3> - -<P><B><A NAME="3.1">IR Learning</A></B><BR> -There are a number of problems that can occur when trying to learn IR commands.<BR> -<OL> - -<LI><B>Interference</B>: You should try to avoid possible sources of InfraRed interference by avoiding: -<UL> -<LI>Direct sunlight</LI> -<LI>Plasma televisions (when on)</LI> -<LI>PDA, Laptop or PC IRDA ports</LI> -<LI>Fluorescent lights (including modern energy-saver lights)</LI> -</UL> -</LI> - -<LI><B>Unsupported IR protocol</B>: Some devices use IR carrier frequencies greater than the limits of the device. For example, some air-conditioners use a carrrier frequency that cannot be detected. If the remote is recognised in the Debug Client (if it lists the remote button presses) then you should be able to "Learn" that command in which case you should refer to the first item in this list.</LI> - -<LI><B>Toggle bit</B>: Some remote control protocols use what is called a "toggle bit" to effectively distinguish between individual button presses and/or held-down buttons. The data being sent by the button press remains the same, but the toggle bit will change depending on the protocol. Because some devices expect to see the toggle bit change from one press to another they will not react to repeated IR blasting, in this case you may need to source a discrete code from somewhere like <A HREF="http://www.remotecentral.com/">Remote Central</A> or relearn the command and use two copies that you alternate or send one after the other in a macro.</LI> - -</OL> -</P> - -<P><B><A NAME="3.2">IR Blasting</A></B><BR> -There are a number of problems that can occur when trying to blast IR commands to control other equipment. Here's a checklist you should run through to try to correct any problems.<BR> -<OL> -<LI>Ensure that the blaster bug is placed directly in front of the receiver panel on the device you are trying to control. A misaligned blaster is a very common problem.</LI> -<LI>Try running Debug Client and placing the blaster directly in front of the MCE receiver, when you blast the command you should see Debug Client receive the button press. This will only work if the button code is of a recognized format, but it will prove the blaster is functioning correctly. In which case you should refer again to the first item in this list. If the button code is not received then you should attempt to re-learn the command and try again.</LI> -<LI>If possible you should try to locate discrete codes for your device on <A HREF="http://www.remotecentral.com/">Remote Central</A> or using by searching for Pronto / CCF codes for your device using your favourite internet search engine.</LI> -<LI></LI> - -</OL></P> - -<P><B><A NAME="3.3">Suspend and Resume</A></B><BR> -For troubleshooting suspend and resume issues you should firstly make sure that you are running the <A HREF="http://www.microsoft.com/downloads/details.aspx?FamilyId=B39D53F1-0AC9-433B-B488-4CAB82F31DC8&displaylang=en">latest Microsoft drivers</A>.<BR> -And then if your problems persist try the <A HREF="http://www.xs4all.nl/~hveijk/mst/indexe.htm">MCE Standby Tool</A>.</P> - -<P><B><A NAME="3.4">Remote buttons execute twice</A></B><BR> -By default the Microsoft MCE Remote drivers will automatically handle several buttons on the MCE remote and send key presses to the active program when those buttons are pressed. This can cause "double-presses" of those buttons if the program is also reacting to the buttons. For example, when running MP Control Plugin you may experience double-presses of the arrow keys, this is most likely caused by the MP Control Plugin acting on the button and duplicating the default response.<BR> -<BR> -It is quite simple to get around this problem and there are a number of ways you can do this.<BR> -<OL> -<LI>By removing the mappings for the repeated buttons and just relying on the drivers automatic handling. For example, in MP Control plugin you can either manually remove the mappings for the effected buttons, or you can change the remote preset to "Microsoft MCE (basic)".</LI> -<LI>By preventing the driver from automatically handling those button presses. This makes the driver effectively behave like the old Replacement Driver, but with none of the disadvantages of that approach. There are <A HREF="ehome_driver.html">detailed instructions here</A>.</LI> -<LI>By switching to the Replacement Driver (I do not recommend this because the Replacement driver does not handle IR Carrier frequencies and is not as versatile or accurate as the default driver).</LI> -</OL> -</P> - -<BR> -<HR COLOR="BLUE" SIZE="1"> - -<H3>Miscellaneous</H3> - -<P><B><A NAME="4.1">How to get additional help or send a bug report</A></B><BR> -If you have tried all the available solutions and still can't get around a problem you've encountered then you may have found a bug in the software. If you feel you have found a bug or would just like some additional assistance then go to the MediaPortal forums and post a new message in the <A HREF="http://forum.team-mediaportal.com/forumdisplay.php?f=165">MCE Replacement Plugin Sub-Forum</A>.</P> - -<P>Please include in your post a full description of the problem you're having along with the steps you follow to produce the problem and the following:<BR> -<UL> -<LI>Operating System including Service Pack details</LI> -<LI>IR Server Suite version number/date</LI> -<LI>All IR Server Suite and MediaPortal log files (where applicable)</LI> -<LI>Input Service Receiver/Transmitter device details (For example, "Microsoft MCE Transceiver OEM with European/Australian RC6 MCE Remote")</LI> -</UL> -<BR> -Please also include any other relevant software version numbers or information that you feel will help locate the problem.</P> - -</BODY> -</HTML> Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-10 22:46:28 UTC (rev 3001) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-11 02:04:42 UTC (rev 3002) @@ -314,7 +314,7 @@ ; Create app data directories SetOutPath "$DIR_INSTALL" - File "..\IR Server Suite\Documentation\${PRODUCT_NAME}.chm" + ;File "..\IR Server Suite\Documentation\${PRODUCT_NAME}.chm" CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" @@ -1031,15 +1031,9 @@ ; Use the all users context SetShellVarContext all - ; Create website link file - WriteIniStr "$DIR_INSTALL\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - - ; Create start menu shortcuts -!if ${VER_BUILD} == 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.chm" -!endif - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.url" + WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.url" "InternetShortcut" "URL" "http://www.team-mediaportal.com/manual/IRServerSuite" + WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Website.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Log Files.lnk" "$APPDATA\${PRODUCT_NAME}\Logs" CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" "" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2009-07-14 10:58:24
|
Revision: 3010 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3010&view=rev Author: belcom Date: 2009-07-14 10:58:03 +0000 (Tue, 14 Jul 2009) Log Message: ----------- - renamed "input service" to "IR Server". - modified "IR Server" to be startable as service or application. - renamed "input service configuration" to "IR Server Configuration". - modified "IR Server Configuration" so it can install/uninstall service, start/stop service or application, show status in notification area. - introduced new icon for IRSS. - changed every "input service" to "IR Server" (paths, log entries, ...). - modified installer to new paths/behavior, "IR Server Configuration" will autostart at user logon. - old "Applications\IR Server\" is still there, can be deleted once new one is tested enough. Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLinkNative.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputListener.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Config.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 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/IrRemoteWrapper.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IConfigure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IKeyboardReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ILearnIR.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IMouseReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ITransmitIR.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/CSocketPacket.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/MceDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/RemoteDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/FileIO.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Keyboard.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/PluginBaseInterfaces.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/RawInput.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/TestApplication.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/IraTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DeviceIoOverlapped.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/NotifyWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/RemoteDetectionData.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/SpeechReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Setup.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Setup.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/CreateIRFile.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/CreateIRFile.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/SocketInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircCommand.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircServer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj 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/XBCDRC Receiver/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/ServerAddress.cs trunk/plugins/IR Server Suite/setup/languages/English.nsh trunk/plugins/IR Server Suite/setup/pages/ServerServiceMode.nsh trunk/plugins/IR Server Suite/setup/setup.nsi trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Debug.bat trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Release.bat trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Debug.bat trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Release.bat trunk/plugins/IR Server Suite/IR Server Suite/IR Server/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Direct Input/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Direct Input/Direct Input.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FireFly/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FireFly/FireFly.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FusionREMOTE/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FusionREMOTE/FusionHDTV.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FusionREMOTE/FusionREMOTE.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Hauppauge/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Hauppauge/Hauppauge34.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Hauppauge/Hauppauge45.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IR507/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IR507/RC102.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IgorPlug/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IgorPlug/Microsoft MCE.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Medion/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Medion/Medion.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Microsoft MCE/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Microsoft MCE/Bush LSD33 C.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Microsoft MCE/Microsoft MCE.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Pinnacle Serial/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Pinnacle Serial/Pinnacle 41 Button.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Technotrend/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Technotrend/Technotrend.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/USB-UIRT/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/USB-UIRT/Microsoft MCE.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Wii Remote/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Wii Remote/WiiRemote.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Windows Messages/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Windows Messages/Virtual Remote.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/XBCDRC/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/XBCDRC/Xbox.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon Front Panel.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon PAD.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon Volume Knob.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Microsoft MCE.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server Installer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Install.cmd trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/Resources.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/ReceiverWindow.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/RemoteTable.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/RemoteTable.xsc trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/RemoteTable.xsd trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/RemoteTable.xss trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Resources/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Resources/iconGreen.ico trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Uninstall.cmd trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Advanced.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Advanced.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Advanced.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Exclusions.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Exclusions.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Exclusions.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Advanced.png trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Detect.png trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Help.png trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Start.png trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Stop.png trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources/iconGray.ico trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources/iconGreen.ico trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/DevAge.Core.dll trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/DevAge.Core.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/DevAge.Windows.Forms.dll trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/DevAge.Windows.Forms.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/SourceGrid.License.txt trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/SourceGrid.dll trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/SourceGrid.xml trunk/plugins/IR Server Suite/setup/Icons/ trunk/plugins/IR Server Suite/setup/Icons/iconGreen.ico Removed Paths: ------------- trunk/plugins/IR Server Suite/Build/BUILD_InputService_Debug.bat trunk/plugins/IR Server Suite/Build/BUILD_InputService_Release.bat trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Debug.bat trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Release.bat trunk/plugins/IR Server Suite/IR Server Suite/Input Service/ Added: trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Debug.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Debug.bat (rev 0) +++ trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Debug.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -0,0 +1,3 @@ +@ECHO OFF + +call BuildScript.bat Debug Added: trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Release.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Release.bat (rev 0) +++ trunk/plugins/IR Server Suite/Build/BUILD_IRServer_Release.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -0,0 +1,3 @@ +@ECHO OFF + +call BuildScript.bat Added: trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Debug.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Debug.bat (rev 0) +++ trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Debug.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -0,0 +1,3 @@ +@ECHO OFF + +call BuildScript.bat Debug MPplugins Added: trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Release.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Release.bat (rev 0) +++ trunk/plugins/IR Server Suite/Build/BUILD_IRServer_WithMPplugins_Release.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -0,0 +1,3 @@ +@ECHO OFF + +call BuildScript.bat Release MPplugins Deleted: trunk/plugins/IR Server Suite/Build/BUILD_InputService_Debug.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_InputService_Debug.bat 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/Build/BUILD_InputService_Debug.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -1,3 +0,0 @@ -@ECHO OFF - -call BuildScript.bat Debug \ No newline at end of file Deleted: trunk/plugins/IR Server Suite/Build/BUILD_InputService_Release.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_InputService_Release.bat 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/Build/BUILD_InputService_Release.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -1,3 +0,0 @@ -@ECHO OFF - -call BuildScript.bat \ No newline at end of file Deleted: trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Debug.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Debug.bat 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Debug.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -1,3 +0,0 @@ -@ECHO OFF - -call BuildScript.bat Debug MPplugins \ No newline at end of file Deleted: trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Release.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Release.bat 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/Build/BUILD_InputService_WithMPplugins_Release.bat 2009-07-14 10:58:03 UTC (rev 3010) @@ -1,3 +0,0 @@ -@ECHO OFF - -call BuildScript.bat Release MPplugins \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -116,10 +116,10 @@ };*/ private static readonly string AbstractRemoteMapFolder = Path.Combine(Common.FolderAppData, - "Input Service\\Abstract Remote Maps"); + "IR Server\\Abstract Remote Maps"); private static readonly string AbstractRemoteSchemaFile = Path.Combine(Common.FolderAppData, - "Input Service\\Abstract Remote Maps\\RemoteTable.xsd"); + "IR Server\\Abstract Remote Maps\\RemoteTable.xsd"); #endregion Constants Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -327,20 +327,20 @@ case MessageType.RegisterClient: if ((received.Flags & MessageFlags.Success) == MessageFlags.Success) { - Info("Registered to Input Service"); + Info("Registered to IR Server"); _registered = true; //_irServerInfo = TransceiverInfo.FromString(received.Data); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - Warn("Input Service refused to register"); + Warn("IR Server refused to register"); } break; case MessageType.ServerShutdown: _registered = false; - Warn("Input Service Shutdown - Blasting disabled until Input Service returns"); + Warn("IR Server Shutdown - Blasting disabled until IR Server returns"); break; case MessageType.Error: Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -287,20 +287,20 @@ case MessageType.RegisterClient: if ((received.Flags & MessageFlags.Success) == MessageFlags.Success) { - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); _registered = true; //_irServerInfo = TransceiverInfo.FromString(received.Data); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; case MessageType.ServerShutdown: _registered = false; - IrssLog.Warn("Input Service Shutdown - Blasting disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Blasting disabled until IR Server returns"); break; case MessageType.Error: Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -725,7 +725,7 @@ private void buttonBlast_Click(object sender, EventArgs e) { if (!_registered) - MessageBox.Show(this, "Not registered to an active Input Service", "Cannot blast", MessageBoxButtons.OK, + MessageBox.Show(this, "Not registered to an active IR Server", "Cannot blast", MessageBoxButtons.OK, MessageBoxIcon.Warning); Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Blasting ..."}); @@ -747,7 +747,7 @@ private void buttonLearn_Click(object sender, EventArgs e) { if (!_registered) - MessageBox.Show(this, "Not registered to an active Input Service", "Cannot learn", MessageBoxButtons.OK, + MessageBox.Show(this, "Not registered to an active IR Server", "Cannot learn", MessageBoxButtons.OK, MessageBoxIcon.Warning); Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Learning ..."}); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -24,7 +24,7 @@ using System.Collections.Generic; using System.IO; using System.Windows.Forms; -using InputService.Plugin; +using IRServer.Plugin; using IrssUtils; using SourceGrid; using SourceGrid.Cells; @@ -473,7 +473,7 @@ try { string file = Path.Combine(SystemRegistry.GetInstallFolder(), "IR Server Suite.chm"); - Help.ShowHelp(this, file, HelpNavigator.Topic, "Input Service\\index.html"); + Help.ShowHelp(this, file, HelpNavigator.Topic, "IR Server\\index.html"); } catch (Exception ex) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Exclusions.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -72,7 +72,7 @@ { treeViewExclusions.Nodes.Clear(); - string AbstractRemoteMapFolder = Path.Combine(Common.FolderAppData, "Input Service\\Abstract Remote Maps"); + string AbstractRemoteMapFolder = Path.Combine(Common.FolderAppData, "IR Server\\Abstract Remote Maps"); string[] folders = Directory.GetDirectories(AbstractRemoteMapFolder, "*", SearchOption.TopDirectoryOnly); foreach (string folder in folders) Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -31,7 +31,7 @@ using System.Threading; using System.Windows.Forms; using System.Xml; -using InputService.Plugin; +using IRServer.Plugin; using IRServer.Properties; using IrssComms; using IrssUtils; @@ -71,10 +71,10 @@ #region Constants private static readonly string AbstractRemoteMapFolder = Path.Combine(Common.FolderAppData, - "Input Service\\Abstract Remote Maps"); + "IR Server\\Abstract Remote Maps"); private static readonly string AbstractRemoteSchemaFile = Path.Combine(Common.FolderAppData, - "Input Service\\Abstract Remote Maps\\RemoteTable.xsd"); + "IR Server\\Abstract Remote Maps\\RemoteTable.xsd"); private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, "IR Server\\IR Server.xml"); @@ -302,7 +302,7 @@ } catch (Exception ex) { - IrssLog.Error("Failed to start Input Service Communications"); + IrssLog.Error("Failed to start IR Server Communications"); IrssLog.Error(ex); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -27,7 +27,7 @@ using System.Reflection; using System.Threading; using System.Windows.Forms; -using InputService.Plugin; +using IRServer.Plugin; using IrssUtils; namespace IRServer Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest 2009-07-14 10:58:03 UTC (rev 3010) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > <assemblyIdentity name="KeyboardInputRelay" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" /> - <description>Relays keyboard input to the input service to use like remote button presses</description> + <description>Relays keyboard input to the IR Server to use like remote button presses</description> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> <security> <requestedPrivileges> Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -272,17 +272,17 @@ //_irServerInfo = IRServerInfo.FromBytes(received.DataAsBytes); _registered = true; - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; case MessageType.ServerShutdown: - IrssLog.Warn("Input Service Shutdown - Keyboard Input Relay disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Keyboard Input Relay disabled until IR Server returns"); _notifyIcon.Text = "Keyboard Input Relay - Connecting ..."; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -30,7 +30,7 @@ // associated with an assembly. [assembly: AssemblyTitle("Keyboard Input Relay")] -[assembly: AssemblyDescription("Relays keyboard input to the input service to use like remote button presses")] +[assembly: AssemblyDescription("Relays keyboard input to the IR Server to use like remote button presses")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("and-81")] [assembly: AssemblyProduct("Keyboard Input Relay")] Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -577,7 +577,7 @@ if (!_registered) { - IrssLog.Warn("Not registered to an active Input Service"); + IrssLog.Warn("Not registered to an active IR Server"); return false; } @@ -612,7 +612,7 @@ IrssLog.Debug("BlastIR(): {0}, {1}", fileName, port); if (!_registered) - throw new ApplicationException("Cannot Blast, not registered to an active Input Service"); + throw new ApplicationException("Cannot Blast, not registered to an active IR Server"); using (FileStream file = File.OpenRead(fileName)) { @@ -907,12 +907,12 @@ _irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes()); _registered = true; - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; @@ -960,7 +960,7 @@ break; case MessageType.ServerShutdown: - IrssLog.Warn("Input Service Shutdown - Media Center Blaster disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Media Center Blaster disabled until IR Server returns"); _registered = false; break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -812,12 +812,12 @@ _irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes()); _registered = true; - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; @@ -844,7 +844,7 @@ break; case MessageType.ServerShutdown: - IrssLog.Warn("Input Service Shutdown - Translator disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Translator disabled until IR Server returns"); _registered = false; _notifyIcon.Icon = Resources.Icon16Connecting; @@ -1072,7 +1072,7 @@ if (!_registered) { - IrssLog.Warn("Not registered to an active Input Service"); + IrssLog.Warn("Not registered to an active IR Server"); return false; } @@ -1105,7 +1105,7 @@ internal static void BlastIR(string fileName, string port) { if (!_registered) - throw new InvalidOperationException("Cannot Blast, not registered to an active Input Service"); + throw new InvalidOperationException("Cannot Blast, not registered to an active IR Server"); using (FileStream file = File.OpenRead(fileName)) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -32,7 +32,7 @@ // [assembly: AssemblyTitle("Translator")] -[assembly: AssemblyDescription("PC control application for use with Input Service")] +[assembly: AssemblyDescription("PC control application for use with IR Server")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("and-81")] [assembly: AssemblyProduct("Translator")] Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -431,12 +431,12 @@ //_irServerInfo = IRServerInfo.FromBytes(received.DataAsBytes); _registered = true; - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; @@ -451,7 +451,7 @@ break; case MessageType.ServerShutdown: - IrssLog.Warn("Input Service Shutdown - Tray Launcher disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Tray Launcher disabled until IR Server returns"); _registered = false; break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -441,17 +441,17 @@ //_irServerInfo = IRServerInfo.FromBytes(received.DataAsBytes); _registered = true; - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; case MessageType.ServerShutdown: - IrssLog.Warn("Input Service Shutdown - Virtual Remote disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Virtual Remote disabled until IR Server returns"); _registered = false; break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -577,17 +577,17 @@ //_irServerInfo = IRServerInfo.FromBytes(received.DataAsBytes); _registered = true; - IrssLog.Info("Registered to Input Service"); + IrssLog.Info("Registered to IR Server"); } else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure) { _registered = false; - IrssLog.Warn("Input Service refused to register"); + IrssLog.Warn("IR Server refused to register"); } break; case MessageType.ServerShutdown: - IrssLog.Warn("Input Service Shutdown - Web Remote disabled until Input Service returns"); + IrssLog.Warn("IR Server Shutdown - Web Remote disabled until IR Server returns"); _registered = false; break; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-07-14 10:58:03 UTC (rev 3010) @@ -77,7 +77,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent> - </PostBuildEvent> + <PostBuildEvent></PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs 2009-07-13 17:59:29 UTC (rev 3009) +++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs 2009-07-14 10:58:03 UTC (rev 3010) @@ -71,6 +71,12 @@ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "IR Server Suite"); /// <summary> + /// IR Server Suite "Application Data" folder location (includes trailing '\') + /// </summary> + public static readonly string FolderProgramFiles = + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IR Server Suite"); + + /// <summary> /// IR Server Suite "IR Commands" folder location (includes trailing '\') /// </summary> public static readonly string FolderIRCommands = Path.Combine(FolderAppData, "IR Commands"); Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj =============================... [truncated message content] |
From: <be...@us...> - 2009-07-14 20:50:01
|
Revision: 3012 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3012&view=rev Author: belcom Date: 2009-07-14 20:49:39 +0000 (Tue, 14 Jul 2009) Log Message: ----------- - changed ServiceName to "IRServer" - logs go to "IR Server.log" Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/setup/setup.nsi trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-07-14 15:18:33 UTC (rev 3011) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-07-14 20:49:39 UTC (rev 3012) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -161,4 +161,4 @@ <PostBuildEvent> </PostBuildEvent> </PropertyGroup> -</Project> +</Project> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs 2009-07-14 15:18:33 UTC (rev 3011) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs 2009-07-14 20:49:39 UTC (rev 3012) @@ -41,7 +41,8 @@ "The main component of IR Server Suite, the IR Server provides access to your input devices"; public const string ServiceDisplayName = "IR Server"; - public const string ServiceName = "IR Server"; + public const string ServiceName = "IRServer"; + public const string ServerWindowName = "IRSS - " + ServiceName; private static IRServer IRServer; #endregion Constants @@ -57,14 +58,14 @@ try { + IrssLog.Open("IR Server.log"); + if (args.Length == 0) { - IrssLog.Open("IR Server.log"); - IRServer = new IRServer(); if (IRServer.DoStart()) { - ReceiverWindow receiverWindow = new ReceiverWindow("IRSS - IR Server"); + ReceiverWindow receiverWindow = new ReceiverWindow(ServerWindowName); Application.Run(); receiverWindow.DestroyHandle(); receiverWindow = null; @@ -73,8 +74,6 @@ } else { - IrssLog.Open("IR Server - Command Line.log"); - foreach (string parameter in args) { switch (parameter.ToUpperInvariant().Replace("-", "/")) @@ -147,8 +146,6 @@ case "/SERVICE": { - IrssLog.Open("IR Server.log"); - IRServer IRServer = new IRServer(); ServiceBase.Run(IRServer); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-07-14 15:18:33 UTC (rev 3011) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-07-14 20:49:39 UTC (rev 3012) @@ -86,8 +86,9 @@ { #region Constants - internal const string ServerName = "IR Server"; + internal const string ServerName = "IRServer"; internal const string ServerWindowName = "IRSS - " + ServerName; + internal const string ServerDisplayName = "IR Server"; private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server\IR Server.exe"); @@ -147,13 +148,13 @@ _notifyIcon = new NotifyIcon(); _notifyIcon.ContextMenuStrip = new ContextMenuStrip(); - _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripLabel(ServerName)); + _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripLabel(ServerDisplayName)); _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator()); _notifyIcon.ContextMenuStrip.Items.Add("&Setup", null, OpenConfiguration); _notifyIcon.ContextMenuStrip.Items.Add("&Quit", null, ClickQuit); _notifyIcon.DoubleClick += new EventHandler(OpenConfiguration); _notifyIcon.Icon = new System.Drawing.Icon(Resources.iconGray, new System.Drawing.Size(16, 16)); - _notifyIcon.Text = ServerName; + _notifyIcon.Text = ServerDisplayName; _notifyIcon.Visible = true; thread = new Thread(new ThreadStart(UpdateIcon)); Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-14 15:18:33 UTC (rev 3011) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-14 20:49:39 UTC (rev 3012) @@ -337,7 +337,7 @@ ${MementoSection} "IR Server" SectionIRServer ${LOG_TEXT} "INFO" "Installing IR Server..." - ${StopService} "IR Server" + ${StopService} "IRServer" ${KILLPROCESS} "IR Server.exe" ${KILLPROCESS} "IR Server Configuration.exe" @@ -426,7 +426,7 @@ ${MementoSectionEnd} !macro Remove_${SectionIRServer} ${LOG_TEXT} "INFO" "Removing IR Server..." - ${StopService} "IR Server" + ${StopService} "IRServer" ${KILLPROCESS} "IR Server.exe" ${KILLPROCESS} "IR Server Configuration.exe" Modified: trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi 2009-07-14 15:18:33 UTC (rev 3011) +++ trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi 2009-07-14 20:49:39 UTC (rev 3012) @@ -338,7 +338,7 @@ ${MementoSection} "IR Server" SectionIRServer ${LOG_TEXT} "INFO" "Installing IR Server..." - ${StopService} "IR Server" + ${StopService} "IRServer" ${KILLPROCESS} "IR Server.exe" ${KILLPROCESS} "IR Server Configuration.exe" @@ -427,7 +427,7 @@ ${MementoSectionEnd} !macro Remove_${SectionIRServer} ${LOG_TEXT} "INFO" "Removing IR Server..." - ${StopService} "IR Server" + ${StopService} "IRServer" ${KILLPROCESS} "IR Server.exe" ${KILLPROCESS} "IR Server Configuration.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2009-07-15 13:53:33
|
Revision: 3015 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3015&view=rev Author: belcom Date: 2009-07-15 13:53:14 +0000 (Wed, 15 Jul 2009) Log Message: ----------- - changed references to \bin\Release\ - removed directX dll references in installer script Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj trunk/plugins/IR Server Suite/setup/setup.nsi trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -52,6 +52,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -53,13 +53,13 @@ </PropertyGroup> <ItemGroup> <Reference Include="Core, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Debug\Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> <SpecificVersion>False</SpecificVersion> <Private>False</Private> </Reference> <Reference Include="Dialogs, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Debug\Dialogs.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -69,7 +69,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Debug\Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -51,19 +51,19 @@ <ItemGroup> <Reference Include="CommandBase, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Commands\Command\bin\Debug\CommandBase.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Commands\Command\bin\Release\CommandBase.dll</HintPath> </Reference> <Reference Include="Core, Version=1.0.2.20620, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Debug\Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> </Reference> <Reference Include="Dialogs, Version=1.0.2.20629, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Debug\Dialogs.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> </Reference> <Reference Include="IrssUtils, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Debug\IrssUtils.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Release\IrssUtils.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -72,12 +72,12 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=2.2.4.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Debug\Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="VariableList, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Commands\VariableList\bin\Debug\VariableList.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Commands\VariableList\bin\Release\VariableList.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -85,21 +85,21 @@ <ItemGroup> <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Debug\Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Dialogs, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Debug\Dialogs.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="IrssComms, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Debug\IrssComms.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Release\IrssComms.dll</HintPath> </Reference> <Reference Include="IrssUtils, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Debug\IrssUtils.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Release\IrssUtils.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Drawing" /> @@ -107,7 +107,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=2.2.4.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Debug\Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -94,25 +94,25 @@ <ItemGroup> <Reference Include="Core, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Debug\Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Databases, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Databases\bin\Debug\Databases.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Databases\bin\Release\Databases.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Dialogs, Version=1.0.2.20629, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Debug\Dialogs.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> </Reference> <Reference Include="IrssComms, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Debug\IrssComms.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Release\IrssComms.dll</HintPath> </Reference> <Reference Include="IrssUtils, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Debug\IrssUtils.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Release\IrssUtils.dll</HintPath> </Reference> <Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"> <SpecificVersion>False</SpecificVersion> @@ -120,7 +120,7 @@ </Reference> <Reference Include="RemotePlugins, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\RemotePlugins\bin\Debug\RemotePlugins.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\RemotePlugins\bin\Release\RemotePlugins.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -130,7 +130,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Debug\Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -91,26 +91,26 @@ <ItemGroup> <Reference Include="Core, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Debug\Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Databases, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Databases\bin\Debug\Databases.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Databases\bin\Release\Databases.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Dialogs, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Debug\Dialogs.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="IrssComms, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Debug\IrssComms.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Release\IrssComms.dll</HintPath> </Reference> <Reference Include="IrssUtils, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Debug\IrssUtils.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Release\IrssUtils.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Drawing" /> @@ -118,11 +118,11 @@ <Reference Include="System.Xml" /> <Reference Include="TVCapture-Databases, Version=1.0.2.35455, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine2\Core\TVCapture\bin\Debug\TVCapture-Databases.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine2\Core\TVCapture\bin\Release\TVCapture-Databases.dll</HintPath> </Reference> <Reference Include="Utils, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Debug\Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj 2009-07-15 13:53:14 UTC (rev 3015) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.30729</ProductVersion> @@ -99,20 +99,20 @@ </Reference> <Reference Include="IrssComms, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Debug\IrssComms.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssComms\bin\Release\IrssComms.dll</HintPath> </Reference> <Reference Include="IrssUtils, Version=1.4.2.0, Culture=neutral, PublicKeyToken=dc0b77bf2c754d95, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Debug\IrssUtils.dll</HintPath> + <HintPath>..\..\..\..\IR Server Suite\IR Server Suite\Common\IrssUtils\bin\Release\IrssUtils.dll</HintPath> </Reference> <Reference Include="PluginBase, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\Plugins\PluginBase\bin\Debug\PluginBase.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\Plugins\PluginBase\bin\Release\PluginBase.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="SetupControls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\SetupControls\bin\Debug\SetupControls.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\SetupControls\bin\Release\SetupControls.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System"> @@ -127,22 +127,22 @@ <Reference Include="System.Xml" /> <Reference Include="TvBusinessLayer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\TvBusinessLayer\bin\Debug\TvBusinessLayer.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\TvBusinessLayer\bin\Release\TvBusinessLayer.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="TvControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TvControl\bin\Debug\TvControl.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TvControl\bin\Release\TvControl.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="TVDatabase, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\bin\Debug\TVDatabase.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\bin\Release\TVDatabase.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="TvLibrary.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TvLibrary.Interfaces\bin\Debug\TvLibrary.Interfaces.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TvLibrary.Interfaces\bin\Release\TvLibrary.Interfaces.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-15 13:53:14 UTC (rev 3015) @@ -367,8 +367,6 @@ File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*" File "..\IR Server Suite\IR Server Plugins\Custom HID Receiver\bin\${Build_Type}\Custom HID Receiver.*" File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Direct Input Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Microsoft.DirectX.DirectInput.dll" - File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Microsoft.DirectX.dll" File "..\IR Server Suite\IR Server Plugins\FusionRemote Receiver\bin\${Build_Type}\FusionRemote Receiver.*" File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*" File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*" Modified: trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi 2009-07-15 02:54:41 UTC (rev 3014) +++ trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi 2009-07-15 13:53:14 UTC (rev 3015) @@ -368,8 +368,6 @@ File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*" File "..\IR Server Suite\IR Server Plugins\Custom HID Receiver\bin\${Build_Type}\Custom HID Receiver.*" File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Direct Input Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Microsoft.DirectX.DirectInput.dll" - File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Microsoft.DirectX.dll" File "..\IR Server Suite\IR Server Plugins\FusionRemote Receiver\bin\${Build_Type}\FusionRemote Receiver.*" File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*" File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2009-07-18 10:31:35
|
Revision: 3018 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3018&view=rev Author: belcom Date: 2009-07-18 10:31:15 +0000 (Sat, 18 Jul 2009) Log Message: ----------- - altered firmware detection mechanism for device initialization. - modified installer to insert correct "auto run at startup". Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs trunk/plugins/IR Server Suite/setup/setup.nsi trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-07-16 12:26:43 UTC (rev 3017) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-07-18 10:31:15 UTC (rev 3018) @@ -417,6 +417,7 @@ private SafeFileHandle _deviceHandle; private bool _processReceiveThread; private Thread _receiveThread; + private IntPtr deviceBufferPtr; #endregion @@ -511,54 +512,91 @@ private void ReceiveThread() { DebugWriteLine("ReceiveThread()\n\n"); - IntPtr deviceBufferPtr = IntPtr.Zero; + byte[] dataBytes; + int col = 0; - try + while (_processReceiveThread) { - deviceBufferPtr = Marshal.AllocHGlobal(DosDeviceBufferSize); - - while (_processReceiveThread) + dataBytes = GetData(); + if (dataBytes.Length == DosDeviceBufferSize) { - int bytesRead; - IoControl(IOCTL_IMON_READ_RC, IntPtr.Zero, 0, deviceBufferPtr, DosDeviceBufferSize, out bytesRead); - if (bytesRead == DosDeviceBufferSize) + if (dataBytes[7] != 0xF0) { - byte[] dataBytes = new byte[bytesRead]; - Marshal.Copy(deviceBufferPtr, dataBytes, 0, bytesRead); - - if ((dataBytes[0] == 0xFF) && - (dataBytes[1] == 0xFF) && - (dataBytes[2] == 0xFF) && - (dataBytes[3] == 0xFF) && - (dataBytes[4] == 0xFF) && - (dataBytes[5] == 0xFF)) - firmwareVersion = (uint)dataBytes[6] + 2; - - // Rubbish data: - // FF, FF, FF, FF, FF, FF, 9F, FF, - // 00, 00, 00, 00, 00, 00, 00, F0, - if ((dataBytes[0] != 0xFF || dataBytes[1] != 0xFF || dataBytes[2] != 0xFF || dataBytes[3] != 0xFF || - dataBytes[4] != 0xFF || dataBytes[5] != 0xFF) && - (dataBytes[0] != 0x00 || dataBytes[1] != 0x00 || dataBytes[2] != 0x00 || dataBytes[3] != 0x00 || - dataBytes[4] != 0x00 || dataBytes[5] != 0x00)) + string temp = ""; + foreach (byte x in dataBytes) + temp += String.Format("{0:X2}", x); + if (col == 3) { - ProcessInput(dataBytes); + col = 0; + Debug.Write(temp + "\n"); } - Thread.Sleep(5); + else + { + col++; + Debug.Write(temp + " "); + } } + + // Rubbish data: + // FF, FF, FF, FF, FF, FF, 9F, FF, + // 00, 00, 00, 00, 00, 00, 00, F0, + if ((dataBytes[0] != 0xFF || dataBytes[1] != 0xFF || dataBytes[2] != 0xFF || dataBytes[3] != 0xFF || + dataBytes[4] != 0xFF || dataBytes[5] != 0xFF) && + (dataBytes[0] != 0x00 || dataBytes[1] != 0x00 || dataBytes[2] != 0x00 || dataBytes[3] != 0x00 || + dataBytes[4] != 0x00 || dataBytes[5] != 0x00)) + { + ProcessInput(dataBytes); + } + Thread.Sleep(5); } } + + if (deviceBufferPtr != IntPtr.Zero) + Marshal.FreeHGlobal(deviceBufferPtr); + } + + private void FindFirmware() + { + do + { + byte[] dataBytes = GetData(); + if (dataBytes.Length == DosDeviceBufferSize) + { + if ((dataBytes[0] == 0xFF) && + (dataBytes[1] == 0xFF) && + (dataBytes[2] == 0xFF) && + (dataBytes[3] == 0xFF) && + (dataBytes[4] == 0xFF) && + (dataBytes[5] == 0xFF)) + firmwareVersion = (uint)dataBytes[6] + 2; + } + } while (firmwareVersion == 0); + } + + private byte[] GetData() + { + try + { + int bytesRead; + IoControl(IOCTL_IMON_READ_RC, IntPtr.Zero, 0, deviceBufferPtr, DosDeviceBufferSize, out bytesRead); + if (bytesRead == DosDeviceBufferSize) + { + byte[] dataBytes = new byte[bytesRead]; + Marshal.Copy(deviceBufferPtr, dataBytes, 0, bytesRead); + return dataBytes; + } + else + { + return new byte[0]; + } + } catch (Exception ex) { DebugWriteLine(ex.ToString()); if (_deviceHandle != null) CancelIo(_deviceHandle); + return new byte[0]; } - finally - { - if (deviceBufferPtr != IntPtr.Zero) - Marshal.FreeHGlobal(deviceBufferPtr); - } } private void IoControl(uint ioControlCode, IntPtr inBuffer, int inBufferSize, IntPtr outBuffer, int outBufferSize, out int bytesReturned) @@ -584,11 +622,11 @@ switch (mode) { case RemoteMode.iMON: - modeData = (firmwareVersion < 0x9a) ? SetDosRemotePADold : SetDosRemotePADnew; + modeData = (firmwareVersion < 0x98) ? SetDosRemotePADold : SetDosRemotePADnew; break; case RemoteMode.MCE: - modeData = (firmwareVersion < 0x9a) ? SetDosRemoteMCEold : SetDosRemoteMCEnew; + modeData = (firmwareVersion < 0x98) ? SetDosRemoteMCEold : SetDosRemoteMCEnew; break; } SetDos(modeData); @@ -904,11 +942,9 @@ } else { - _processReceiveThread = true; - _receiveThread = new Thread(ReceiveThread); - _receiveThread.Name = "iMon Receive Thread"; - _receiveThread.IsBackground = true; - _receiveThread.Start(); + deviceBufferPtr = Marshal.AllocHGlobal(DosDeviceBufferSize); + FindFirmware(); + SetDos(_remoteMode); if (_remoteMode == RemoteMode.iMON) { @@ -919,8 +955,12 @@ { DebugWriteLine("Configured Hardware Mode: {0}\n", _remoteMode); } - - SetDos(_remoteMode); + + _processReceiveThread = true; + _receiveThread = new Thread(ReceiveThread); + _receiveThread.Name = "iMon Receive Thread"; + _receiveThread.IsBackground = true; + _receiveThread.Start(); } } @@ -1372,7 +1412,6 @@ else { MouseEvent(dx, dy, rightButton, leftButton); - //if (_mouseHandler != null) _mouseHandler(this.Name, raw.mouse.lLastX, raw.mouse.lLastY, (int)raw.mouse.ulButtons); } } @@ -1424,13 +1463,11 @@ if (!deviceName.Equals(MouseDeviceName)) return; } - - + #endregion + DebugWriteLine("Received Input Command ({0})", Enum.GetName(typeof(RawInput.RawInputType), raw.header.dwType)); DebugWriteLine("RAW HID DEVICE: {0}", deviceName); - #endregion - switch (raw.header.dwType) { case RawInput.RawInputType.HID: Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-16 12:26:43 UTC (rev 3017) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-07-18 10:31:15 UTC (rev 3018) @@ -414,12 +414,12 @@ ; Install Server/Service ${If} $ServerServiceMode == "IRServerAsApplication" ${LOG_TEXT} "INFO" "Adding IR Server to Autostart..." - !insertmacro SetAutoRun "IR Server" "$DIR_INSTALL\IR Server\IR Server.exe" + !insertmacro SetAutoRun "IR Server" '"$DIR_INSTALL\IR Server\IR Server.exe"' ${Else} ${LOG_TEXT} "INFO" "Installing IR Server as Service..." ExecWait '"$DIR_INSTALL\IR Server\IR Server.exe" /install' ${EndIf} - !insertmacro SetAutoRun "IR Server Configuration" "$DIR_INSTALL\IR Server Configuration\IR Server Configuration.exe" + !insertmacro SetAutoRun "IR Server Configuration" '"$DIR_INSTALL\IR Server Configuration\IR Server Configuration.exe"' ${MementoSectionEnd} !macro Remove_${SectionIRServer} Modified: trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi 2009-07-16 12:26:43 UTC (rev 3017) +++ trunk/plugins/IR Server Suite/setup/setup_AllCpu.nsi 2009-07-18 10:31:15 UTC (rev 3018) @@ -415,12 +415,12 @@ ; Install Server/Service ${If} $ServerServiceMode == "IRServerAsApplication" ${LOG_TEXT} "INFO" "Adding IR Server to Autostart..." - !insertmacro SetAutoRun "IR Server" "$DIR_INSTALL\IR Server\IR Server.exe" + !insertmacro SetAutoRun "IR Server" '"$DIR_INSTALL\IR Server\IR Server.exe"' ${Else} ${LOG_TEXT} "INFO" "Installing IR Server as Service..." ExecWait '"$DIR_INSTALL\IR Server\IR Server.exe" /install' ${EndIf} - !insertmacro SetAutoRun "IR Server Configuration" "$DIR_INSTALL\IR Server Configuration\IR Server Configuration.exe" + !insertmacro SetAutoRun "IR Server Configuration" '"$DIR_INSTALL\IR Server Configuration\IR Server Configuration.exe"' ${MementoSectionEnd} !macro Remove_${SectionIRServer} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mis...@us...> - 2009-08-10 18:20:13
|
Revision: 3052 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3052&view=rev Author: misterd_sf Date: 2009-08-10 18:19:41 +0000 (Mon, 10 Aug 2009) Log Message: ----------- FireDTV receiver plugin: Improved device handling and added to setup. Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs trunk/plugins/IR Server Suite/setup/languages/English.nsh trunk/plugins/IR Server Suite/setup/setup.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs 2009-08-10 18:00:57 UTC (rev 3051) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs 2009-08-10 18:19:41 UTC (rev 3052) @@ -48,7 +48,7 @@ private string _deviceName; private FireDTVControl _fireDTV = null; private ReceiverWindow _receiverWindow; - + private bool _running; #endregion Variables /// <summary> @@ -138,38 +138,41 @@ /// </summary> public override void Start() { - LoadSettings(); + if (!_running) + { + LoadSettings(); - _receiverWindow = new ReceiverWindow("FireDTV Receiver"); - _receiverWindow.ProcMsg += WndProc; + _receiverWindow = new ReceiverWindow("FireDTV Receiver"); + _receiverWindow.ProcMsg += WndProc; - _fireDTV = new FireDTVControl(_receiverWindow.Handle); - if (!_fireDTV.OpenDrivers()) - { - throw new InvalidOperationException("Failed to start FireDTV interface"); - } + _fireDTV = new FireDTVControl(_receiverWindow.Handle); + if (!_fireDTV.OpenDrivers()) + { + throw new InvalidOperationException("Failed to start FireDTV interface"); + } - // Search for the named sourcefilter + // Search for the named sourcefilter - FireDTVSourceFilterInfo sourceFilter = null; - if (string.IsNullOrEmpty(_deviceName)) - { - sourceFilter = _fireDTV.SourceFilters.Item(0); - } - else - { - sourceFilter = _fireDTV.SourceFilters.ItemByName(_deviceName); - } + FireDTVSourceFilterInfo sourceFilter; + if (string.IsNullOrEmpty(_deviceName)) + { + sourceFilter = _fireDTV.SourceFilters.Item(0); + } + else + { + sourceFilter = _fireDTV.SourceFilters.ItemByName(_deviceName); + } - if (sourceFilter != null) - { - sourceFilter.StartFireDTVRemoteControlSupport(); + if (sourceFilter != null) + { + sourceFilter.StartFireDTVRemoteControlSupport(); + _running = true; + } + else + { + throw new InvalidOperationException("Failed to start FireDTV interface"); + } } - else - { - throw new InvalidOperationException("Failed to start FireDTV interface"); - } - } /// <summary> @@ -193,15 +196,19 @@ /// </summary> public override void Stop() { - if (_fireDTV != null) + if (_running) { - _fireDTV.CloseDrivers(); + if (_fireDTV != null) + { + _fireDTV.CloseDrivers(); + } + if (_receiverWindow != null) + { + _receiverWindow.DestroyHandle(); + _receiverWindow = null; + } + _running = false; } - if (_receiverWindow != null) - { - _receiverWindow.DestroyHandle(); - _receiverWindow = null; - } } private void LoadSettings() Modified: trunk/plugins/IR Server Suite/setup/languages/English.nsh =================================================================== --- trunk/plugins/IR Server Suite/setup/languages/English.nsh 2009-08-10 18:00:57 UTC (rev 3051) +++ trunk/plugins/IR Server Suite/setup/languages/English.nsh 2009-08-10 18:19:41 UTC (rev 3052) @@ -72,5 +72,5 @@ !insertmacro LANG_STRING ServerServiceModePage_OPT0_DESC "Install IR Server as a windows service. If you don't know what to choose and you don't have a remote listed below, choose this option." !insertmacro LANG_STRING ServerServiceModePage_OPT1 "IR Server as Application" -!insertmacro LANG_STRING ServerServiceModePage_OPT1_DESC "Install IR Server as a windows application. Choose this if you have one of the following remotes:$\r$\n - HID and some iMON devices" +!insertmacro LANG_STRING ServerServiceModePage_OPT1_DESC "Install IR Server as a windows application. Choose this if you have one of the following remotes:$\r$\n - HID, FireDTV, FloppyDTV and some iMON devices" Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-08-10 18:00:57 UTC (rev 3051) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-08-10 18:19:41 UTC (rev 3052) @@ -420,6 +420,7 @@ File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\X10 Transceiver.*" File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\Interop.X10.dll" File "..\IR Server Suite\IR Server Plugins\XBCDRC Receiver\bin\${Build_Type}\XBCDRC Receiver.*" + File "..\IR Server Suite\IR Server Plugins\FireDTV Receiver\bin\${Build_Type}\FireDTV Receiver.*" ; Create App Data Folder for IR Server configuration files CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Server" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-09-16 13:21:06
|
Revision: 3087 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3087&view=rev Author: chemelli_sf Date: 2009-09-16 13:20:55 +0000 (Wed, 16 Sep 2009) Log Message: ----------- - Enabled 4 plugins that were commented out: IR501 Receiver Keyboard Input RC102 Receiver Speech Receiver - "Ira/Tira transceiver" plugins are left out (non compiling) - Fixed some minor options in project files Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj trunk/plugins/IR Server Suite/setup/setup.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -41,10 +41,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -44,10 +44,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -45,10 +45,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -45,10 +45,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -15,6 +15,29 @@ <TargetFrameworkSubset> </TargetFrameworkSubset> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <DocumentationFile>bin\Debug\FireDTV Receiver.XML</DocumentationFile> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <DocumentationFile> + </DocumentationFile> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -44,10 +44,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -40,16 +40,18 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <PlatformTarget>AnyCPU</PlatformTarget> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -46,10 +46,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -41,10 +41,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -44,10 +44,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -45,10 +45,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -45,10 +45,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -1,8 +1,8 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{0E045E97-EEB2-461C-A416-CFC8E452E044}</ProjectGuid> <OutputType>Library</OutputType> @@ -20,8 +20,9 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> <DocumentationFile>bin\Debug\Ira Transceiver.XML</DocumentationFile> - <UseVSHostingProcess>false</UseVSHostingProcess> + <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> @@ -32,7 +33,32 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> + <DebugSymbols>false</DebugSymbols> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <PlatformTarget>x86</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <PlatformTarget>x86</PlatformTarget> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -53,7 +79,7 @@ <ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj"> <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> <Name>IR Server Plugin Interface</Name> - <Private>False</Private> + <Private>True</Private> </ProjectReference> </ItemGroup> <ItemGroup> @@ -74,4 +100,8 @@ <Target Name="AfterBuild"> </Target> --> + <PropertyGroup> + <PostBuildEvent> + </PostBuildEvent> + </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -42,10 +42,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -41,10 +41,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -40,10 +40,14 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -10,14 +10,7 @@ <RootNamespace>IRServer.Plugin</RootNamespace> <AssemblyName>Microsoft MCE Transceiver</AssemblyName> <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> - <StartupObject> - </StartupObject> <ApplicationIcon>Icon.ico</ApplicationIcon> - <FileUpgradeFlags> - </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> - <UpgradeBackupLocation> - </UpgradeBackupLocation> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -36,7 +29,8 @@ <DebugType>none</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> - <DefineConstants>DEBUG</DefineConstants> + <DefineConstants> + </DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> @@ -45,11 +39,26 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath> +<DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> + <DebugType>none</DebugType> + <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> +<DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -45,10 +45,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -41,10 +41,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -40,10 +40,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -48,11 +48,13 @@ <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -1,8 +1,8 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{6137C390-DDB0-44B0-8ED5-51B45C0D4404}</ProjectGuid> <OutputType>Library</OutputType> @@ -19,9 +19,10 @@ <DefineConstants>DEBUG</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <DocumentationFile>bin\Debug\Tira Transceiver.XML</DocumentationFile> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> <UseVSHostingProcess>false</UseVSHostingProcess> + <DocumentationFile>bin\Debug\Tira Transceiver.XML</DocumentationFile> + <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> @@ -32,7 +33,32 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> + <DebugSymbols>false</DebugSymbols> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <PlatformTarget>x86</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <PlatformTarget>x86</PlatformTarget> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -59,7 +85,7 @@ <ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj"> <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> <Name>IR Server Plugin Interface</Name> - <Private>False</Private> + <Private>True</Private> </ProjectReference> </ItemGroup> <ItemGroup> @@ -87,4 +113,8 @@ <Target Name="AfterBuild"> </Target> --> + <PropertyGroup> + <PostBuildEvent> + </PostBuildEvent> + </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> - <PlatformTarget>x86</PlatformTarget> + <PlatformTarget>AnyCPU</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -42,7 +42,8 @@ <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> + <DefineConstants> + </DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <DocumentationFile> @@ -51,10 +52,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -43,10 +43,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -44,10 +44,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="Interop.X10, Version=1.0.0.0, Culture=neutral"> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj 2009-09-16 13:20:55 UTC (rev 3087) @@ -45,10 +45,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PlatformTarget>x86</PlatformTarget> <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-09-10 21:45:55 UTC (rev 3086) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-09-16 13:20:55 UTC (rev 3087) @@ -390,28 +390,27 @@ File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*" File "..\IR Server Suite\IR Server Plugins\Custom HID Receiver\bin\${Build_Type}\Custom HID Receiver.*" File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Direct Input Receiver.*" + File "..\IR Server Suite\IR Server Plugins\FireDTV Receiver\bin\${Build_Type}\FireDTV Receiver.*" File "..\IR Server Suite\IR Server Plugins\FusionRemote Receiver\bin\${Build_Type}\FusionRemote Receiver.*" File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*" File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*" File "..\IR Server Suite\IR Server Plugins\IgorPlug Receiver\bin\${Build_Type}\IgorPlug Receiver.*" File "..\IR Server Suite\IR Server Plugins\Imon USB Receivers\bin\${Build_Type}\Imon USB Receivers.*" - ;File "..\IR Server Suite\IR Server Plugins\IR501 Receiver\bin\${Build_Type}\IR501 Receiver.*" + File "..\IR Server Suite\IR Server Plugins\IR501 Receiver\bin\${Build_Type}\IR501 Receiver.*" File "..\IR Server Suite\IR Server Plugins\IR507 Receiver\bin\${Build_Type}\IR507 Receiver.*" - ;File "..\IR Server Suite\IR Server Plugins\Ira Transceiver\bin\${Build_Type}\Ira Transceiver.*" File "..\IR Server Suite\IR Server Plugins\IRMan Receiver\bin\${Build_Type}\IRMan Receiver.*" File "..\IR Server Suite\IR Server Plugins\IRTrans Transceiver\bin\${Build_Type}\IRTrans Transceiver.*" - ;File "..\IR Server Suite\IR Server Plugins\Keyboard Input\bin\${Build_Type}\Keyboard Input.*" + File "..\IR Server Suite\IR Server Plugins\Keyboard Input\bin\${Build_Type}\Keyboard Input.*" File "..\IR Server Suite\IR Server Plugins\LiveDrive Receiver\bin\${Build_Type}\LiveDrive Receiver.*" File "..\IR Server Suite\IR Server Plugins\MacMini Receiver\bin\${Build_Type}\MacMini Receiver.*" File "..\IR Server Suite\IR Server Plugins\Microsoft MCE Transceiver\bin\${Build_Type}\Microsoft MCE Transceiver.*" File "..\IR Server Suite\IR Server Plugins\Pinnacle Serial Receiver\bin\${Build_Type}\Pinnacle Serial Receiver.*" - ;File "..\IR Server Suite\IR Server Plugins\RC102 Receiver\bin\${Build_Type}\RC102 Receiver.*" + File "..\IR Server Suite\IR Server Plugins\RC102 Receiver\bin\${Build_Type}\RC102 Receiver.*" File "..\IR Server Suite\IR Server Plugins\RedEye Blaster\bin\${Build_Type}\RedEye Blaster.*" File "..\IR Server Suite\IR Server Plugins\Serial IR Blaster\bin\${Build_Type}\Serial IR Blaster.*" - ;File "..\IR Server Suite\IR Server Plugins\Speech Receiver\bin\${Build_Type}\Speech Receiver.*" + File "..\IR Server Suite\IR Server Plugins\Speech Receiver\bin\${Build_Type}\Speech Receiver.*" File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\Technotrend Receiver.*" File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\ttBdaDrvApi_Dll.dll" - ;File "..\IR Server Suite\IR Server Plugins\Tira Transceiver\bin\${Build_Type}\Tira Transceiver.*" File "..\IR Server Suite\IR Server Plugins\USB-UIRT Transceiver\bin\${Build_Type}\USB-UIRT Transceiver.*" File "..\IR Server Suite\IR Server Plugins\Wii Remote Receiver\bin\${Build_Type}\Wii Remote Receiver.*" File "..\IR Server Suite\IR Server Plugins\WiimoteLib\bin\${Build_Type}\WiimoteLib.*" @@ -420,8 +419,10 @@ File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\X10 Transceiver.*" File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\Interop.X10.dll" File "..\IR Server Suite\IR Server Plugins\XBCDRC Receiver\bin\${Build_Type}\XBCDRC Receiver.*" - File "..\IR Server Suite\IR Server Plugins\FireDTV Receiver\bin\${Build_Type}\FireDTV Receiver.*" - + ; Ira project is not compiling currently + ; File "..\IR Server Suite\IR Server Plugins\Ira Transceiver\bin\${Build_Type}\Ira Transceiver.*" + ; File "..\IR Server Suite\IR Server Plugins\Tira Transceiver\bin\${Build_Type}\Tira Transceiver.*" + ; Create App Data Folder for IR Server configuration files CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Server" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-09-29 19:54:02
|
Revision: 3098 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3098&view=rev Author: chef_koch Date: 2009-09-29 19:53:52 +0000 (Tue, 29 Sep 2009) Log Message: ----------- added AdminHelper to start and stop input service during runtime of irss config Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/setup/setup.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs 2009-09-23 20:54:48 UTC (rev 3097) +++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs 2009-09-29 19:53:52 UTC (rev 3098) @@ -70,7 +70,6 @@ /// <summary>Forces processes to terminate. When this flag is set, the system does not send the WM_QUERYENDSESSION and WM_ENDSESSION messages. This can cause the applications to lose data. Therefore, you should only use this flag in an emergency.</summary> private const int EWX_FORCE = 4; - #endregion Constants #region Enumerations @@ -2696,6 +2695,43 @@ return isWow64; } + #region UAC Shield on button + /* + * Code is implemented implemented together at place for the beginning. + * needs rework, since I do not know exactly where to put which things. + */ + + #region Interop Command Link Definitions + + internal const int BS_COMMANDLINK = 0x0000000E; + internal const uint BCM_SETNOTE = 0x00001609; + internal const uint BCM_GETNOTE = 0x0000160A; + internal const uint BCM_GETNOTELENGTH = 0x0000160B; + internal const uint BCM_SETSHIELD = 0x0000160C; + + #endregion + + /// <summary> + /// Adds a Shield-Icon to a button to indicate clicking on it launches a UAC protected action, + /// which requires user + /// </summary> + /// <param name="button">the button control</param> + /// <param name="showShield">Indicates whether the shield should be displayed or not.</param> + public static void SetWindowsFormsButtonShield(System.Windows.Forms.Button button, bool showShield) + { + SendMessage(button.Handle, BCM_SETSHIELD, 0, showShield); + } + + [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] + internal static extern int SendMessage( + IntPtr hWnd, + uint msg, + int wParam, + bool lParam + ); + + #endregion + #endregion Methods } Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj 2009-09-29 19:53:52 UTC (rev 3098) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{F6C2B2FA-026A-4483-854C-735D6E59E69C}</ProjectGuid> + <OutputType>WinExe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>IR_Server_AdminHelper</RootNamespace> + <AssemblyName>IR Server AdminHelper</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ApplicationManifest>IR Server AdminHelper.manifest</ApplicationManifest> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <PlatformTarget>x86</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <PlatformTarget>x86</PlatformTarget> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.ServiceProcess" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="IR Server AdminHelper.manifest" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> + <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> + <Name>IrssUtils</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest 2009-09-29 19:53:52 UTC (rev 3098) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <description>IRRS Suite - Server AdminHelper</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="requireAdministrator" + uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs 2009-09-29 19:53:52 UTC (rev 3098) @@ -0,0 +1,216 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.ServiceProcess; +using IrssUtils; +using TimeoutException=System.TimeoutException; + +namespace IR_Server_AdminHelper +{ + class Program + { + #region Constants + + internal const string ServerName = "IRServer"; + internal const string ServerWindowName = "IRSS - " + ServerName; + internal const string ServerDisplayName = "IR Server"; + + //private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); + internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe"); + + private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30); + + #endregion Constants + + #region Variables + + //private static bool _abstractRemoteMode; + //private static string _hostComputer; + //private static IRServerMode _mode; + //private static string[] _pluginNameReceive; + //private static string _pluginNameTransmit; + //private static string _processPriority; + //private static NotifyIcon _notifyIcon; + //private static bool _inConfiguration; + //private static Thread thread; + private static ServiceController serviceController; + private static ServiceController[] serviceControllers; + //private static IntPtr irsWindow; + //private static int waitCount; + //internal static IrsStatus _irsStatus; + //internal static bool _serviceInstalled; + + #endregion Variables + + static void Main(string[] args) + { + try + { + IrssLog.LogLevel = IrssLog.Level.Debug; + IrssLog.Open("IR Server AdminHelper.log"); + + if (args.Length == 0) + { + throw new InvalidOperationException(String.Format("No command line parameter specified.")); + } + else + { + foreach (string parameter in args) + { + switch (parameter.ToUpperInvariant().Replace("-", "/")) + { + case "/INSTALL": + IrssLog.Info("Installing IR Server ..."); + ServiceInstall(); + break; + + case "/UNINSTALL": + IrssLog.Info("Uninstalling IR Server ..."); + ServiceUninstall(); + break; + + case "/START": + IrssLog.Info("Starting IR Server ..."); + ServiceStart(); + break; + + case "/STOP": + IrssLog.Info("Stopping IR Server ..."); + ServiceStop(); + break; + + case "/RESTART": + IrssLog.Info("Restarting IR Server ..."); + ServiceStop(); + ServiceStart(); + break; + + default: + throw new InvalidOperationException(String.Format("Unknown command line parameter \"{0}\"", parameter)); + } + } + + IrssLog.Info("Done."); + } + + Environment.ExitCode = 0; + } + catch (System.Security.SecurityException secEx) + { + IrssLog.Error(secEx); + Environment.ExitCode = 1; + } + catch (UnauthorizedAccessException authEx) + { + IrssLog.Error(authEx); + Environment.ExitCode = 2; + } + catch (Exception ex) + { + IrssLog.Error(ex); + Environment.ExitCode = 3; + } + finally + { + IrssLog.Close(); + } + } + + #region Service handler + + private static ServiceController getServiceController() + { + serviceControllers = ServiceController.GetServices(); + foreach (ServiceController sc in serviceControllers) + { + if (sc.ServiceName == ServerName) + return sc; + } + return null; + } + + internal static void ServiceInstall() + { + try + { + IrssLog.Info("Installing IR Server service"); + Process IRServer = Process.Start(Program.IRServerFile, "/INSTALL"); + IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds); + IrssLog.Info("Installing IR Server service - done"); + } + catch (Exception ex) + { + IrssLog.Error("Installing IR Server service - failed (see following...)"); + IrssLog.Error(ex); + } + } + + internal static void ServiceUninstall() + { + try + { + IrssLog.Info("Uninstalling IR Server service"); + Process IRServer = Process.Start(Program.IRServerFile, "/UNINSTALL"); + IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds); + IrssLog.Info("Uninstalling IR Server service - done"); + } + catch (Exception ex) + { + IrssLog.Error("Uninstalling IR Server service - failed (see following...)"); + IrssLog.Error(ex); + } + } + + internal static void ServiceStart() + { + try + { + serviceController = getServiceController(); + if (serviceControllers != null) + { + IrssLog.Info("Starting IR Server (service)"); + serviceController.Start(); + serviceController.WaitForStatus(ServiceControllerStatus.Running, defaultServiceTime); + IrssLog.Info("Starting IR Server (service) - done"); + } + } + catch (TimeoutException ex) + { + IrssLog.Error("Starting IR Server (service) - failed (timeout error)"); + IrssLog.Error(ex); + } + catch (Exception ex) + { + IrssLog.Error("Starting IR Server (service) - failed (see following...)"); + IrssLog.Error(ex); + } + } + + internal static void ServiceStop() + { + try + { + serviceController = getServiceController(); + if (serviceControllers != null) + { + IrssLog.Info("Stopping IR Server (service)"); + serviceController.Stop(); + serviceController.WaitForStatus(ServiceControllerStatus.Stopped, defaultServiceTime); + IrssLog.Info("Stopping IR Server (service) - done"); + } + } + catch (TimeoutException ex) + { + IrssLog.Error("Stopping IR Server (service) - failed (timeout error)"); + IrssLog.Error(ex); + } + catch (Exception ex) + { + IrssLog.Error("Stopping IR Server (service) - failed (see following...)"); + IrssLog.Error(ex); + } + } + + #endregion + } +} Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs 2009-09-29 19:53:52 UTC (rev 3098) @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen ?ber eine Assembly werden ?ber die folgenden +// Attribute gesteuert. ?ndern Sie diese Attributwerte, um die Informationen zu ?ndern, +// die mit einer Assembly verkn?pft sind. +[assembly: AssemblyTitle("IR Server AdminHelper")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("IR Server AdminHelper")] +[assembly: AssemblyCopyright("Copyright ? 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// f?r COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen m?ssen, legen Sie das ComVisible-Attribut f?r diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt f?r COM verf?gbar gemacht wird +[assembly: Guid("3ddd5385-19dc-4ee9-b0c2-38687c64281c")] + +// Versionsinformationen f?r eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie k?nnen alle Werte angeben oder die standardm??igen Build- und Revisionsnummern +// ?bernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-09-23 20:54:48 UTC (rev 3097) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-09-29 19:53:52 UTC (rev 3098) @@ -136,12 +136,10 @@ <ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj"> <Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project> <Name>IrssComms</Name> - <Private>True</Private> </ProjectReference> <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> <Name>IrssUtils</Name> - <Private>True</Private> </ProjectReference> <ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj"> <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-09-23 20:54:48 UTC (rev 3097) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-09-29 19:53:52 UTC (rev 3098) @@ -92,10 +92,10 @@ private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe"); + internal static readonly string AdminHelperFile = Path.Combine(Common.FolderProgramFiles, @"IR Server AdminHelper.exe"); internal static readonly Icon _iconGray = new Icon(Resources.iconGray, new Size(16, 16)); internal static readonly Icon _iconGreen = new Icon(Resources.iconGreen, new Size(16, 16)); - private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30); #endregion Constants @@ -110,7 +110,7 @@ private static NotifyIcon _notifyIcon; private static bool _inConfiguration; private static Thread thread; - private static ServiceController serviceController; + //private static ServiceController serviceController; private static ServiceController[] serviceControllers; private static IntPtr irsWindow; private static int waitCount; @@ -455,97 +455,63 @@ } } - private static ServiceController getServiceController() + private static void RunAdminHelper(string arguments) { - serviceControllers = ServiceController.GetServices(); - foreach (ServiceController sc in serviceControllers) - { - if (sc.ServiceName == ServerName) - return sc; - } - return null; - } + int exitCode = 0; - internal static void ServiceInstall() - { + Process process = new Process(); + process.StartInfo = new ProcessStartInfo(); + process.StartInfo.FileName = AdminHelperFile; + process.StartInfo.Arguments = arguments; + process.StartInfo.CreateNoWindow = true; + process.StartInfo.UseShellExecute = true; + + // Must enable Exited event for both sync and async scenarios + process.EnableRaisingEvents = true; + try { - IrssLog.Info("Installing IR Server service"); - Process IRServer = Process.Start(Program.IRServerFile, "/INSTALL"); - IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds); - IrssLog.Info("Installing IR Server service - done"); + process.Start(); + // Synchronously block until process is complete, then return exit code from process + process.WaitForExit(); + exitCode = process.ExitCode; } catch (Exception ex) { - IrssLog.Error("Installing IR Server service - failed (see following...)"); IrssLog.Error(ex); + exitCode = 10; } + + + if (exitCode != 0) + { + IrssLog.Error("RunAdminHelper exitcode = " + exitCode); + MessageBox.Show("There occured an issue when trying to run AdminHelper." + Environment.NewLine + + "Do you have administration rights?" + Environment.NewLine + + "Did you accept the request for Administration rights?" + Environment.NewLine + Environment.NewLine + + "If you think you did everything right, please report the issue to the devlopers.", + "IR Server Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } + internal static void ServiceInstall() + { + RunAdminHelper("/INSTALL"); + } + internal static void ServiceUninstall() { - try - { - IrssLog.Info("Uninstalling IR Server service"); - Process IRServer = Process.Start(Program.IRServerFile, "/UNINSTALL"); - IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds); - IrssLog.Info("Uninstalling IR Server service - done"); - } - catch (Exception ex) - { - IrssLog.Error("Uninstalling IR Server service - failed (see following...)"); - IrssLog.Error(ex); - } + RunAdminHelper("/UNINSTALL"); } internal static void ServiceStart() { - try - { - serviceController = getServiceController(); - if (serviceControllers != null) - { - IrssLog.Info("Starting IR Server (service)"); - serviceController.Start(); - serviceController.WaitForStatus(ServiceControllerStatus.Running, defaultServiceTime); - IrssLog.Info("Starting IR Server (service) - done"); - } - } - catch (TimeoutException ex) - { - IrssLog.Error("Starting IR Server (service) - failed (timeout error)"); - IrssLog.Error(ex); - } - catch (Exception ex) - { - IrssLog.Error("Starting IR Server (service) - failed (see following...)"); - IrssLog.Error(ex); - } + RunAdminHelper("/START"); } internal static void ServiceStop() { - try - { - serviceController = getServiceController(); - if (serviceControllers != null) - { - IrssLog.Info("Stopping IR Server (service)"); - serviceController.Stop(); - serviceController.WaitForStatus(ServiceControllerStatus.Stopped, defaultServiceTime); - IrssLog.Info("Stopping IR Server (service) - done"); - } - } - catch (TimeoutException ex) - { - IrssLog.Error("Stopping IR Server (service) - failed (timeout error)"); - IrssLog.Error(ex); - } - catch (Exception ex) - { - IrssLog.Error("Stopping IR Server (service) - failed (see following...)"); - IrssLog.Error(ex); - } + RunAdminHelper("/STOP"); } internal static void ApplicationStart() Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-09-23 20:54:48 UTC (rev 3097) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-09-29 19:53:52 UTC (rev 3098) @@ -127,6 +127,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireDTV Receiver", "IR Server Plugins\FireDTV Receiver\FireDTV Receiver.csproj", "{D88EDBC1-D583-4149-9873-8239FA63F4FE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server AdminHelper", "IR Server\IR Server AdminHelper\IR Server AdminHelper.csproj", "{F6C2B2FA-026A-4483-854C-735D6E59E69C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -599,6 +601,14 @@ {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.Build.0 = Release|Any CPU {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|x86 {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.Build.0 = Release|x86 + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|x86.ActiveCfg = Debug|x86 + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|x86.Build.0 = Debug|x86 + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|Any CPU.Build.0 = Release|Any CPU + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|x86.ActiveCfg = Release|x86 + {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -659,6 +669,7 @@ {28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03} {46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} + {F6C2B2FA-026A-4483-854C-735D6E59E69C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-09-23 20:54:48 UTC (rev 3097) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-09-29 19:53:52 UTC (rev 3098) @@ -380,7 +380,8 @@ File "..\IR Server Suite\IR Server\IR Server Configuration\bin\${Build_Type}\IR Server Configuration.*" File "..\IR Server Suite\IR Server\SourceGrid\DevAge*" File "..\IR Server Suite\IR Server\SourceGrid\SourceGrid*" - + + File "..\IR Server Suite\IR Server\IR Server AdminHelper\bin\${Build_Type}\IR Server AdminHelper.*" File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*" ${LOG_TEXT} "INFO" "Installing IR Server Plugins..." @@ -471,6 +472,7 @@ Delete "$DIR_INSTALL\DevAge*" Delete "$DIR_INSTALL\SourceGrid*" + Delete "$DIR_INSTALL\IR Server AdminHelper.*" Delete "$DIR_INSTALL\IRServerPluginInterface.*" !macroend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-10-11 15:31:46
|
Revision: 3119 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3119&view=rev Author: chemelli_sf Date: 2009-10-11 15:31:37 +0000 (Sun, 11 Oct 2009) Log Message: ----------- - Fixed TV3 plugin - Minor logging improvements - Minor cleanup Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2009-10-11 15:31:37 UTC (rev 3119) @@ -238,7 +238,7 @@ { if (IrssUtils.Win32.Check64Bit()) { - IrssLog.Warn("Plugin {0}: not available on current OS architecture (x64)", Name); + IrssLog.Warn("{0,15}: not available on current OS architecture (x64)", Name); return DetectionResult.DeviceDisabled; } try Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs 2009-10-11 15:31:37 UTC (rev 3119) @@ -115,9 +115,9 @@ /// </summary> public override DetectionResult Detect() { - if (IrssUtils.Win32.Check64Bit()) + if (Win32.Check64Bit()) { - IrssLog.Warn("Plugin {0}: not available on current OS architecture (x64)", Name); + IrssLog.Warn("{0,15}: not available on current OS architecture (x64)", Name); return DetectionResult.DeviceDisabled; } try @@ -155,17 +155,8 @@ } // Search for the named sourcefilter + FireDTVSourceFilterInfo sourceFilter = string.IsNullOrEmpty(_deviceName) ? _fireDTV.SourceFilters.Item(0) : _fireDTV.SourceFilters.ItemByName(_deviceName); - FireDTVSourceFilterInfo sourceFilter; - if (string.IsNullOrEmpty(_deviceName)) - { - sourceFilter = _fireDTV.SourceFilters.Item(0); - } - else - { - sourceFilter = _fireDTV.SourceFilters.ItemByName(_deviceName); - } - if (sourceFilter != null) { sourceFilter.StartFireDTVRemoteControlSupport(); Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj 2009-10-11 15:31:37 UTC (rev 3119) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -27,7 +27,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <DocumentationFile>bin\Debug\MPUtils.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj 2009-10-11 15:31:37 UTC (rev 3119) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -27,7 +27,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <DocumentationFile>bin\Debug\MediaPortalCommands.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj 2009-10-11 15:31:37 UTC (rev 3119) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -31,7 +31,8 @@ <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> <UseVSHostingProcess>false</UseVSHostingProcess> - <DocumentationFile>bin\Debug\MPBlastZonePlugin.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj 2009-10-11 15:31:37 UTC (rev 3119) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -31,7 +31,8 @@ <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> <UseVSHostingProcess>false</UseVSHostingProcess> - <DocumentationFile>bin\Debug\MPControlPlugin.xml</DocumentationFile> + <DocumentationFile> + </DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj 2009-10-11 15:31:37 UTC (rev 3119) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -31,7 +31,8 @@ <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> <UseVSHostingProcess>false</UseVSHostingProcess> - <DocumentationFile>bin\Debug\TV2BlasterPlugin.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs 2009-10-11 15:31:37 UTC (rev 3119) @@ -30,7 +30,7 @@ using TvDatabase; using TvEngine; using TvLibrary.Log; -using Server=IrssComms.Server; +using Server = IrssComms.Server; namespace SetupTv.Sections { @@ -60,13 +60,7 @@ TV3BlasterPlugin.InConfiguration = true; TvBusinessLayer layer = new TvBusinessLayer(); - TV3BlasterPlugin.ServerHost = layer.GetSetting("TV3BlasterPlugin_ServerHost", String.Empty).Value; - - if (String.IsNullOrEmpty(TV3BlasterPlugin.ServerHost)) - { - buttonHostSetup_Click(null, null); - } - + TV3BlasterPlugin.ServerHost = layer.GetSetting("TV3BlasterPlugin_ServerHost", "localhost").Value; IPAddress serverIP = Client.GetIPFromName(TV3BlasterPlugin.ServerHost); IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort); Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj 2009-10-11 14:55:25 UTC (rev 3118) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj 2009-10-11 15:31:37 UTC (rev 3119) @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.30729</ProductVersion> @@ -38,7 +38,8 @@ <ConfigurationOverrideFile> </ConfigurationOverrideFile> <DefineConstants>DEBUG</DefineConstants> - <DocumentationFile>bin\Debug\TV3BlasterPlugin.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> <DebugSymbols>true</DebugSymbols> <FileAlignment>4096</FileAlignment> <NoStdLib>false</NoStdLib> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-11-13 12:04:19
|
Revision: 3149 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3149&view=rev Author: chef_koch Date: 2009-11-13 12:04:08 +0000 (Fri, 13 Nov 2009) Log Message: ----------- reverted changes all other changes made in 3098 and 3106: removed AdminHelperFile Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/setup/setup.nsi Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/ Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 02:30:12 UTC (rev 3148) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 12:04:08 UTC (rev 3149) @@ -92,10 +92,10 @@ private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe"); - internal static readonly string AdminHelperFile = Path.Combine(Common.FolderProgramFiles, @"IR Server AdminHelper.exe"); internal static readonly Icon _iconGray = new Icon(Resources.iconGray, new Size(16, 16)); internal static readonly Icon _iconGreen = new Icon(Resources.iconGreen, new Size(16, 16)); + private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30); #endregion Constants @@ -110,7 +110,7 @@ private static NotifyIcon _notifyIcon; private static bool _inConfiguration; private static Thread thread; - //private static ServiceController serviceController; + private static ServiceController serviceController; private static ServiceController[] serviceControllers; private static IntPtr irsWindow; private static int waitCount; @@ -459,63 +459,97 @@ } } - private static void RunAdminHelper(string arguments) + private static ServiceController getServiceController() { - int exitCode = 0; + serviceControllers = ServiceController.GetServices(); + foreach (ServiceController sc in serviceControllers) + { + if (sc.ServiceName == ServerName) + return sc; + } + return null; + } - Process process = new Process(); - process.StartInfo = new ProcessStartInfo(); - process.StartInfo.FileName = AdminHelperFile; - process.StartInfo.Arguments = arguments; - process.StartInfo.CreateNoWindow = true; - process.StartInfo.UseShellExecute = true; - - // Must enable Exited event for both sync and async scenarios - process.EnableRaisingEvents = true; - + internal static void ServiceInstall() + { try { - process.Start(); - // Synchronously block until process is complete, then return exit code from process - process.WaitForExit(); - exitCode = process.ExitCode; + IrssLog.Info("Installing IR Server service"); + Process IRServer = Process.Start(Program.IRServerFile, "/INSTALL"); + IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds); + IrssLog.Info("Installing IR Server service - done"); } catch (Exception ex) { + IrssLog.Error("Installing IR Server service - failed (see following...)"); IrssLog.Error(ex); - exitCode = 10; } - - - if (exitCode != 0) - { - IrssLog.Error("RunAdminHelper exitcode = " + exitCode); - MessageBox.Show("There occured an issue when trying to run AdminHelper." + Environment.NewLine + - "Do you have administration rights?" + Environment.NewLine + - "Did you accept the request for Administration rights?" + Environment.NewLine + Environment.NewLine + - "If you think you did everything right, please report the issue to the devlopers.", - "IR Server Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error); - } } - internal static void ServiceInstall() - { - RunAdminHelper("/INSTALL"); - } - internal static void ServiceUninstall() { - RunAdminHelper("/UNINSTALL"); + try + { + IrssLog.Info("Uninstalling IR Server service"); + Process IRServer = Process.Start(Program.IRServerFile, "/UNINSTALL"); + IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds); + IrssLog.Info("Uninstalling IR Server service - done"); + } + catch (Exception ex) + { + IrssLog.Error("Uninstalling IR Server service - failed (see following...)"); + IrssLog.Error(ex); + } } internal static void ServiceStart() { - RunAdminHelper("/START"); + try + { + serviceController = getServiceController(); + if (serviceControllers != null) + { + IrssLog.Info("Starting IR Server (service)"); + serviceController.Start(); + serviceController.WaitForStatus(ServiceControllerStatus.Running, defaultServiceTime); + IrssLog.Info("Starting IR Server (service) - done"); + } + } + catch (TimeoutException ex) + { + IrssLog.Error("Starting IR Server (service) - failed (timeout error)"); + IrssLog.Error(ex); + } + catch (Exception ex) + { + IrssLog.Error("Starting IR Server (service) - failed (see following...)"); + IrssLog.Error(ex); + } } internal static void ServiceStop() { - RunAdminHelper("/STOP"); + try + { + serviceController = getServiceController(); + if (serviceControllers != null) + { + IrssLog.Info("Stopping IR Server (service)"); + serviceController.Stop(); + serviceController.WaitForStatus(ServiceControllerStatus.Stopped, defaultServiceTime); + IrssLog.Info("Stopping IR Server (service) - done"); + } + } + catch (TimeoutException ex) + { + IrssLog.Error("Stopping IR Server (service) - failed (timeout error)"); + IrssLog.Error(ex); + } + catch (Exception ex) + { + IrssLog.Error("Stopping IR Server (service) - failed (see following...)"); + IrssLog.Error(ex); + } } internal static void ApplicationStart() Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 02:30:12 UTC (rev 3148) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 12:04:08 UTC (rev 3149) @@ -127,8 +127,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireDTV Receiver", "IR Server Plugins\FireDTV Receiver\FireDTV Receiver.csproj", "{D88EDBC1-D583-4149-9873-8239FA63F4FE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server AdminHelper", "IR Server\IR Server AdminHelper\IR Server AdminHelper.csproj", "{F6C2B2FA-026A-4483-854C-735D6E59E69C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -601,14 +599,6 @@ {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.Build.0 = Release|Any CPU {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|x86 {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.Build.0 = Release|x86 - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|x86.ActiveCfg = Debug|x86 - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|x86.Build.0 = Debug|x86 - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|Any CPU.Build.0 = Release|Any CPU - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|x86.ActiveCfg = Release|x86 - {F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -669,7 +659,6 @@ {28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03} {46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} - {F6C2B2FA-026A-4483-854C-735D6E59E69C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-11-13 02:30:12 UTC (rev 3148) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-11-13 12:04:08 UTC (rev 3149) @@ -380,8 +380,7 @@ File "..\IR Server Suite\IR Server\IR Server Configuration\bin\${Build_Type}\IR Server Configuration.*" File "..\IR Server Suite\IR Server\SourceGrid\DevAge*" File "..\IR Server Suite\IR Server\SourceGrid\SourceGrid*" - - File "..\IR Server Suite\IR Server\IR Server AdminHelper\bin\${Build_Type}\IR Server AdminHelper.*" + File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*" ${LOG_TEXT} "INFO" "Installing IR Server Plugins..." @@ -472,7 +471,6 @@ Delete "$DIR_INSTALL\DevAge*" Delete "$DIR_INSTALL\SourceGrid*" - Delete "$DIR_INSTALL\IR Server AdminHelper.*" Delete "$DIR_INSTALL\IRServerPluginInterface.*" !macroend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-11-15 02:27:20
|
Revision: 3151 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3151&view=rev Author: chef_koch Date: 2009-11-15 02:26:56 +0000 (Sun, 15 Nov 2009) Log Message: ----------- added new tool to view ir status in tray removed tray icon from configuration Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/setup/setup.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.resx trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/iconGray.ico trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/iconGreen.ico Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources/iconGray.ico Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -323,30 +323,6 @@ #region Properties - public bool AbstractRemoteMode - { - get { return _abstractRemoteMode; } - set { _abstractRemoteMode = value; } - } - - public IRServerMode Mode - { - get { return _mode; } - set { _mode = value; } - } - - public string HostComputer - { - get { return _hostComputer; } - set { _hostComputer = value; } - } - - public string ProcessPriority - { - get { return _processPriority; } - set { _processPriority = value; } - } - public string[] PluginReceive { get @@ -430,6 +406,9 @@ { InitializeComponent(); + Settings.LoadSettings(); + LoadSettings(); + try { _transceivers = BasicFunctions.AvailablePlugins(); @@ -454,13 +433,12 @@ private void buttonOK_Click(object sender, EventArgs e) { - DialogResult = DialogResult.OK; + SaveSettings(); Close(); } private void buttonCancel_Click(object sender, EventArgs e) { - DialogResult = DialogResult.Cancel; Close(); } @@ -571,5 +549,52 @@ #endregion Controls + #region Settings + + private void LoadSettings() + { + _abstractRemoteMode = Settings.AbstractRemoteMode; + _mode = Settings.Mode; + _hostComputer = Settings.HostComputer; + _processPriority = Settings.ProcessPriority; + PluginReceive = Settings.PluginNameReceive; + PluginTransmit = Settings.PluginNameTransmit; + } + + private void SaveSettings() + { + if ((Settings.AbstractRemoteMode != _abstractRemoteMode) || + (Settings.Mode != _mode) || + (Settings.HostComputer != _hostComputer) || + (Settings.ProcessPriority != _processPriority) || + (Settings.PluginNameReceive != PluginReceive) || + (Settings.PluginNameTransmit != PluginTransmit)) + { + if ( + MessageBox.Show("IR Server will now be restarted for configuration changes to take effect", + "Restarting IR Server", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == + DialogResult.OK) + { + // Change settings ... + Settings.AbstractRemoteMode = _abstractRemoteMode; + Settings.Mode = _mode; + Settings.HostComputer = _hostComputer; + Settings.ProcessPriority = _processPriority; + Settings.PluginNameReceive = PluginReceive; + Settings.PluginNameTransmit = PluginTransmit; + + Settings.SaveSettings(); + + // Restart IR Server ... + Program.RestartIRS(); + } + else + { + IrssLog.Info("Canceled settings changes"); + } + } + } + + #endregion } } \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-15 02:26:56 UTC (rev 3151) @@ -39,6 +39,7 @@ <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> + <ApplicationManifest>IR Server Configuration.exe.manifest</ApplicationManifest> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -114,6 +115,7 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> + <Compile Include="Settings.cs" /> <EmbeddedResource Include="Advanced.resx"> <DependentUpon>Advanced.cs</DependentUpon> <SubType>Designer</SubType> @@ -149,15 +151,6 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="Resources\iconGreen.ico" /> - <None Include="Resources\IconGray.ico" /> - </ItemGroup> - <ItemGroup> - <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework Client Profile</ProductName> - <Install>false</Install> - </BootstrapperPackage> <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> <Visible>False</Visible> <ProductName>.NET Framework 2.0 %28x86%29</ProductName> @@ -179,6 +172,12 @@ <Install>false</Install> </BootstrapperPackage> </ItemGroup> + <ItemGroup> + <Content Include="Resources\iconGreen.ico" /> + </ItemGroup> + <ItemGroup> + <None Include="IR Server Configuration.exe.manifest" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > + <assemblyIdentity name="IR Server Configuration" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" /> + <description>Configuration tool to change settings for IR Server.</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > + <assemblyIdentity name="IR Server Configuration" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" /> + <description>Configuration tool to change settings for IR Server.</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -90,11 +90,8 @@ internal const string ServerWindowName = "IRSS - " + ServerName; internal const string ServerDisplayName = "IR Server"; - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe"); - internal static readonly Icon _iconGray = new Icon(Resources.iconGray, new Size(16, 16)); - internal static readonly Icon _iconGreen = new Icon(Resources.iconGreen, new Size(16, 16)); private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30); #endregion Constants @@ -107,9 +104,7 @@ private static string[] _pluginNameReceive; private static string _pluginNameTransmit; private static string _processPriority; - private static NotifyIcon _notifyIcon; private static bool _inConfiguration; - private static Thread thread; private static ServiceController serviceController; private static ServiceController[] serviceControllers; private static IntPtr irsWindow; @@ -128,45 +123,17 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(true); - // allow only one application instance - if (IrssUtils.ProcessHelper.IsProcessAlreadyRunning()) + if (ProcessHelper.IsProcessAlreadyRunning()) return; IrssLog.LogLevel = IrssLog.Level.Debug; IrssLog.Open("IR Server Configuration.log"); - _notifyIcon = new NotifyIcon(); + Application.Run(new Config()); - _notifyIcon.ContextMenuStrip = new ContextMenuStrip(); - _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripLabel(ServerDisplayName)); - _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator()); - _notifyIcon.ContextMenuStrip.Items.Add("&Setup", null, OpenConfiguration); - _notifyIcon.ContextMenuStrip.Items.Add("&Quit", null, ClickQuit); - _notifyIcon.DoubleClick += new EventHandler(OpenConfiguration); - _notifyIcon.Icon = new System.Drawing.Icon(Resources.iconGray, new System.Drawing.Size(16, 16)); - _notifyIcon.Text = ServerDisplayName; - _notifyIcon.Visible = true; - - thread = new Thread(new ThreadStart(UpdateIcon)); - thread.IsBackground = true; - thread.Start(); - - Application.Run(); - thread.Abort(); - _notifyIcon.Visible = false; - _notifyIcon = null; + IrssLog.Close(); } - private static void UpdateIcon() - { - while (thread != null && thread.IsAlive) - { - getStatus(); - _notifyIcon.Icon = getIcon(); - Thread.Sleep(1000); - } - } - internal static void getStatus() { _irsStatus = IrsStatus.NotRunning; @@ -191,260 +158,6 @@ catch { } } - private static Icon getIcon() - { - return (_irsStatus == IrsStatus.NotRunning) ? _iconGray : _iconGreen; - } - - private static void ClickQuit(object sender, EventArgs e) - { - Application.Exit(); - } - - private static void OpenConfiguration(object sender, EventArgs e) - { - if (_inConfiguration) - return; - - IrssLog.Info("Setup"); - - LoadSettings(); - - Config config = new Config(); - - config.AbstractRemoteMode = _abstractRemoteMode; - config.Mode = _mode; - config.HostComputer = _hostComputer; - config.ProcessPriority = _processPriority; - config.PluginReceive = _pluginNameReceive; - config.PluginTransmit = _pluginNameTransmit; - - _inConfiguration = true; - - if (config.ShowDialog() == DialogResult.OK) - { - if ((_abstractRemoteMode != config.AbstractRemoteMode) || - (_mode != config.Mode) || - (_hostComputer != config.HostComputer) || - (_processPriority != config.ProcessPriority) || - (_pluginNameReceive != config.PluginReceive) || - (_pluginNameTransmit != config.PluginTransmit)) - { - if ( - MessageBox.Show("IR Server will now be restarted for configuration changes to take effect", - "Restarting IR Server", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == - DialogResult.OK) - { - // Change settings ... - _abstractRemoteMode = config.AbstractRemoteMode; - _mode = config.Mode; - _hostComputer = config.HostComputer; - _processPriority = config.ProcessPriority; - _pluginNameReceive = config.PluginReceive; - _pluginNameTransmit = config.PluginTransmit; - - SaveSettings(); - - // Restart IR Server ... - RestartIRS(); - } - else - { - IrssLog.Info("Canceled settings changes"); - } - } - } - - _inConfiguration = false; - - IrssLog.Close(); - } - - private static void LoadSettings() - { - IrssLog.Info("Loading settings ..."); - - _abstractRemoteMode = true; - _mode = IRServerMode.ServerMode; - _hostComputer = String.Empty; - _processPriority = "No Change"; - _pluginNameReceive = null; - _pluginNameTransmit = String.Empty; - - XmlDocument doc = new XmlDocument(); - - try - { - doc.Load(ConfigurationFile); - } - catch (DirectoryNotFoundException) - { - IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", - ConfigurationFile); - - Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile)); - - CreateDefaultSettings(); - return; - } - catch (FileNotFoundException) - { - IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile); - - CreateDefaultSettings(); - return; - } - catch (Exception ex) - { - IrssLog.Error(ex); - return; - } - - try - { - _abstractRemoteMode = bool.Parse(doc.DocumentElement.Attributes["AbstractRemoteMode"].Value); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _mode = - (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _hostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _processPriority = doc.DocumentElement.Attributes["ProcessPriority"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _pluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - string receivers = doc.DocumentElement.Attributes["PluginReceive"].Value; - if (!String.IsNullOrEmpty(receivers)) - _pluginNameReceive = receivers.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - } - - private static void SaveSettings() - { - IrssLog.Info("Saving settings ..."); - - try - { - using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8)) - { - writer.Formatting = Formatting.Indented; - writer.Indentation = 1; - writer.IndentChar = (char)9; - writer.WriteStartDocument(true); - writer.WriteStartElement("settings"); // <settings> - - writer.WriteAttributeString("AbstractRemoteMode", _abstractRemoteMode.ToString()); - writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), _mode)); - writer.WriteAttributeString("HostComputer", _hostComputer); - writer.WriteAttributeString("ProcessPriority", _processPriority); - writer.WriteAttributeString("PluginTransmit", _pluginNameTransmit); - - if (_pluginNameReceive != null) - { - StringBuilder receivers = new StringBuilder(); - for (int index = 0; index < _pluginNameReceive.Length; index++) - { - receivers.Append(_pluginNameReceive[index]); - - if (index < _pluginNameReceive.Length - 1) - receivers.Append(','); - } - writer.WriteAttributeString("PluginReceive", receivers.ToString()); - } - else - { - writer.WriteAttributeString("PluginReceive", String.Empty); - } - - writer.WriteEndElement(); // </settings> - writer.WriteEndDocument(); - } - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - private static void CreateDefaultSettings() - { - try - { - string[] blasters = DetectBlasters(); - if (blasters == null) - _pluginNameTransmit = String.Empty; - else - _pluginNameTransmit = blasters[0]; - } - catch (Exception ex) - { - IrssLog.Error(ex); - _pluginNameTransmit = String.Empty; - } - - try - { - string[] receivers = DetectReceivers(); - if (receivers == null) - _pluginNameReceive = null; - else - _pluginNameReceive = receivers; - } - catch (Exception ex) - { - IrssLog.Error(ex); - _pluginNameReceive = null; - } - - try - { - SaveSettings(); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - private static ServiceController getServiceController() { serviceControllers = ServiceController.GetServices(); @@ -593,7 +306,7 @@ } } - private static void RestartIRS() + internal static void RestartIRS() { IrssLog.Info("Restarting IR Server"); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.Designer.cs 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.Designer.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -60,13 +60,6 @@ } } - internal static System.Drawing.Icon iconGray { - get { - object obj = ResourceManager.GetObject("iconGray", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - internal static System.Drawing.Icon iconGreen { get { object obj = ResourceManager.GetObject("iconGreen", resourceCulture); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.resx =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.resx 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.resx 2009-11-15 02:26:56 UTC (rev 3151) @@ -118,10 +118,7 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="iconGray" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\IconGray.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="iconGreen" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\iconGreen.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\resources\icongreen.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file Deleted: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources/iconGray.ico =================================================================== (Binary files differ) Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,206 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using System.Xml; +using IrssUtils; + +namespace IRServer.Configuration +{ + static class Settings + { + private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); + + public static bool AbstractRemoteMode { get; set; } + public static IRServerMode Mode { get; set; } + public static string HostComputer { get; set; } + public static string ProcessPriority { get; set; } + public static string[] PluginNameReceive { get; set; } + public static string PluginNameTransmit { get; set; } + + public static void LoadSettings() + { + IrssLog.Info("Loading settings ..."); + + AbstractRemoteMode = true; + Mode = IRServerMode.ServerMode; + HostComputer = String.Empty; + ProcessPriority = "No Change"; + PluginNameReceive = null; + PluginNameTransmit = String.Empty; + + XmlDocument doc = new XmlDocument(); + + try + { + doc.Load(ConfigurationFile); + } + catch (DirectoryNotFoundException) + { + IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", + ConfigurationFile); + + Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile)); + + CreateDefaultSettings(); + return; + } + catch (FileNotFoundException) + { + IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile); + + CreateDefaultSettings(); + return; + } + catch (Exception ex) + { + IrssLog.Error(ex); + return; + } + + try + { + AbstractRemoteMode = bool.Parse(doc.DocumentElement.Attributes["AbstractRemoteMode"].Value); + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + Mode = + (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + HostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + ProcessPriority = doc.DocumentElement.Attributes["ProcessPriority"].Value; + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + PluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value; + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + string receivers = doc.DocumentElement.Attributes["PluginReceive"].Value; + if (!String.IsNullOrEmpty(receivers)) + PluginNameReceive = receivers.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + } + + public static void SaveSettings() + { + IrssLog.Info("Saving settings ..."); + + try + { + using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8)) + { + writer.Formatting = Formatting.Indented; + writer.Indentation = 1; + writer.IndentChar = (char)9; + writer.WriteStartDocument(true); + writer.WriteStartElement("settings"); // <settings> + + writer.WriteAttributeString("AbstractRemoteMode", AbstractRemoteMode.ToString()); + writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), Mode)); + writer.WriteAttributeString("HostComputer", HostComputer); + writer.WriteAttributeString("ProcessPriority", ProcessPriority); + writer.WriteAttributeString("PluginTransmit", PluginNameTransmit); + + if (PluginNameReceive != null) + { + StringBuilder receivers = new StringBuilder(); + for (int index = 0; index < PluginNameReceive.Length; index++) + { + receivers.Append(PluginNameReceive[index]); + + if (index < PluginNameReceive.Length - 1) + receivers.Append(','); + } + writer.WriteAttributeString("PluginReceive", receivers.ToString()); + } + else + { + writer.WriteAttributeString("PluginReceive", String.Empty); + } + + writer.WriteEndElement(); // </settings> + writer.WriteEndDocument(); + } + } + catch (Exception ex) + { + IrssLog.Error(ex); + } + } + + private static void CreateDefaultSettings() + { + try + { + string[] blasters = Program.DetectBlasters(); + if (blasters == null) + PluginNameTransmit = String.Empty; + else + PluginNameTransmit = blasters[0]; + } + catch (Exception ex) + { + IrssLog.Error(ex); + PluginNameTransmit = String.Empty; + } + + try + { + string[] receivers = Program.DetectReceivers(); + if (receivers == null) + PluginNameReceive = null; + else + PluginNameReceive = receivers; + } + catch (Exception ex) + { + IrssLog.Error(ex); + PluginNameReceive = null; + } + + try + { + SaveSettings(); + } + catch (Exception ex) + { + IrssLog.Error(ex); + } + } + } +} \ No newline at end of file Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray ___________________________________________________________________ Added: svn:ignore + [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.21022</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{5C0DF76E-D1AE-4161-B8D1-843925C8AB58}</ProjectGuid> + <OutputType>WinExe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>IRServer.Tray</RootNamespace> + <AssemblyName>IR Server Tray</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <StartupObject>IRServer.Tray.Program</StartupObject> + <ApplicationIcon>Resources\iconGreen.ico</ApplicationIcon> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\Debug\</OutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\Release\</OutputPath> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.ServiceProcess" /> + <Reference Include="System.Data" /> + <Reference Include="System.Deployment" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + <SubType>Designer</SubType> + </EmbeddedResource> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DependentUpon>Resources.resx</DependentUpon> + <DesignTime>True</DesignTime> + </Compile> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> + <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> + <Name>IrssUtils</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Content Include="Resources\iconGray.ico" /> + <Content Include="Resources\iconGreen.ico" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,204 @@ +using System; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.ServiceProcess; +using System.Threading; +using System.Windows.Forms; +using IRServer.Tray.Properties; +using IrssUtils; + +namespace IRServer.Tray +{ + #region Enumerations + + /// <summary> + /// Describes the operation mode of IR Server. + /// </summary> + internal enum IRServerMode + { + /// <summary> + /// Acts as a standard Server (Default). + /// </summary> + ServerMode = 0, + /// <summary> + /// Relays button presses to another IR Server. + /// </summary> + RelayMode = 1, + /// <summary> + /// Acts as a repeater for another IR Server's blasting. + /// </summary> + RepeaterMode = 2, + } + + /// <summary> + /// Describes the actual status of IR Server + /// </summary> + internal enum IrsStatus + { + /// <summary> + /// IR Server is not running. + /// </summary> + NotRunning, + /// <summary> + /// IR Server is running as Service. + /// </summary> + RunningService, + /// <summary> + /// IR Server is running as Application. + /// </summary> + RunningApplication + } + + #endregion Enumerations + + static class Program + { + #region Constants + + internal const string ServerName = "IRServer"; + internal const string ServerWindowName = "IRSS - " + ServerName; + internal const string ServerDisplayName = "IR Server"; + + private static readonly string _configExe = Path.Combine(Common.FolderProgramFiles, @"IR Server Configuration.exe"); + private static readonly string _translatorExe = Path.Combine(Common.FolderProgramFiles, @"Translator.exe"); + private static readonly string _debugClientExe = Path.Combine(Common.FolderProgramFiles, @"DebugClient.exe"); + + #endregion Constants + + #region Variables + + private static NotifyIcon _notifyIcon; + private static Thread thread; + + internal static readonly Icon _iconGray = new Icon(Resources.iconGray, new Size(16, 16)); + internal static readonly Icon _iconGreen = new Icon(Resources.iconGreen, new Size(16, 16)); + + private static ServiceController[] serviceControllers; + private static IntPtr irsWindow; + + internal static IrsStatus _irsStatus; + internal static bool _serviceInstalled; + + #endregion Variables + + /// <summary> + /// Der Haupteinstiegspunkt f\xFCr die Anwendung. + /// </summary> + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + if (ProcessHelper.IsProcessAlreadyRunning()) + return; + + _notifyIcon = new NotifyIcon(); + _notifyIcon.ContextMenuStrip = new ContextMenuStrip(); + _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripLabel("IR Server Tray")); + _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator()); + + _notifyIcon.ContextMenuStrip.Items.Add("&Configuration", GetExeIconAsImage(_configExe), ClickConfiguration); + + if (File.Exists(_translatorExe)) + _notifyIcon.ContextMenuStrip.Items.Add("&Translator", GetExeIconAsImage(_translatorExe), ClickTranslator); + + if (File.Exists(_debugClientExe)) + _notifyIcon.ContextMenuStrip.Items.Add("&Debug Client", GetExeIconAsImage(_debugClientExe), ClickDebugClient); + + _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator()); + _notifyIcon.ContextMenuStrip.Items.Add("&Exit", null, ClickExit); + //_notifyIcon.DoubleClick += new EventHandler(OpenConfiguration); + _notifyIcon.Icon = new System.Drawing.Icon(Resources.iconGray, new System.Drawing.Size(16, 16)); + _notifyIcon.Text = ServerDisplayName; + _notifyIcon.Visible = true; + + thread = new Thread(new ThreadStart(UpdateIcon)); + thread.IsBackground = true; + thread.Start(); + + Application.Run(); + thread.Abort(); + _notifyIcon.Visible = false; + _notifyIcon = null; + } + + #region EventHandler + + private static void ClickConfiguration(object sender, EventArgs e) + { + Process.Start(_configExe); + } + + private static void ClickTranslator(object sender, EventArgs e) + { + Process.Start(_translatorExe); + } + + private static void ClickDebugClient(object sender, EventArgs e) + { + Process.Start(_debugClientExe); + } + + private static void ClickExit(object sender, EventArgs e) + { + Application.Exit(); + } + + #endregion + + #region Update IR Server Status + + private static void UpdateIcon() + { + while (thread != null && thread.IsAlive) + { + getStatus(); + _notifyIcon.Icon = getIcon(); + Thread.Sleep(1000); + } + } + + internal static void getStatus() + { + _irsStatus = IrsStatus.NotRunning; + _serviceInstalled = false; + serviceControllers = ServiceController.GetServices(); + foreach (ServiceController serviceController in serviceControllers) + { + if (serviceController.ServiceName == ServerName) + { + _serviceInstalled = true; + if (serviceController.Status == ServiceControllerStatus.Running) + _irsStatus = IrsStatus.RunningService; + } + } + + try + { + irsWindow = Win32.FindWindowByTitle(ServerWindowName); + if (irsWindow != IntPtr.Zero) + _irsStatus = IrsStatus.RunningApplication; + } + catch { } + } + + private static Icon getIcon() + { + return (_irsStatus == IrsStatus.NotRunning) ? _iconGray : _iconGreen; + } + + #endregion + + private static Image GetExeIconAsImage(string filepath) + { + if (filepath == null) return null; + + Icon icon = Icon.ExtractAssociatedIcon(filepath); + if (icon == null) return null; + + return icon.ToBitmap(); + } + } +} Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/AssemblyInfo.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/AssemblyInfo.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen �ber eine Assembly werden �ber die folgenden +// Attribute gesteuert. �ndern Sie diese Attributwerte, um die Informationen zu �ndern, +// die mit einer Assembly verkn�pft sind. +[assembly: AssemblyTitle("IR Server Tray")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("IR Server Tray")] +[assembly: AssemblyCopyright("Copyright � 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// f�r COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen m�ssen, legen Sie das ComVisible-Attribut f�r diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt f�r COM verf�gbar gemacht wird +[assembly: Guid("2d93c6b4-c2cd-4b91-a3da-421d4e3eb11a")] + +// Versionsinformationen f�r eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie k�nnen alle Werte angeben oder die standardm��igen Build- und Revisionsnummern +// �bernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.4.2.0")] +[assembly: AssemblyFileVersion("1.4.2.0")] Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.Designer.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.Designer.cs 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,77 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:2.0.50727.4927 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace IRServer.Tray.Properties { + using System; + + + /// <summary> + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// </summary> + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// <summary> + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IRServer.Tray.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static System.Drawing.Icon iconGray { + get { + object obj = ResourceManager.GetObject("iconGray", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + internal static System.Drawing.Icon iconGreen { + get { + object obj = ResourceManager.GetObject("iconGreen", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + } +} Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.resx =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.resx (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/Resources.resx 2009-11-15 02:26:56 UTC (rev 3151) @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="iconGray" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\resources\icongray.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="iconGreen" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\resources\icongreen.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> +</root> Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/iconGray.ico =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/iconGray.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/iconGreen.ico =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/iconGreen.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-15 02:26:56 UTC (rev 3151) @@ -121,11 +121,13 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pinnacle Serial Receiver", "IR Server Plugins\Pinnacle Serial Receiver\Pinnacle Serial Receiver.csproj", "{EBFA0F67-1EB6-4282-8475-C397B9852B3F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireDTV Receiver", "IR Server Plugins\FireDTV Receiver\FireDTV Receiver.csproj", "{D88EDBC1-D583-4149-9873-8239FA63F4FE}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server", "IR Server\IR Server\IR Server.csproj", "{46F1DB42-F082-4200-B939-6E4B72A8117C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server Configuration", "IR Server\IR Server Configuration\IR Server Configuration.csproj", "{1E84C2ED-92FC-43A4-9C12-374B3347F6D7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireDTV Receiver", "IR Server Plugins\FireDTV Receiver\FireDTV Receiver.csproj", "{D88EDBC1-D583-4149-9873-8239FA63F4FE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server Tray", "IR Server\IR Server Tray\IR Server Tray.csproj", "{5C0DF76E-D1AE-4161-B8D1-843925C8AB58}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -575,6 +577,14 @@ {EBFA0F67-1EB6-4282-8475-C397B9852B3F}.Release|Any CPU.Build.0 = Release|Any CPU {EBFA0F67-1EB6-4282-8475-C397B9852B3F}.Release|x86.ActiveCfg = Release|x86 {EBFA0F67-1EB6-4282-8475-C397B9852B3F}.Release|x86.Build.0 = Release|x86 + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.ActiveCfg = Debug|x86 + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.Build.0 = Debug|x86 + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.Build.0 = Release|Any CPU + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|x86 + {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.Build.0 = Release|x86 {46F1DB42-F082-4200-B939-6E4B72A8117C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {46F1DB42-F082-4200-B939-6E4B72A8117C}.Debug|Any CPU.Build.0 = Debug|Any CPU {46F1DB42-F082-4200-B939-6E4B72A8117C}.Debug|x86.ActiveCfg = Debug|x86 @@ -591,14 +601,14 @@ {1E84C2ED-92FC-43A4-9C12-374B3347F6D7}.Release|Any CPU.Build.0 = Release|Any CPU {1E84C2ED-92FC-43A4-9C12-374B3347F6D7}.Release|x86.ActiveCfg = Release|x86 {1E84C2ED-92FC-43A4-9C12-374B3347F6D7}.Release|x86.Build.0 = Release|x86 - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.ActiveCfg = Debug|x86 - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.Build.0 = Debug|x86 - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.Build.0 = Release|Any CPU - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|x86 - {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.Build.0 = Release|x86 + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Debug|x86.ActiveCfg = Debug|x86 + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Debug|x86.Build.0 = Debug|x86 + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Release|Any CPU.Build.0 = Release|Any CPU + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Release|x86.ActiveCfg = Release|x86 + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -659,6 +669,7 @@ {28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03} {46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} + {5C0DF76E-D1AE-4161-B8D1-843925C8AB58} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-11-13 12:21:41 UTC (rev 3150) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-11-15 02:26:56 UTC (rev 3151) @@ -359,6 +359,7 @@ ${StopService} "IRServer" ${KILLPROCESS} "IR Server.exe" ${KILLPROCESS} "IR Server Configuration.exe" + ${KILLPROCESS} "IR Server Tray.exe" ; Use the all users context SetShellVarContext all @@ -381,6 +382,9 @@ File "..\IR Server Suite\IR Server\SourceGrid\DevAge*" File "..\IR Server Suite\IR Server\SourceGrid\SourceGrid*" + ${LOG_TEXT} "INFO" "Installing IR Server Tray..." + File "..\IR Server Suite\IR Server\IR Server Tray\bin\${Build_Type}\IR Server Tray.*" + File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*" ${LOG_TEXT} "INFO" "Installing IR Server Plugins..." @@ -435,6 +439,7 @@ ; Create start menu shortcut CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\IR Server Configuration.lnk" "$DIR_INSTALL\IR Server Configuration.exe" "" "$DIR_INSTALL\IR Server Configuration.exe" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\IR Server Tray.lnk" "$DIR_INSTALL\IR Server Tray.exe" "" "$DIR_INSTALL\IR Server Tray.exe" 0 ; Install Server/Service ${If} $ServerServiceMode == "IRServerAsApplication" @@ -444,7 +449,8 @@ ${LOG_TEXT} "INFO" "Installing IR Server as Service..." ExecWait '"$DIR_INSTALL\IR Server.exe" /install' ${EndIf} - !insertmacro SetAutoRun "IR Server Configuration" '"$DIR_INSTALL\IR Server Configuration.exe"' + ${LOG_TEXT} "INFO" "Adding IR Server Tray to Autostart..." + !insertmacro SetAutoRun "IR Server Tray" '"$DIR_INSTALL\IR Server Tray.exe"' ${MementoSectionEnd} !macro Remove_${SectionIRServer} @@ -452,15 +458,18 @@ ${StopService} "IRServer" ${KILLPROCESS} "IR Server.exe" ${KILLPROCESS} "IR Server Configuration.exe" + ${KILLPROCESS} "IR Server Tray.exe" ${LOG_TEXT} "INFO" "Removing IR Server from Autostart..." !insertmacro RemoveAutoRun "IR Server" ${LOG_TEXT} "INFO" "Uninstalling IR Server as Service..." ExecWait '"$DIR_INSTA... [truncated message content] |
From: <che...@us...> - 2009-11-15 10:48:28
|
Revision: 3153 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3153&view=rev Author: chef_koch Date: 2009-11-15 10:48:19 +0000 (Sun, 15 Nov 2009) Log Message: ----------- fixed loading receiver/blaster settings in configuration added shared library for IRServer apps: server, configuration and tray tool moved IRServer Settings to IRServer.Shared, including load from, save to xml file and create defaults moved enumerations to IRServer.Shared: IRServerMode, IrsStatus moved various other methods to IRServer.Shared: detecting hardware, getting server status.... Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server Installer.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/setup/setup.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Shared.cs Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server Installer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server Installer.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server Installer.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -51,8 +51,8 @@ serviceProcessInstaller.Password = null; // Service Information - serviceInstaller.ServiceName = Program.ServiceName; - serviceInstaller.DisplayName = Program.ServiceDisplayName; + serviceInstaller.ServiceName = Shared.ServerName; + serviceInstaller.DisplayName = Shared.ServerDisplayName; serviceInstaller.Description = Program.ServiceDescription; serviceInstaller.StartType = ServiceStartMode.Automatic; @@ -90,7 +90,7 @@ ManagementScope mgmtScope = new ManagementScope(@"root\CIMV2", coOptions); mgmtScope.Connect(); - string path = string.Format("Win32_Service.Name='{0}'", Program.ServiceName); + string path = string.Format("Win32_Service.Name='{0}'", Shared.ServerName); using (ManagementObject wmiService = new ManagementObject(path)) { Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -36,31 +36,7 @@ namespace IRServer { - - #region Enumerations - /// <summary> - /// Describes the operation mode of the IR Server. - /// </summary> - internal enum IRServerMode - { - /// <summary> - /// Acts as a standard Server (Default). - /// </summary> - ServerMode = 0, - /// <summary> - /// Relays button presses to another IR Server. - /// </summary> - RelayMode = 1, - /// <summary> - /// Acts as a repeater for another IR Server's blasting. - /// </summary> - RepeaterMode = 2, - } - - #endregion Enumerations - - /// <summary> /// IR Server. /// </summary> internal class IRServer : ServiceBase @@ -73,25 +49,15 @@ private static readonly string AbstractRemoteSchemaFile = Path.Combine(Common.FolderAppData, "IR Server\\Abstract Remote Maps\\RemoteTable.xsd"); - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, - "IR Server\\IR Server.xml"); - #endregion Constants #region Variables private DataSet _abstractRemoteButtons; - private bool _abstractRemoteMode; private Client _client; - private string _hostComputer; - private IRServerMode _mode; - private string[] _pluginNameReceive; - - private string _pluginNameTransmit; private List<PluginBase> _pluginReceive; private PluginBase _pluginTransmit; - private string _processPriority; private bool _registered; // Used for relay and repeater modes. private List<ClientManager> _registeredClients; @@ -107,7 +73,7 @@ /// </summary> public IRServer() { - ServiceName = Program.ServiceName; + ServiceName = Shared.ServerName; //this.EventLog.Log = "Application"; //this.AutoLog = true; @@ -159,19 +125,19 @@ { IrssLog.Info("Starting IR Server ..."); - LoadSettings(); + Settings.LoadSettings(); #region Process Priority Adjustment - if (!_processPriority.Equals("No Change", StringComparison.OrdinalIgnoreCase)) + if (!Settings.ProcessPriority.Equals("No Change", StringComparison.OrdinalIgnoreCase)) { try { ProcessPriorityClass priority = - (ProcessPriorityClass) Enum.Parse(typeof (ProcessPriorityClass), _processPriority, true); + (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), Settings.ProcessPriority, true); Process.GetCurrentProcess().PriorityClass = priority; - IrssLog.Info("Process priority set to: {0}", _processPriority); + IrssLog.Info("Process priority set to: {0}", Settings.ProcessPriority); } catch (Exception ex) { @@ -186,25 +152,25 @@ _pluginReceive = null; _pluginTransmit = null; - if (_pluginNameReceive == null && String.IsNullOrEmpty(_pluginNameTransmit)) + if (Settings.PluginNameReceive == null && String.IsNullOrEmpty(Settings.PluginNameTransmit)) { IrssLog.Warn("No transmit or receive plugins loaded"); } else { - if (_pluginNameReceive == null) + if (Settings.PluginNameReceive == null) { IrssLog.Warn("No receiver plugins loaded"); } else { - _pluginReceive = new List<PluginBase>(_pluginNameReceive.Length); + _pluginReceive = new List<PluginBase>(Settings.PluginNameReceive.Length); - for (int index = 0; index < _pluginNameReceive.Length; index++) + for (int index = 0; index < Settings.PluginNameReceive.Length; index++) { try { - string pluginName = _pluginNameReceive[index]; + string pluginName = Settings.PluginNameReceive[index]; PluginBase plugin = Program.GetPlugin(pluginName); @@ -216,8 +182,8 @@ { _pluginReceive.Add(plugin); - if (!String.IsNullOrEmpty(_pluginNameTransmit) && - plugin.Name.Equals(_pluginNameTransmit, StringComparison.OrdinalIgnoreCase)) + if (!String.IsNullOrEmpty(Settings.PluginNameTransmit) && + plugin.Name.Equals(Settings.PluginNameTransmit, StringComparison.OrdinalIgnoreCase)) _pluginTransmit = plugin; } } @@ -231,7 +197,7 @@ _pluginReceive = null; } - if (String.IsNullOrEmpty(_pluginNameTransmit)) + if (String.IsNullOrEmpty(Settings.PluginNameTransmit)) { IrssLog.Warn("No transmit plugin loaded"); } @@ -239,7 +205,7 @@ { try { - _pluginTransmit = Program.GetPlugin(_pluginNameTransmit); + _pluginTransmit = Program.GetPlugin(Settings.PluginNameTransmit); } catch (Exception ex) { @@ -254,7 +220,7 @@ try { - switch (_mode) + switch (Settings.Mode) { case IRServerMode.ServerMode: StartServer(); @@ -310,7 +276,7 @@ if (mouseReceiver != null) mouseReceiver.MouseCallback += MouseHandlerCallback; - if (plugin.Name.Equals(_pluginNameTransmit, StringComparison.OrdinalIgnoreCase)) + if (plugin.Name.Equals(Settings.PluginNameTransmit, StringComparison.OrdinalIgnoreCase)) { startedTransmit = true; IrssLog.Info("Transmit and Receive plugin started: \"{0}\"", plugin.Name); @@ -343,11 +309,11 @@ { _pluginTransmit.Start(); - IrssLog.Info("Transmit plugin started: \"{0}\"", _pluginNameTransmit); + IrssLog.Info("Transmit plugin started: \"{0}\"", Settings.PluginNameTransmit); } catch (Exception ex) { - IrssLog.Error("Failed to start transmit plugin: \"{0}\"", _pluginNameTransmit); + IrssLog.Error("Failed to start transmit plugin: \"{0}\"", Settings.PluginNameTransmit); IrssLog.Error(ex); _pluginTransmit = null; @@ -358,7 +324,7 @@ #region Setup Abstract Remote Model processing - if (_abstractRemoteMode) + if (Settings.AbstractRemoteMode) { IrssLog.Info("IR Server is running in Abstract Remote mode"); @@ -383,7 +349,7 @@ { IrssLog.Info("Stopping IR Server ..."); - if (_mode == IRServerMode.ServerMode) + if (Settings.Mode == IRServerMode.ServerMode) { try { @@ -455,7 +421,7 @@ // Stop Service try { - switch (_mode) + switch (Settings.Mode) { case IRServerMode.ServerMode: StopServer(); @@ -534,7 +500,7 @@ } // Inform clients ... - if (_mode == IRServerMode.ServerMode) + if (Settings.Mode == IRServerMode.ServerMode) { IrssMessage message = new IrssMessage(MessageType.ServerSuspend, MessageFlags.Notify); SendToAll(message); @@ -583,7 +549,7 @@ } // Inform clients ... - if (_mode == IRServerMode.ServerMode) + if (Settings.Mode == IRServerMode.ServerMode) { IrssMessage message = new IrssMessage(MessageType.ServerResume, MessageFlags.Notify); SendToAll(message); @@ -654,7 +620,7 @@ { IrssLog.Info("Connected to another server"); - if (_mode == IRServerMode.RepeaterMode) + if (Settings.Mode == IRServerMode.RepeaterMode) { IrssMessage message = new IrssMessage(MessageType.RegisterRepeater, MessageFlags.Request); _client.Send(message); @@ -717,7 +683,7 @@ { StartServer(); - IPAddress serverIP = Client.GetIPFromName(_hostComputer); + IPAddress serverIP = Client.GetIPFromName(Settings.HostComputer); IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort); StartClient(endPoint); @@ -749,7 +715,7 @@ { StartServer(); - IPAddress serverIP = Client.GetIPFromName(_hostComputer); + IPAddress serverIP = Client.GetIPFromName(Settings.HostComputer); IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort); StartClient(endPoint); @@ -793,10 +759,10 @@ string messageDeviceName = deviceName; string messageKeyCode = keyCode; - switch (_mode) + switch (Settings.Mode) { case IRServerMode.ServerMode: - if (_abstractRemoteMode) + if (Settings.AbstractRemoteMode) { string abstractButton = LookupAbstractButton(deviceName, keyCode); if (!String.IsNullOrEmpty(abstractButton)) @@ -832,7 +798,7 @@ BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length); keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length); - switch (_mode) + switch (Settings.Mode) { case IRServerMode.ServerMode: { @@ -858,7 +824,7 @@ BitConverter.GetBytes(vKey).CopyTo(bytes, 0); BitConverter.GetBytes(keyUp).CopyTo(bytes, 4); - switch (_mode) + switch (Settings.Mode) { case IRServerMode.ServerMode: { @@ -892,7 +858,7 @@ BitConverter.GetBytes(deltaY).CopyTo(bytes, 4); BitConverter.GetBytes(buttons).CopyTo(bytes, 8); - switch (_mode) + switch (Settings.Mode) { case IRServerMode.ServerMode: { @@ -1168,7 +1134,7 @@ #region ForwardRemoteEvent case MessageType.ForwardRemoteEvent: - if (_mode == IRServerMode.RelayMode) + if (Settings.Mode == IRServerMode.RelayMode) { IrssMessage forward = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); @@ -1178,7 +1144,7 @@ { byte[] data = combo.Message.GetDataAsBytes(); - if (_abstractRemoteMode) + if (Settings.AbstractRemoteMode) { // Decode message ... int deviceNameSize = BitConverter.ToInt32(data, 0); @@ -1242,7 +1208,7 @@ #region ForwardKeyboardEvent case MessageType.ForwardKeyboardEvent: - if (_mode == IRServerMode.RelayMode) + if (Settings.Mode == IRServerMode.RelayMode) { IrssMessage forward = new IrssMessage(MessageType.ForwardKeyboardEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); @@ -1261,7 +1227,7 @@ #region ForwardMouseEvent case MessageType.ForwardMouseEvent: - if (_mode == IRServerMode.RelayMode) + if (Settings.Mode == IRServerMode.RelayMode) { IrssMessage forward = new IrssMessage(MessageType.ForwardMouseEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); @@ -1283,7 +1249,7 @@ { IrssMessage response = new IrssMessage(MessageType.BlastIR, MessageFlags.Response); - if (_mode == IRServerMode.RelayMode) + if (Settings.Mode == IRServerMode.RelayMode) { response.Flags |= MessageFlags.Failure; } @@ -1312,7 +1278,7 @@ { IrssMessage response = new IrssMessage(MessageType.LearnIR, MessageFlags.Response); - if (_mode == IRServerMode.RelayMode) + if (Settings.Mode == IRServerMode.RelayMode) { response.Flags |= MessageFlags.Failure; } @@ -1428,7 +1394,7 @@ case MessageType.ActiveBlasters: { IrssMessage response = new IrssMessage(MessageType.ActiveBlasters, MessageFlags.Response); - response.SetDataAsString(_pluginNameTransmit); + response.SetDataAsString(Settings.PluginNameTransmit); SendTo(combo.Manager, response); break; @@ -1442,14 +1408,14 @@ { IrssMessage response = new IrssMessage(MessageType.ActiveReceivers, MessageFlags.Response); - if (_pluginNameReceive != null) + if (Settings.PluginNameReceive != null) { StringBuilder receivers = new StringBuilder(); - for (int index = 0; index < _pluginNameReceive.Length; index++) + for (int index = 0; index < Settings.PluginNameReceive.Length; index++) { - receivers.Append(_pluginNameReceive[index]); + receivers.Append(Settings.PluginNameReceive[index]); - if (index < _pluginNameReceive.Length - 1) + if (index < Settings.PluginNameReceive.Length - 1) receivers.Append(','); } @@ -1543,7 +1509,7 @@ case MessageType.DetectedBlasters: { IrssMessage response = new IrssMessage(MessageType.DetectedBlasters, MessageFlags.Response); - string[] detectedBlasters = Program.DetectBlasters(); + string[] detectedBlasters = Shared.DetectBlasters(); if (detectedBlasters != null && detectedBlasters.Length > 0) { @@ -1574,7 +1540,7 @@ case MessageType.DetectedReceivers: { IrssMessage response = new IrssMessage(MessageType.DetectedReceivers, MessageFlags.Response); - string[] detectedReceivers = Program.DetectReceivers(); + string[] detectedReceivers = Shared.DetectReceivers(); if (detectedReceivers != null && detectedReceivers.Length > 0) { @@ -1650,171 +1616,6 @@ } } - private void LoadSettings() - { - _abstractRemoteMode = true; - _mode = IRServerMode.ServerMode; - _hostComputer = String.Empty; - _processPriority = "No Change"; - _pluginNameReceive = null; - _pluginNameTransmit = String.Empty; - - XmlDocument doc = new XmlDocument(); - - try - { - doc.Load(ConfigurationFile); - } - catch (DirectoryNotFoundException) - { - IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", - ConfigurationFile); - - Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile)); - - CreateDefaultSettings(); - return; - } - catch (FileNotFoundException) - { - IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile); - - CreateDefaultSettings(); - return; - } - catch (Exception ex) - { - IrssLog.Error(ex); - return; - } - - try - { - _abstractRemoteMode = bool.Parse(doc.DocumentElement.Attributes["AbstractRemoteMode"].Value); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _mode = - (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _hostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _processPriority = doc.DocumentElement.Attributes["ProcessPriority"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - _pluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - string receivers = doc.DocumentElement.Attributes["PluginReceive"].Value; - if (!String.IsNullOrEmpty(receivers)) - _pluginNameReceive = receivers.Split(new char[] {','}, StringSplitOptions.RemoveEmptyEntries); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - } - - private void SaveSettings() - { - try - { - using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8)) - { - writer.Formatting = Formatting.Indented; - writer.Indentation = 1; - writer.IndentChar = (char) 9; - writer.WriteStartDocument(true); - writer.WriteStartElement("settings"); // <settings> - - writer.WriteAttributeString("AbstractRemoteMode", _abstractRemoteMode.ToString()); - writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), _mode)); - writer.WriteAttributeString("HostComputer", _hostComputer); - writer.WriteAttributeString("ProcessPriority", _processPriority); - writer.WriteAttributeString("PluginTransmit", _pluginNameTransmit); - - if (_pluginNameReceive != null) - { - StringBuilder receivers = new StringBuilder(); - for (int index = 0; index < _pluginNameReceive.Length; index++) - { - receivers.Append(_pluginNameReceive[index]); - - if (index < _pluginNameReceive.Length - 1) - receivers.Append(','); - } - writer.WriteAttributeString("PluginReceive", receivers.ToString()); - } - else - { - writer.WriteAttributeString("PluginReceive", String.Empty); - } - - writer.WriteEndElement(); // </settings> - writer.WriteEndDocument(); - } - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - private void CreateDefaultSettings() - { - try - { - string[] blasters = Program.DetectBlasters(); - if (blasters == null || blasters.Length == 0) - _pluginNameTransmit = String.Empty; - else - _pluginNameTransmit = blasters[0]; - - string[] receivers = Program.DetectReceivers(); - if (receivers == null || receivers.Length == 0) - _pluginNameReceive = null; - else - _pluginNameReceive = receivers; - - SaveSettings(); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - private string LookupAbstractButton(string deviceName, string keyCode) { if (_abstractRemoteButtons == null || _abstractRemoteButtons.Tables.Count == 0) Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-11-15 10:48:19 UTC (rev 3153) @@ -118,6 +118,10 @@ <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> <Name>IR Server Plugin Interface</Name> </ProjectReference> + <ProjectReference Include="..\IRServer.Shared\IRServer.Shared.csproj"> + <Project>{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}</Project> + <Name>IRServer.Shared</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Content Include="Install.cmd"> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -41,9 +41,6 @@ public const string ServiceDescription = "The main component of IR Server Suite, the IR Server provides access to your input devices"; - public const string ServiceDisplayName = "IR Server"; - public const string ServiceName = "IRServer"; - public const string ServerWindowName = "IRSS - " + ServiceName; private static IRServer IRServer; #endregion Constants @@ -68,7 +65,7 @@ { SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(OnPowerModeChanged); - ReceiverWindow receiverWindow = new ReceiverWindow(ServerWindowName); + ReceiverWindow receiverWindow = new ReceiverWindow(Shared.ServerWindowName); Application.Run(); SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(OnPowerModeChanged); @@ -124,21 +121,21 @@ case "/START": IrssLog.Info("Starting IR Server ..."); - using (ServiceController serviceController = new ServiceController(ServiceName)) + using (ServiceController serviceController = new ServiceController(Shared.ServerName)) if (serviceController.Status == ServiceControllerStatus.Stopped) serviceController.Start(); break; case "/STOP": IrssLog.Info("Stopping IR Server ..."); - using (ServiceController serviceController = new ServiceController(ServiceName)) + using (ServiceController serviceController = new ServiceController(Shared.ServerName)) if (serviceController.Status == ServiceControllerStatus.Running) serviceController.Stop(); break; case "/RESTART": IrssLog.Info("Restarting IR Server ..."); - using (ServiceController serviceController = new ServiceController(ServiceName)) + using (ServiceController serviceController = new ServiceController(Shared.ServerName)) { if (serviceController.Status == ServiceControllerStatus.Running) serviceController.Stop(); @@ -175,7 +172,6 @@ } } - /// <summary> /// Retreives a plugin instance given the plugin name. /// </summary> @@ -197,72 +193,6 @@ throw new InvalidOperationException(String.Format("Plugin not found ({0})", pluginName)); } - /// <summary> - /// Retreives a list of detected Receiver plugins. - /// </summary> - /// <returns>String array of plugin names.</returns> - internal static string[] DetectReceivers() - { - IrssLog.Info("Detect Receivers ..."); - - PluginBase[] plugins = BasicFunctions.AvailablePlugins(); - if (plugins == null || plugins.Length == 0) - return null; - - List<string> receivers = new List<string>(); - - foreach (PluginBase plugin in plugins) - { - try - { - if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect() == PluginBase.DetectionResult.DevicePresent) - receivers.Add(plugin.Name); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - if (receivers.Count > 0) - return receivers.ToArray(); - - return null; - } - - /// <summary> - /// Retreives a list of detected Blaster plugins. - /// </summary> - /// <returns>String array of plugin names.</returns> - internal static string[] DetectBlasters() - { - IrssLog.Info("Detect Blasters ..."); - - PluginBase[] plugins = BasicFunctions.AvailablePlugins(); - if (plugins == null || plugins.Length == 0) - return null; - - List<string> blasters = new List<string>(); - - foreach (PluginBase plugin in plugins) - { - try - { - if (plugin is ITransmitIR && plugin.Detect() == PluginBase.DetectionResult.DevicePresent) - blasters.Add(plugin.Name); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - if (blasters.Count > 0) - return blasters.ToArray(); - - return null; - } - private static void OnPowerModeChanged(object sender, PowerModeChangedEventArgs e) { switch (e.Mode) Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -92,7 +92,7 @@ { do { - Program.getStatus(); + Shared.getStatus(); monitorThread.ReportProgress(0); Thread.Sleep(1000); } @@ -106,7 +106,7 @@ private void setButtons() { - if (Program._serviceInstalled == true) + if (Shared._serviceInstalled == true) { toolStripServiceButton.Text = "Uninstall Service"; } @@ -114,14 +114,14 @@ { toolStripServiceButton.Text = "Install Service"; } - switch (Program._irsStatus) + switch (Shared._irsStatus) { case IrsStatus.NotRunning: { toolStripButtonApplication.Image = IrssUtils.Properties.Resources.Start; toolStripButtonApplication.Enabled = true; toolStripButtonService.Image = IrssUtils.Properties.Resources.Start; - toolStripButtonService.Enabled = Program._serviceInstalled; + toolStripButtonService.Enabled = Shared._serviceInstalled; break; } case IrsStatus.RunningApplication: @@ -406,9 +406,6 @@ { InitializeComponent(); - Settings.LoadSettings(); - LoadSettings(); - try { _transceivers = BasicFunctions.AvailablePlugins(); @@ -425,6 +422,9 @@ MessageBoxIcon.Error); else CreateGrid(); + + + LoadSettings(); } #endregion Constructor @@ -521,29 +521,29 @@ private void toolStripServiceButton_Click(object sender, EventArgs e) { toolStripServiceButton.Enabled = false; - if (Program._serviceInstalled == true) + if (Shared._serviceInstalled == true) Program.ServiceUninstall(); else Program.ServiceInstall(); - Program.getStatus(); + Shared.getStatus(); setButtons(); toolStripServiceButton.Enabled = true; } private void toolStripButtonService_Click(object sender, EventArgs e) { - if (Program._irsStatus == IrsStatus.RunningService) + if (Shared._irsStatus == IrsStatus.RunningService) Program.ServiceStop(); - if (Program._irsStatus == IrsStatus.NotRunning) + if (Shared._irsStatus == IrsStatus.NotRunning) Program.ServiceStart(); } private void toolStripButtonApplication_Click(object sender, EventArgs e) { - if (Program._irsStatus == IrsStatus.RunningApplication) + if (Shared._irsStatus == IrsStatus.RunningApplication) Program.ApplicationStop(); - if (Program._irsStatus == IrsStatus.NotRunning) + if (Shared._irsStatus == IrsStatus.NotRunning) Program.ApplicationStart(); } Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-15 10:48:19 UTC (rev 3153) @@ -115,7 +115,6 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> - <Compile Include="Settings.cs" /> <EmbeddedResource Include="Advanced.resx"> <DependentUpon>Advanced.cs</DependentUpon> <SubType>Designer</SubType> @@ -149,6 +148,10 @@ <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> <Name>IR Server Plugin Interface</Name> </ProjectReference> + <ProjectReference Include="..\IRServer.Shared\IRServer.Shared.csproj"> + <Project>{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}</Project> + <Name>IRServer.Shared</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -39,57 +39,10 @@ namespace IRServer.Configuration { - - #region Enumerations - - /// <summary> - /// Describes the operation mode of IR Server. - /// </summary> - internal enum IRServerMode - { - /// <summary> - /// Acts as a standard Server (Default). - /// </summary> - ServerMode = 0, - /// <summary> - /// Relays button presses to another IR Server. - /// </summary> - RelayMode = 1, - /// <summary> - /// Acts as a repeater for another IR Server's blasting. - /// </summary> - RepeaterMode = 2, - } - - /// <summary> - /// Describes the actual status of IR Server - /// </summary> - internal enum IrsStatus - { - /// <summary> - /// IR Server is not running. - /// </summary> - NotRunning, - /// <summary> - /// IR Server is running as Service. - /// </summary> - RunningService, - /// <summary> - /// IR Server is running as Application. - /// </summary> - RunningApplication - } - - #endregion Enumerations - internal static class Program { #region Constants - internal const string ServerName = "IRServer"; - internal const string ServerWindowName = "IRSS - " + ServerName; - internal const string ServerDisplayName = "IR Server"; - internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe"); private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30); @@ -98,19 +51,8 @@ #region Variables - private static bool _abstractRemoteMode; - private static string _hostComputer; - private static IRServerMode _mode; - private static string[] _pluginNameReceive; - private static string _pluginNameTransmit; - private static string _processPriority; - private static bool _inConfiguration; private static ServiceController serviceController; - private static ServiceController[] serviceControllers; - private static IntPtr irsWindow; private static int waitCount; - internal static IrsStatus _irsStatus; - internal static bool _serviceInstalled; #endregion Variables @@ -129,41 +71,18 @@ IrssLog.LogLevel = IrssLog.Level.Debug; IrssLog.Open("IR Server Configuration.log"); + Settings.LoadSettings(); Application.Run(new Config()); IrssLog.Close(); } - internal static void getStatus() - { - _irsStatus = IrsStatus.NotRunning; - _serviceInstalled = false; - serviceControllers = ServiceController.GetServices(); - foreach (ServiceController serviceController in serviceControllers) - { - if (serviceController.ServiceName == ServerName) - { - _serviceInstalled = true; - if (serviceController.Status == ServiceControllerStatus.Running) - _irsStatus = IrsStatus.RunningService; - } - } - - try - { - irsWindow = Win32.FindWindowByTitle(ServerWindowName); - if (irsWindow != IntPtr.Zero) - _irsStatus = IrsStatus.RunningApplication; - } - catch { } - } - private static ServiceController getServiceController() { - serviceControllers = ServiceController.GetServices(); - foreach (ServiceController sc in serviceControllers) + Shared.serviceControllers = ServiceController.GetServices(); + foreach (ServiceController sc in Shared.serviceControllers) { - if (sc.ServiceName == ServerName) + if (sc.ServiceName == Shared.ServerName) return sc; } return null; @@ -206,7 +125,7 @@ try { serviceController = getServiceController(); - if (serviceControllers != null) + if (Shared.serviceControllers != null) { IrssLog.Info("Starting IR Server (service)"); serviceController.Start(); @@ -231,7 +150,7 @@ try { serviceController = getServiceController(); - if (serviceControllers != null) + if (Shared.serviceControllers != null) { IrssLog.Info("Stopping IR Server (service)"); serviceController.Stop(); @@ -258,7 +177,7 @@ IrssLog.Info("Starting IR Server (application)"); Process IRServer = Process.Start(IRServerFile); waitCount = 0; - while (Win32.FindWindowByTitle(ServerWindowName) == IntPtr.Zero) + while (Win32.FindWindowByTitle(Shared.ServerWindowName) == IntPtr.Zero) { waitCount++; if (waitCount > 150) throw new TimeoutException(); @@ -283,10 +202,10 @@ try { IrssLog.Info("Stopping IR Server (application)"); - IntPtr irssWindow = Win32.FindWindowByTitle(ServerWindowName); + IntPtr irssWindow = Win32.FindWindowByTitle(Shared.ServerWindowName); IntPtr result = Win32.SendWindowsMessage(irssWindow, 16, 0, 0); waitCount = 0; - while (Win32.FindWindowByTitle(ServerWindowName) != IntPtr.Zero) + while (Win32.FindWindowByTitle(Shared.ServerWindowName) != IntPtr.Zero) { waitCount++; if (waitCount > 150) throw new TimeoutException(); @@ -310,7 +229,7 @@ { IrssLog.Info("Restarting IR Server"); - switch (_irsStatus) + switch (Shared._irsStatus) { case IrsStatus.RunningService: { @@ -327,71 +246,5 @@ } IrssLog.Info("Restarting IR Server - done"); } - - /// <summary> - /// Retreives a list of detected Receiver plugins. - /// </summary> - /// <returns>String array of plugin names.</returns> - internal static string[] DetectReceivers() - { - IrssLog.Info("Detect Receivers ..."); - - PluginBase[] plugins = BasicFunctions.AvailablePlugins(); - if (plugins == null || plugins.Length == 0) - return null; - - List<string> receivers = new List<string>(); - - foreach (PluginBase plugin in plugins) - { - try - { - if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect() == PluginBase.DetectionResult.DevicePresent) - receivers.Add(plugin.Name); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - if (receivers.Count > 0) - return receivers.ToArray(); - - return null; - } - - /// <summary> - /// Retreives a list of detected Blaster plugins. - /// </summary> - /// <returns>String array of plugin names.</returns> - internal static string[] DetectBlasters() - { - IrssLog.Info("Detect Blasters ..."); - - PluginBase[] plugins = BasicFunctions.AvailablePlugins(); - if (plugins == null || plugins.Length == 0) - return null; - - List<string> blasters = new List<string>(); - - foreach (PluginBase plugin in plugins) - { - try - { - if (plugin is ITransmitIR && plugin.Detect() == PluginBase.DetectionResult.DevicePresent) - blasters.Add(plugin.Name); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - if (blasters.Count > 0) - return blasters.ToArray(); - - return null; - } } } \ No newline at end of file Deleted: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -1,206 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Xml; -using IrssUtils; - -namespace IRServer.Configuration -{ - static class Settings - { - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); - - public static bool AbstractRemoteMode { get; set; } - public static IRServerMode Mode { get; set; } - public static string HostComputer { get; set; } - public static string ProcessPriority { get; set; } - public static string[] PluginNameReceive { get; set; } - public static string PluginNameTransmit { get; set; } - - public static void LoadSettings() - { - IrssLog.Info("Loading settings ..."); - - AbstractRemoteMode = true; - Mode = IRServerMode.ServerMode; - HostComputer = String.Empty; - ProcessPriority = "No Change"; - PluginNameReceive = null; - PluginNameTransmit = String.Empty; - - XmlDocument doc = new XmlDocument(); - - try - { - doc.Load(ConfigurationFile); - } - catch (DirectoryNotFoundException) - { - IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", - ConfigurationFile); - - Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile)); - - CreateDefaultSettings(); - return; - } - catch (FileNotFoundException) - { - IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile); - - CreateDefaultSettings(); - return; - } - catch (Exception ex) - { - IrssLog.Error(ex); - return; - } - - try - { - AbstractRemoteMode = bool.Parse(doc.DocumentElement.Attributes["AbstractRemoteMode"].Value); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - Mode = - (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - HostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - ProcessPriority = doc.DocumentElement.Attributes["ProcessPriority"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - PluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value; - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - - try - { - string receivers = doc.DocumentElement.Attributes["PluginReceive"].Value; - if (!String.IsNullOrEmpty(receivers)) - PluginNameReceive = receivers.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - } - catch (Exception ex) - { - IrssLog.Warn(ex.ToString()); - } - } - - public static void SaveSettings() - { - IrssLog.Info("Saving settings ..."); - - try - { - using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8)) - { - writer.Formatting = Formatting.Indented; - writer.Indentation = 1; - writer.IndentChar = (char)9; - writer.WriteStartDocument(true); - writer.WriteStartElement("settings"); // <settings> - - writer.WriteAttributeString("AbstractRemoteMode", AbstractRemoteMode.ToString()); - writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), Mode)); - writer.WriteAttributeString("HostComputer", HostComputer); - writer.WriteAttributeString("ProcessPriority", ProcessPriority); - writer.WriteAttributeString("PluginTransmit", PluginNameTransmit); - - if (PluginNameReceive != null) - { - StringBuilder receivers = new StringBuilder(); - for (int index = 0; index < PluginNameReceive.Length; index++) - { - receivers.Append(PluginNameReceive[index]); - - if (index < PluginNameReceive.Length - 1) - receivers.Append(','); - } - writer.WriteAttributeString("PluginReceive", receivers.ToString()); - } - else - { - writer.WriteAttributeString("PluginReceive", String.Empty); - } - - writer.WriteEndElement(); // </settings> - writer.WriteEndDocument(); - } - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - - private static void CreateDefaultSettings() - { - try - { - string[] blasters = Program.DetectBlasters(); - if (blasters == null) - PluginNameTransmit = String.Empty; - else - PluginNameTransmit = blasters[0]; - } - catch (Exception ex) - { - IrssLog.Error(ex); - PluginNameTransmit = String.Empty; - } - - try - { - string[] receivers = Program.DetectReceivers(); - if (receivers == null) - PluginNameReceive = null; - else - PluginNameReceive = receivers; - } - catch (Exception ex) - { - IrssLog.Error(ex); - PluginNameReceive = null; - } - - try - { - SaveSettings(); - } - catch (Exception ex) - { - IrssLog.Error(ex); - } - } - } -} \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj 2009-11-15 10:48:19 UTC (rev 3153) @@ -68,6 +68,10 @@ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> <Name>IrssUtils</Name> </ProjectReference> + <ProjectReference Include="..\IRServer.Shared\IRServer.Shared.csproj"> + <Project>{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}</Project> + <Name>IRServer.Shared</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Content Include="Resources\iconGray.ico" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs 2009-11-15 10:43:40 UTC (rev 3152) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -2,7 +2,6 @@ using System.Diagnostics; using System.Drawing; using System.IO; -using System.ServiceProcess; using System.Threading; using System.Windows.Forms; using IRServer.Tray.Properties; @@ -10,56 +9,10 @@ namespace IRServer.Tray { - #region Enumerations - - /// <summary> - /// Describes the operation mode of IR Server. - /// </summary> - internal enum IRServerMode - { - /// <summary> - /// Acts as a standard Server (Default). - /// </summary> - ServerMode = 0, - /// <summary> - /// Relays button presses to another IR Server. - /// </summary> - RelayMode = 1, - /// <summary> - /// Acts as a repeater for another IR Server's blasting. - /// </summary> - RepeaterMode = 2, - } - - /// <summary> - /// Describes the actual status of IR Server - /// </summary> - internal enum IrsStatus - { - /// <summary> - /// IR Server is not running. - /// </summary> - NotRunning, - /// <summary> - /// IR Server is running as Service. - /// </summary> - RunningService, - /// <summary> - /// IR Server is running as Application. - /// </summary> - RunningApplication - } - - #endregion Enumerations - static class Program { #region Constants - internal const string ServerName = "IRServer"; - internal const string ServerWindowName = "IRSS - " + ServerName; - internal const string ServerDisplayName = "IR Server"; - private static readonly string _configExe = Path.Combine(Common.FolderProgramFiles, @"IR Server Configuration.exe"); private static readonly string _translatorExe = Path.Combine(Common.FolderProgramFiles, @"Translator.exe"); private static readonly string _debugClientExe = Path.Combine(Common.FolderProgramFiles, @"DebugClient.exe"); @@ -74,12 +27,6 @@ internal static readonly Icon _iconGray = new Icon(Resources.iconGray, new Size(16, 16)); internal static readonly Icon _iconGreen = new Icon(Resources.iconGreen, new Size(16, 16)); - private static ServiceController[] serviceControllers; - private static IntPtr irsWindow; - - internal static IrsStatus _irsStatus; - internal static bool _serviceInstalled; - #endregion Variables /// <summary> @@ -111,7 +58,7 @@ _notifyIcon.ContextMenuStrip.Items.Add("&Exit", null, ClickExit); //_notifyIcon.DoubleClick += new EventHandler(OpenConfiguration); _notifyIcon.Icon = new System.Drawing.Icon(Resources.iconGray, new System.Drawing.Size(16, 16)); - _notifyIcon.Text = ServerDisplayName; + _notifyIcon.Text = Shared.ServerDisplayName; _notifyIcon.Visible = true; thread = new Thread(new ThreadStart(UpdateIcon)); @@ -154,39 +101,15 @@ { while (thread != null && thread.IsAlive) { - getStatus(); + Shared.getStatus(); _notifyIcon.Icon = getIcon(); Thread.Sleep(1000); } } - internal static void getStatus() - { - _irsStatus = IrsStatus.NotRunning; - _serviceInstalled = false; - serviceControllers = ServiceController.GetServices(); - foreach (ServiceController serviceController in serviceControllers) - { - if (serviceController.ServiceName == ServerName) - { - _serviceInstalled = true; - if (serviceController.Status == ServiceControllerStatus.Running) - _irsStatus = IrsStatus.RunningService; - } - } - - try - { - irsWindow = Win32.FindWindowByTitle(ServerWindowName); - if (irsWindow != IntPtr.Zero) - _irsStatus = IrsStatus.RunningApplication; - } - catch { } - } - private static Icon getIcon() { - return (_irsStatus == IrsStatus.NotRunning) ? _iconGray : _iconGreen; + return (Shared._irsStatus == IrsStatus.NotRunning) ? _iconGray : _iconGreen; } #endregion Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared ___________________________________________________________________ Added: svn:ignore + [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj 2009-11-15 10:48:19 UTC (rev 3153) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.21022</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>IRServer.Shared</RootNamespace> + <AssemblyName>IRServer.Shared</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <SignAssembly>true</SignAssembly> + <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.ServiceProcess" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Settings.cs" /> + <Compile Include="Shared.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> + <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> + <Name>IrssUtils</Name> + </ProjectReference> + <ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj"> + <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> + <Name>IR Server Plugin Interface</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/AssemblyInfo.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/AssemblyInfo.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die mit einer Assembly verknüpft sind. +[assembly: AssemblyTitle("IRServer.Shared")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("IRServer.Shared")] +[assembly: AssemblyCopyright("Copyright © 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("1c5a8ae6-5899-4626-83c7-70aab18216f7")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern +// übernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.4.2.0")] +[assembly: AssemblyFileVersion("1.4.2.0")] Copied: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs (from rev 3151, trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Settings.cs) =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs 2009-11-15 10:48:19 UTC (rev 3153) @@ -0,0 +1,205 @@ +using System; +using System.IO; +using System.Text; +using System.Xml; +using IrssUtils; + +namespace IRServer +{ + public static class Settings + { + private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml"); + + public static bool AbstractRemoteMode { get; set; } + public static IRServerMode Mode { get; set; } + public static string HostComputer { get; set; } + public static string ProcessPriority { get; set; } + public static string[] PluginNameReceive { get; set; } + public static string PluginNameTransmit { get; set; } + + public static void LoadSettings() + { + IrssLog.Info("Loading settings ..."); + + AbstractRemoteMode = true; + Mode = IRServerMode.ServerMode; + HostComputer = String.Empty; + ProcessPriority = "No Change"; + PluginNameReceive = null; + PluginNameTransmit = String.Empty; + + XmlDocument doc = new XmlDocument(); + + try + { + doc.Load(ConfigurationFile); + } + catch (DirectoryNotFoundException) + { + IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", + ConfigurationFile); + + Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile)); + + CreateDefaultSettings(); + return; + } + catch (FileNotFoundException) + { + IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile); + + CreateDefaultSettings(); + return; + } + catch (Exception ex) + { + IrssLog.Error(ex); + return; + } + + try + { + AbstractRemoteMode = bool.Parse(doc.DocumentElement.Attributes["AbstractRemoteMode"].Value); + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + Mode = + (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + HostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + ProcessPriority = doc.DocumentElement.Attributes["ProcessPriority"].Value; + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + PluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value; + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + + try + { + string receivers = doc.DocumentElement.Attribute... [truncated message content] |
From: <che...@us...> - 2009-11-16 01:56:33
|
Revision: 3156 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3156&view=rev Author: chef_koch Date: 2009-11-16 01:56:20 +0000 (Mon, 16 Nov 2009) Log Message: ----------- fixed ir server config manifest fixed import in MediaPortalMacros.nsh Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest trunk/plugins/IR Server Suite/setup/include/MediaPortalMacros.nsh Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest 2009-11-15 12:52:07 UTC (rev 3155) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.exe.manifest 2009-11-16 01:56:20 UTC (rev 3156) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > <assemblyIdentity name="IR Server Configuration" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" /> <description>Configuration tool to change settings for IR Server.</description> @@ -9,16 +9,4 @@ </requestedPrivileges> </security> </trustInfo> -</assembly> -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > - <assemblyIdentity name="IR Server Configuration" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" /> - <description>Configuration tool to change settings for IR Server.</description> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel> - </requestedPrivileges> - </security> - </trustInfo> -</assembly> +</assembly> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/setup/include/MediaPortalMacros.nsh =================================================================== --- trunk/plugins/IR Server Suite/setup/include/MediaPortalMacros.nsh 2009-11-15 12:52:07 UTC (rev 3155) +++ trunk/plugins/IR Server Suite/setup/include/MediaPortalMacros.nsh 2009-11-16 01:56:20 UTC (rev 3156) @@ -36,7 +36,6 @@ #--------------------------------------------------------------------------- !include LogicLib.nsh !include x64.nsh -!include "${svn_InstallScripts}\include\LanguageMacros.nsh" !ifndef NO_OS_DETECTION !include "${svn_InstallScripts}\include\WinVerEx.nsh" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-11-30 01:13:49
|
Revision: 3196 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3196&view=rev Author: chef_koch Date: 2009-11-30 01:13:36 +0000 (Mon, 30 Nov 2009) Log Message: ----------- updated svn ignore Properties and applied it recursively Property Changed: ---------------- trunk/plugins/IR Server Suite/ trunk/plugins/IR Server Suite/Build/ trunk/plugins/IR Server Suite/IR Server Suite/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/References/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Default Settings/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Skins/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Control Statements/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Exceptions/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Forms/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Graphics/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Maths Operations/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Special Commands/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Stack Commands/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/String Operations/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Variable Commands/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/ trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Common/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Exceptions/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ trunk/plugins/IR Server Suite/IR Server Suite/Documentation/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Direct Input/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FireFly/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FusionREMOTE/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Hauppauge/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IR507/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IgorPlug/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Medion/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Microsoft MCE/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Pinnacle Serial/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Technotrend/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/USB-UIRT/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Wii Remote/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Windows Messages/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/X10/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/XBCDRC/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Resources/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/SourceGrid/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/References/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/docs/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/docs/APIHelp/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/docs/APIHelp/AdditionalContent/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/docs/APIHelp/Help/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/ADB 3100/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/ADB SCV-3800C/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Amstrad DRX-300/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Coolsat/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/D-Box/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/DSS DishPlayer 7200/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Dilog DT-355/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/DirecTV D10/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/DirecTV HR10-250/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/DirecTV R15/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Dish 301/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Dish 811/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/DreamBox 7000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 1000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 2500/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 3000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 370/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 3800/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 4000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 4700/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 4720/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 4722/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 6000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Echostar 7700/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Force 536/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Foxtel STU100/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/General Instruments DCT2000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/General Instruments DCT2224/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Israel HOT/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/JVC TU-4700/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Kreatel 1710/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Motorola DCT-2000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Motorola DCT-2244/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Motorola DCT-6200/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/MultiChoice DSD660/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Nokia 221T/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Nokia 9800s/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/OnDigital/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/OnDigital DTR730/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Pace 4100/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Pioneer BA-V2000C/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/SCV Digital/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sagem D-Box II/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sagem ICD-503/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta 8602/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3100/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky Zenith/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sony DHG-M55CV/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sony SAS-A3/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sony SAS-A4/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sony SAT-A2/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sony SAT-A3/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Sony SAT-A50/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Strong 8700/ trunk/plugins/IR Server Suite/IR Server Suite/Set Top Boxes/Xsat CDTV-410/ trunk/plugins/IR Server Suite/MediaPortal Plugins/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/Forms/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/Properties/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/Forms/ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/Properties/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/AppData/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Graphics/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Properties/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Skin/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Skin/Media/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/AppData/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapper/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/InputMapping/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Properties/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Properties/ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Properties/ trunk/plugins/IR Server Suite/Virtual Remote/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/Graphics/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/Properties/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003) Installer/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003) Installer/Debug/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003) Installer/Release/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/Graphics/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/Properties/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003) Installer/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003) Installer/Debug/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003) Installer/Release/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/Properties/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5) Installer/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5) Installer/Debug/ trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5) Installer/Release/ trunk/plugins/IR Server Suite/setup/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Contrib/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Contrib/GetVersion/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Docs/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Docs/GetVersion/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Examples/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Examples/GetVersion/ trunk/plugins/IR Server Suite/setup/GetVersion-plugin/Plugins/ trunk/plugins/IR Server Suite/setup/Icons/ trunk/plugins/IR Server Suite/setup/Images/ trunk/plugins/IR Server Suite/setup/Resources/ trunk/plugins/IR Server Suite/setup/XML-plugin/ trunk/plugins/IR Server Suite/setup/XML-plugin/Example/ trunk/plugins/IR Server Suite/setup/XML-plugin/Include/ trunk/plugins/IR Server Suite/setup/XML-plugin/Plugin/ trunk/plugins/IR Server Suite/setup/XML-plugin/Source/ trunk/plugins/IR Server Suite/setup/XML-plugin/Source/Install/ trunk/plugins/IR Server Suite/setup/XML-plugin/Source/Install/Res/ trunk/plugins/IR Server Suite/setup/include/ trunk/plugins/IR Server Suite/setup/languages/ trunk/plugins/IR Server Suite/setup/pages/ Property changes on: trunk/plugins/IR Server Suite ___________________________________________________________________ Modified: svn:ignore - *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/Build ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window) ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/References ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Default Settings ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Properties ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Properties ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Skins ___________________________________________________________________ Modified: svn:ignore - Backup + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Control Statements ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Exceptions ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Forms ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Graphics ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Maths Operations ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Special Commands ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Stack Commands ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/String Operations ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Variable Commands ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Exceptions ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Documentation ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Direct Input ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FireFly ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/FusionREMOTE ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Hauppauge ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IR507 ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/IgorPlug ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Medion ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Microsoft MCE ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Pinnacle Serial ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Technotrend ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/USB-UIRT ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Wii Remote ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/Windows Messages ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/X10 ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/XBCDRC ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Resources ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Resources ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/SourceGrid ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray ___________________________________________________________________ Modified: svn:ignore - [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Resources ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared ___________________________________________________________________ Modified: svn:ignore - [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/SourceGrid ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver ___________________________________________________________________ Modified: svn:ignore - bin obj ADS_335_RCPLIB.dll + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver ___________________________________________________________________ Modified: svn:ignore - bin obj + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db bin obj Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/References ___________________________________________________________________ Added: svn:ignore + *.bak *.cache *.exe *.log *.suo *.user _ReSharper.* thumbs.db ... [truncated message content] |
From: <che...@us...> - 2009-12-05 11:50:35
|
Revision: 3203 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3203&view=rev Author: chef_koch Date: 2009-12-05 11:50:25 +0000 (Sat, 05 Dec 2009) Log Message: ----------- removed creation of appdata dirs during installation for WebRemote, Virtual Remote, SkinEditor, KeyBoard Input Relay and IRFileTool catching directory not found exception in load settings for those apps and using default settings in that case Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs trunk/plugins/IR Server Suite/setup/setup.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs 2009-12-05 10:57:29 UTC (rev 3202) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs 2009-12-05 11:50:25 UTC (rev 3203) @@ -41,8 +41,10 @@ { #region Constants - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, - "IR File Tool\\IR File Tool.xml"); + private static readonly string ConfigurationFolder = Path.Combine(Common.FolderAppData, + "IR File Tool"); + private static readonly string ConfigurationFile = Path.Combine(ConfigurationFolder, + "IR File Tool.xml"); #endregion Constants @@ -151,25 +153,43 @@ private void LoadSettings() { + XmlDocument doc = new XmlDocument(); + try { - XmlDocument doc = new XmlDocument(); doc.Load(ConfigurationFile); + } + catch (DirectoryNotFoundException) + { + IrssLog.Warn("Configuration directory not found, using default settings"); - _serverHost = doc.DocumentElement.Attributes["ServerHost"].Value; + Directory.CreateDirectory(ConfigurationFolder); + CreateDefaultSettings(); + return; } catch (FileNotFoundException) { - IrssLog.Warn("Configuration file not found, using defaults"); + IrssLog.Warn("Configuration file not found, using default settings"); CreateDefaultSettings(); + return; } catch (Exception ex) { IrssLog.Error(ex); CreateDefaultSettings(); + return; } + + try + { + _serverHost = doc.DocumentElement.Attributes["ServerHost"].Value; + } + catch + { + _serverHost = "localhost"; + } } private void SaveSettings() Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-12-05 10:57:29 UTC (rev 3202) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2009-12-05 11:50:25 UTC (rev 3203) @@ -40,8 +40,10 @@ { #region Constants - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, - "Keyboard Input Relay\\Keyboard Input Relay.xml"); + private static readonly string ConfigurationFolder = Path.Combine(Common.FolderAppData, + "Keyboard Input Relay"); + private static readonly string ConfigurationFile = Path.Combine(ConfigurationFolder, + "Keyboard Input Relay.xml"); #endregion Constants @@ -132,9 +134,17 @@ { doc.Load(ConfigurationFile); } + catch (DirectoryNotFoundException) + { + IrssLog.Warn("Configuration directory not found, using default settings"); + + Directory.CreateDirectory(ConfigurationFolder); + CreateDefaultSettings(); + return; + } catch (FileNotFoundException) { - IrssLog.Warn("Configuration file not found, using defaults"); + IrssLog.Warn("Configuration file not found, using default settings"); CreateDefaultSettings(); return; Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-12-05 10:57:29 UTC (rev 3202) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2009-12-05 11:50:25 UTC (rev 3203) @@ -40,8 +40,10 @@ private const string DefaultSkin = "MCE"; - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, - "Virtual Remote\\Virtual Remote.xml"); + private static readonly string ConfigurationFolder = Path.Combine(Common.FolderAppData, + "Virtual Remote"); + private static readonly string ConfigurationFile = Path.Combine(ConfigurationFolder, + "Virtual Remote.xml"); #endregion Constants @@ -249,9 +251,17 @@ { doc.Load(ConfigurationFile); } + catch (DirectoryNotFoundException) + { + IrssLog.Warn("Configuration directory not found, using default settings"); + + Directory.CreateDirectory(ConfigurationFolder); + CreateDefaultSettings(); + return; + } catch (FileNotFoundException) { - IrssLog.Warn("Configuration file not found, using defaults"); + IrssLog.Warn("Configuration file not found, using default settings"); CreateDefaultSettings(); return; @@ -259,6 +269,7 @@ catch (Exception ex) { IrssLog.Error(ex); + CreateDefaultSettings(); return; } Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2009-12-05 10:57:29 UTC (rev 3202) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2009-12-05 11:50:25 UTC (rev 3203) @@ -41,8 +41,10 @@ { #region Constants - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, - "Virtual Remote\\Virtual Remote Skin Editor.xml"); + private static readonly string ConfigurationFolder = Path.Combine(Common.FolderAppData, + "Virtual Remote"); + private static readonly string ConfigurationFile = Path.Combine(ConfigurationFolder, + "Virtual Remote Skin Editor.xml"); #endregion Constants @@ -548,25 +550,43 @@ private void LoadSettings() { + XmlDocument doc = new XmlDocument(); + try { - XmlDocument doc = new XmlDocument(); doc.Load(ConfigurationFile); + } + catch (DirectoryNotFoundException) + { + IrssLog.Warn("Configuration directory not found, using default settings"); - _serverHost = doc.DocumentElement.Attributes["ServerHost"].Value; + Directory.CreateDirectory(ConfigurationFolder); + CreateDefaultSettings(); + return; } catch (FileNotFoundException) { - IrssLog.Warn("Configuration file not found, using defaults"); + IrssLog.Warn("Configuration file not found, using default settings"); CreateDefaultSettings(); + return; } catch (Exception ex) { IrssLog.Error(ex); CreateDefaultSettings(); + return; } + + try + { + _serverHost = doc.DocumentElement.Attributes["ServerHost"].Value; + } + catch + { + _serverHost = "localhost"; + } } private void SaveSettings() Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2009-12-05 10:57:29 UTC (rev 3202) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2009-12-05 11:50:25 UTC (rev 3203) @@ -49,8 +49,10 @@ private const string DefaultSkin = "MCE"; private const int DefaultWebPort = 2481; - private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, - "Virtual Remote\\Web Remote.xml"); + private static readonly string ConfigurationFolder = Path.Combine(Common.FolderAppData, + "Virtual Remote"); + private static readonly string ConfigurationFile = Path.Combine(ConfigurationFolder, + "Web Remote.xml"); #endregion Constants @@ -411,9 +413,17 @@ { doc.Load(ConfigurationFile); } + catch (DirectoryNotFoundException) + { + IrssLog.Warn("Configuration directory not found, using default settings"); + + Directory.CreateDirectory(ConfigurationFolder); + CreateDefaultSettings(); + return; + } catch (FileNotFoundException) { - IrssLog.Warn("Configuration file not found, using defaults"); + IrssLog.Warn("Configuration file not found, using default settings"); CreateDefaultSettings(); return; Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-12-05 10:57:29 UTC (rev 3202) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-12-05 11:50:25 UTC (rev 3203) @@ -691,9 +691,6 @@ SetOutPath "$DIR_INSTALL" File "..\IR Server Suite\Applications\Debug Client\bin\${Build_Type}\DebugClient.*" - ; create folders - CreateDirectory "${COMMON_APPDATA}\Debug Client" - ; create start menu shortcuts CreateShortCut "${STARTMENU_GROUP}\Debug Client.lnk" "$DIR_INSTALL\DebugClient.exe" "" "$DIR_INSTALL\DebugClient.exe" 0 @@ -717,9 +714,6 @@ SetOutPath "$DIR_INSTALL" File "..\IR Server Suite\Applications\IR File Tool\bin\${Build_Type}\IRFileTool.*" - ; create folders - CreateDirectory "${COMMON_APPDATA}\IR File Tool" - ; create start menu shortcuts CreateShortCut "${STARTMENU_GROUP}\IR File Tool.lnk" "$DIR_INSTALL\IRFileTool.exe" "" "$DIR_INSTALL\IRFileTool.exe" 0 @@ -743,9 +737,6 @@ SetOutPath "$DIR_INSTALL" File "..\IR Server Suite\Applications\Keyboard Input Relay\bin\${Build_Type}\KeyboardInputRelay.*" - ; create folders - CreateDirectory "${COMMON_APPDATA}\Keyboard Input Relay" - ; create start menu shortcuts CreateShortCut "${STARTMENU_GROUP}\Keyboard Input Relay.lnk" "$DIR_INSTALL\KeyboardInputRelay.exe" "" "$DIR_INSTALL\KeyboardInputRelay.exe" 0 @@ -823,9 +814,6 @@ File "..\Virtual Remote\Applications\Virtual Remote (Smartphone2003) Installer\${Build_Type}\*.cab" File "..\Virtual Remote\Applications\Virtual Remote (WinCE5) Installer\${Build_Type}\*.cab" - ; create folders - CreateDirectory "${COMMON_APPDATA}\Virtual Remote" - ; create start menu shortcuts CreateShortCut "${STARTMENU_GROUP}\Virtual Remote.lnk" "$DIR_INSTALL\VirtualRemote.exe" "" "$DIR_INSTALL\VirtualRemote.exe" 0 CreateShortCut "${STARTMENU_GROUP}\Virtual Remote Skin Editor.lnk" "$DIR_INSTALL\VirtualRemoteSkinEditor.exe" "" "$DIR_INSTALL\VirtualRemoteSkinEditor.exe" 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2009-12-24 09:56:45
|
Revision: 3299 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3299&view=rev Author: chemelli_sf Date: 2009-12-24 09:56:35 +0000 (Thu, 24 Dec 2009) Log Message: ----------- Use DeployVersionSVN.exe from Tools dir in trunk Modified Paths: -------------- trunk/plugins/IR Server Suite/Build/BuildScript.bat Removed Paths: ------------- trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat =================================================================== --- trunk/plugins/IR Server Suite/Build/BuildScript.bat 2009-12-24 07:36:26 UTC (rev 3298) +++ trunk/plugins/IR Server Suite/Build/BuildScript.bat 2009-12-24 09:56:35 UTC (rev 3299) @@ -29,7 +29,7 @@ echo. echo Writing SVN revision assemblies... -..\setup\DeployVersionSVN.exe /svn=".." >> %LOG% +"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=".." >> %LOG% @@ -50,7 +50,7 @@ echo. echo Reverting assemblies... -..\setup\DeployVersionSVN.exe /svn=".." /revert >> %LOG% +"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=".." /revert >> %LOG% echo. echo Reading the svn revision... Deleted: trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |