Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2985] trunk/plugins/IR Server Suite/ MediaPortal Plugins
|
From: <che...@us...> - 2009-07-05 17:33:03
|
Revision: 2985
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2985&view=rev
Author: chef_koch
Date: 2009-07-05 17:33:02 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
removed setting for verbose logging, replaced it's if statements by Log.Debug
Modified Paths:
--------------
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.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/Forms/PluginSetup.Designer.cs
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.Designer.cs 2009-07-05 17:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.Designer.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -58,7 +58,6 @@
this.buttonDeleteMacro = new System.Windows.Forms.Button();
this.buttonEditMacro = new System.Windows.Forms.Button();
this.buttonNewMacro = new System.Windows.Forms.Button();
- this.checkBoxLogVerbose = new System.Windows.Forms.CheckBox();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
this.buttonHelp = new System.Windows.Forms.Button();
this.tabControl.SuspendLayout();
@@ -427,17 +426,6 @@
this.buttonNewMacro.UseVisualStyleBackColor = true;
this.buttonNewMacro.Click += new System.EventHandler(this.buttonNewMacro_Click);
//
- // checkBoxLogVerbose
- //
- this.checkBoxLogVerbose.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.checkBoxLogVerbose.Location = new System.Drawing.Point(216, 376);
- this.checkBoxLogVerbose.Name = "checkBoxLogVerbose";
- this.checkBoxLogVerbose.Size = new System.Drawing.Size(120, 24);
- this.checkBoxLogVerbose.TabIndex = 3;
- this.checkBoxLogVerbose.Text = "&Extended logging";
- this.toolTips.SetToolTip(this.checkBoxLogVerbose, "Enable more detailed logging of plugin operations");
- this.checkBoxLogVerbose.UseVisualStyleBackColor = true;
- //
// buttonHelp
//
this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -457,7 +445,6 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.buttonCancel;
this.ClientSize = new System.Drawing.Size(520, 415);
- this.Controls.Add(this.checkBoxLogVerbose);
this.Controls.Add(this.buttonHelp);
this.Controls.Add(this.tabControl);
this.Controls.Add(this.buttonChangeServer);
@@ -496,7 +483,6 @@
private System.Windows.Forms.Button buttonDeleteMacro;
private System.Windows.Forms.Button buttonEditMacro;
private System.Windows.Forms.Button buttonNewMacro;
- private System.Windows.Forms.CheckBox checkBoxLogVerbose;
private System.Windows.Forms.Button buttonNewCommand;
private System.Windows.Forms.GroupBox groupBoxTreeCommands;
private System.Windows.Forms.Button buttonBottom;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2009-07-05 17:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -67,8 +67,6 @@
MessageBox.Show(this, "Failed to start local comms. IR functions temporarily disabled.",
"MP Blast Zone Plugin - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- checkBoxLogVerbose.Checked = MPBlastZonePlugin.LogVerbose;
-
RefreshIRList();
RefreshMacroList();
RefreshCommandsCombo();
@@ -634,8 +632,6 @@
private void buttonOK_Click(object sender, EventArgs e)
{
- MPBlastZonePlugin.LogVerbose = checkBoxLogVerbose.Checked;
-
// Save menu ...
MPBlastZonePlugin.Menu.Clear();
foreach (TreeNode collectionNode in treeViewMenu.Nodes)
Modified: 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 Blast Zone Plugin/MPBlastZonePlugin.cs 2009-07-05 17:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -79,7 +79,6 @@
private static IRServerInfo _irServerInfo = new IRServerInfo();
private static string _learnIRFilename;
- private static bool _logVerbose;
private static MenuRoot _menu;
private static bool _mpBasicHome;
private static bool _registered;
@@ -106,16 +105,6 @@
}
/// <summary>
- /// Gets or sets a value indicating whether to log verbosely.
- /// </summary>
- /// <value><c>true</c> if logging is set to verbose; otherwise, <c>false</c>.</value>
- internal static bool LogVerbose
- {
- get { return _logVerbose; }
- set { _logVerbose = value; }
- }
-
- /// <summary>
/// Gets or sets a value indicating whether in configuration.
/// </summary>
/// <value><c>true</c> if in configuration; otherwise, <c>false</c>.</value>
@@ -241,8 +230,7 @@
{
_inConfiguration = true;
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: ShowPlugin()");
+ Log.Debug("MPBlastZonePlugin: ShowPlugin()");
SetupForm setupForm = new SetupForm();
if (setupForm.ShowDialog() == DialogResult.OK)
@@ -250,8 +238,7 @@
StopClient();
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: ShowPlugin() - End");
+ Log.Debug("MPBlastZonePlugin: ShowPlugin() - End");
}
catch (Exception ex)
{
@@ -309,8 +296,7 @@
if (Load(skinFile))
{
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: Started");
+ Log.Debug("MPBlastZonePlugin: Started");
return true;
}
@@ -328,8 +314,7 @@
base.DeInit();
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: Stopped");
+ Log.Debug("MPBlastZonePlugin: Stopped");
}
/// <summary>
@@ -509,8 +494,7 @@
private static void ReceivedMessage(IrssMessage received)
{
- if (LogVerbose)
- Log.Debug("MPBlastZonePlugin: Received Message \"{0}\"", received.Type);
+ Log.Debug("MPBlastZonePlugin: Received Message \"{0}\"", received.Type);
try
{
@@ -519,8 +503,7 @@
case MessageType.BlastIR:
if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
{
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: Blast successful");
+ Log.Debug("MPBlastZonePlugin: Blast successful");
}
else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
{
@@ -534,8 +517,7 @@
_irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes());
_registered = true;
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: Registered to IR Server");
+ Log.Debug("MPBlastZonePlugin: Registered to IR Server");
}
else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
{
@@ -547,8 +529,7 @@
case MessageType.LearnIR:
if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
{
- if (LogVerbose)
- Log.Info("MPBlastZonePlugin: Learned IR Successfully");
+ Log.Debug("MPBlastZonePlugin: Learned IR Successfully");
byte[] dataBytes = received.GetDataAsBytes();
@@ -637,8 +618,7 @@
/// <param name="port">Port to blast to.</param>
internal static void BlastIR(string fileName, string port)
{
- if (LogVerbose)
- Log.Debug("MPControlPlugin - BlastIR(): {0}, {1}", fileName, port);
+ Log.Debug("MPControlPlugin - BlastIR(): {0}, {1}", fileName, port);
if (!_registered)
throw new InvalidOperationException("Cannot Blast, not registered to an active Input Service");
@@ -966,8 +946,6 @@
{
ServerHost = xmlreader.GetValueAsString("MPBlastZonePlugin", "ServerHost", "localhost");
- LogVerbose = xmlreader.GetValueAsBool("MPBlastZonePlugin", "LogVerbose", false);
-
// MediaPortal settings ...
_mpBasicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
}
@@ -988,8 +966,6 @@
using (Settings xmlwriter = new Settings(MPCommon.MPConfigFile))
{
xmlwriter.SetValue("MPBlastZonePlugin", "ServerHost", ServerHost);
-
- xmlwriter.SetValueAsBool("MPBlastZonePlugin", "LogVerbose", LogVerbose);
}
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs 2009-07-05 17:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -38,7 +38,6 @@
this.buttonDeleteMacro = new System.Windows.Forms.Button();
this.buttonEditMacro = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
- this.checkBoxLogVerbose = new System.Windows.Forms.CheckBox();
this.buttonExtChannels = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
this.buttonChangeServer = new System.Windows.Forms.Button();
@@ -162,17 +161,6 @@
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
- // checkBoxLogVerbose
- //
- this.checkBoxLogVerbose.AutoSize = true;
- this.checkBoxLogVerbose.Location = new System.Drawing.Point(8, 8);
- this.checkBoxLogVerbose.Name = "checkBoxLogVerbose";
- this.checkBoxLogVerbose.Size = new System.Drawing.Size(108, 17);
- this.checkBoxLogVerbose.TabIndex = 0;
- this.checkBoxLogVerbose.Text = "Extended logging";
- this.toolTips.SetToolTip(this.checkBoxLogVerbose, "Enable more detailed logging of plugin operations");
- this.checkBoxLogVerbose.UseVisualStyleBackColor = true;
- //
// buttonExtChannels
//
this.buttonExtChannels.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -227,7 +215,6 @@
// tabPageOptions
//
this.tabPageOptions.Controls.Add(this.buttonHelp);
- this.tabPageOptions.Controls.Add(this.checkBoxLogVerbose);
this.tabPageOptions.Controls.Add(this.buttonChangeServer);
this.tabPageOptions.Controls.Add(this.buttonExtChannels);
this.tabPageOptions.Location = new System.Drawing.Point(4, 22);
@@ -345,7 +332,6 @@
private System.Windows.Forms.Button buttonEditMacro;
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Button buttonExtChannels;
- private System.Windows.Forms.CheckBox checkBoxLogVerbose;
private System.Windows.Forms.ToolTip toolTips;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage tabPageIR;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs 2009-07-05 17:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -65,8 +65,6 @@
MessageBox.Show(this, "Failed to start local comms. IR functions temporarily disabled.",
"TV2 Blaster Plugin - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- checkBoxLogVerbose.Checked = TV2BlasterPlugin.LogVerbose;
-
RefreshIRList();
RefreshMacroList();
@@ -298,8 +296,6 @@
private void buttonOK_Click(object sender, EventArgs e)
{
- TV2BlasterPlugin.LogVerbose = checkBoxLogVerbose.Checked;
-
DialogResult = DialogResult.OK;
Close();
}
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:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -67,7 +67,6 @@
private static IRServerInfo _irServerInfo = new IRServerInfo();
private static string _learnIRFilename;
- private static bool _logVerbose;
private static bool _mpBasicHome;
private static bool _registered;
private static string _serverHost;
@@ -83,16 +82,6 @@
}
/// <summary>
- /// Gets or sets a value indicating whether to log verbosely.
- /// </summary>
- /// <value><c>true</c> if logging is set to verbose; otherwise, <c>false</c>.</value>
- internal static bool LogVerbose
- {
- get { return _logVerbose; }
- set { _logVerbose = value; }
- }
-
- /// <summary>
/// Gets or sets a value indicating whether in configuration.
/// </summary>
/// <value><c>true</c> if in configuration; otherwise, <c>false</c>.</value>
@@ -140,8 +129,7 @@
// Register with MediaPortal to receive GUI Messages ...
GUIWindowManager.Receivers += OnMessage;
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: Started");
+ Log.Debug("TV2BlasterPlugin: Started");
}
/// <summary>
@@ -153,8 +141,7 @@
StopClient();
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: Stopped");
+ Log.Debug("TV2BlasterPlugin: Stopped");
}
#endregion IPlugin methods
@@ -240,8 +227,7 @@
_inConfiguration = true;
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: ShowPlugin()");
+ Log.Debug("TV2BlasterPlugin: ShowPlugin()");
SetupForm setupForm = new SetupForm();
if (setupForm.ShowDialog() == DialogResult.OK)
@@ -254,8 +240,7 @@
Log.Error(ex);
}
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: ShowPlugin() - End");
+ Log.Debug("TV2BlasterPlugin: ShowPlugin() - End");
}
/// <summary>
@@ -341,8 +326,7 @@
private static void ReceivedMessage(IrssMessage received)
{
- if (LogVerbose)
- Log.Debug("TV2BlasterPlugin: Received Message \"{0}\"", received.Type);
+ Log.Debug("TV2BlasterPlugin: Received Message \"{0}\"", received.Type);
try
{
@@ -351,8 +335,7 @@
case MessageType.BlastIR:
if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
{
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: Blast successful");
+ Log.Debug("TV2BlasterPlugin: Blast successful");
}
else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
{
@@ -366,8 +349,7 @@
_irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes());
_registered = true;
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: Registered to IR Server");
+ Log.Debug("TV2BlasterPlugin: Registered to IR Server");
}
else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
{
@@ -379,8 +361,7 @@
case MessageType.LearnIR:
if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
{
- if (LogVerbose)
- Log.Info("TV2BlasterPlugin: Learned IR Successfully");
+ Log.Debug("TV2BlasterPlugin: Learned IR Successfully");
byte[] dataBytes = received.GetDataAsBytes();
@@ -747,8 +728,7 @@
/// <param name="port">Port to blast to.</param>
internal static void BlastIR(string fileName, string port)
{
- if (LogVerbose)
- Log.Debug("TV2BlasterPlugin - BlastIR(): {0}, {1}", fileName, port);
+ Log.Debug("TV2BlasterPlugin - BlastIR(): {0}, {1}", fileName, port);
if (!_registered)
throw new InvalidOperationException("Cannot Blast, not registered to an active Input Service");
@@ -1010,7 +990,6 @@
using (Settings xmlreader = new Settings(MPCommon.MPConfigFile))
{
ServerHost = xmlreader.GetValueAsString("TV2BlasterPlugin", "ServerHost", "localhost");
- LogVerbose = xmlreader.GetValueAsBool("TV2BlasterPlugin", "LogVerbose", false);
// MediaPortal settings ...
_mpBasicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
@@ -1032,7 +1011,6 @@
using (Settings xmlwriter = new Settings(MPCommon.MPConfigFile))
{
xmlwriter.SetValue("TV2BlasterPlugin", "ServerHost", ServerHost);
- xmlwriter.SetValueAsBool("TV2BlasterPlugin", "LogVerbose", LogVerbose);
}
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.Designer.cs 2009-07-05 17:21:00 UTC (rev 2984)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.Designer.cs 2009-07-05 17:33:02 UTC (rev 2985)
@@ -29,7 +29,6 @@
/// </summary>
private void InitializeComponent()
{
- this.checkBoxLogVerbose = new System.Windows.Forms.CheckBox();
this.tabControl = new System.Windows.Forms.TabControl();
this.tabPageSetup = new System.Windows.Forms.TabPage();
this.buttonHelp = new System.Windows.Forms.Button();
@@ -52,16 +51,6 @@
this.tabPageMacros.SuspendLayout();
this.SuspendLayout();
//
- // checkBoxLogVerbose
- //
- this.checkBoxLogVerbose.AutoSize = true;
- this.checkBoxLogVerbose.Location = new System.Drawing.Point(8, 8);
- this.checkBoxLogVerbose.Name = "checkBoxLogVerbose";
- this.checkBoxLogVerbose.Size = new System.Drawing.Size(108, 17);
- this.checkBoxLogVerbose.TabIndex = 0;
- this.checkBoxLogVerbose.Text = "Extended logging";
- this.checkBoxLogVerbose.UseVisualStyleBackColor = true;
- //
// tabControl
//
this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -80,7 +69,6 @@
//
this.tabPageSetup.Controls.Add(this.buttonHelp);
this.tabPageSetup.Controls.Add(this.buttonHostSetup);
- this.tabPageSetup.Controls.Add(this.checkBoxLogVerbose);
this.tabPageSetup.Controls.Add(this.buttonSTB);
this.tabPageSetup.Location = new System.Drawing.Point(4, 22);
this.tabPageSetup.Name = "tabPageSetup";
@@ -285,7 +273,6 @@
#endregion
- private System.Windows.Forms.CheckBox checkBoxLogVerbose;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage tabPageIR;
private System.Windows.Forms.TabPage tabPageMacros;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
