Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1420] trunk/plugins
|
From: <an...@us...> - 2008-03-04 00:52:53
|
Revision: 1420
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1420&view=rev
Author: and-81
Date: 2008-03-03 16:52:52 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
trunk/plugins/ShortcutFileSupport/LnkPlayer.cs
trunk/plugins/ShortcutFileSupport/ShortcutFileSupport Plugin.csproj
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -182,7 +182,7 @@
IrssLog.Info(message);
Console.WriteLine(message);
}
-
+
static void LoadSettings()
{
try
@@ -195,14 +195,17 @@
_password = doc.DocumentElement.Attributes["Password"].Value;
_boxType = (StbBoxType)Enum.Parse(typeof(StbBoxType), doc.DocumentElement.Attributes["BoxType"].Value);
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
- _address = "192.168.0.100";
- _userName = "root";
- _password = "dbox2";
- _boxType = StbBoxType.Unknown;
+ CreateDefaultSettings();
}
}
static void SaveSettings()
@@ -231,7 +234,15 @@
IrssLog.Error(ex);
}
}
+ static void CreateDefaultSettings()
+ {
+ _address = "192.168.0.100";
+ _userName = "root";
+ _password = "dbox2";
+ _boxType = StbBoxType.Unknown;
+ SaveSettings();
+ }
internal static string PostData(string url, string userName, string password, StbBoxType boxType, string command)
{
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -62,6 +62,8 @@
Console.WriteLine("HCW PVR Tuner");
Console.WriteLine();
+ // TODO: Add standard IRSS logging ...
+
if (args.Length != 1)
{
Console.WriteLine("Usage:");
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -129,11 +129,17 @@
_serverHost = doc.DocumentElement.Attributes["ServerHost"].Value;
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
- _serverHost = "localhost";
+ CreateDefaultSettings();
}
}
void SaveSettings()
@@ -159,7 +165,14 @@
IrssLog.Error(ex);
}
}
+ void CreateDefaultSettings()
+ {
+ _serverHost = "localhost";
+ SaveSettings();
+ }
+
+
delegate void UpdateWindowDel(string status);
void UpdateWindow(string status)
{
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -1555,7 +1555,7 @@
{
string receivers = doc.DocumentElement.Attributes["PluginReceive"].Value;
if (!String.IsNullOrEmpty(receivers))
- _pluginNameReceive = receivers.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ _pluginNameReceive = receivers.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -253,12 +253,18 @@
{
doc.Load(ConfigurationFile);
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ return;
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
- _serverHost = "localhost";
-
+ CreateDefaultSettings();
return;
}
@@ -287,7 +293,13 @@
IrssLog.Error(ex);
}
}
+ static void CreateDefaultSettings()
+ {
+ _serverHost = "localhost";
+ SaveSettings();
+ }
+
static void CommsFailure(object obj)
{
Exception ex = obj as Exception;
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -193,14 +193,17 @@
_launchOnLoad = bool.Parse(doc.DocumentElement.Attributes["LaunchOnLoad"].Value);
_launchKeyCode = doc.DocumentElement.Attributes["LaunchKeyCode"].Value;
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
- _serverHost = "localhost";
- _programFile = String.Empty;
- _launchOnLoad = false;
- _launchKeyCode = DefaultKeyCode;
+ CreateDefaultSettings();
}
}
void SaveSettings()
@@ -241,7 +244,16 @@
IrssLog.Error(ex);
}
}
+ void CreateDefaultSettings()
+ {
+ _serverHost = "localhost";
+ _programFile = String.Empty;
+ _launchOnLoad = false;
+ _launchKeyCode = DefaultKeyCode;
+ SaveSettings();
+ }
+
void CommsFailure(object obj)
{
Exception ex = obj as Exception;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -242,13 +242,17 @@
{
doc.Load(ConfigurationFile);
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ return;
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
-
- _serverHost = "localhost";
- _remoteSkin = DefaultSkin;
-
+ CreateDefaultSettings();
return;
}
@@ -279,7 +283,15 @@
IrssLog.Error(ex);
}
}
+ static void CreateDefaultSettings()
+ {
+ _serverHost = "localhost";
+ _remoteSkin = DefaultSkin;
+ SaveSettings();
+ }
+
+
static void CommsFailure(object obj)
{
Exception ex = obj as Exception;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -489,11 +489,17 @@
_serverHost = doc.DocumentElement.Attributes["ServerHost"].Value;
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
- _serverHost = "localhost";
+ CreateDefaultSettings();
}
}
void SaveSettings()
@@ -519,7 +525,13 @@
IrssLog.Error(ex);
}
}
+ void CreateDefaultSettings()
+ {
+ _serverHost = "localhost";
+ SaveSettings();
+ }
+
void CommsFailure(object obj)
{
Exception ex = obj as Exception;
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -402,15 +402,18 @@
{
doc.Load(ConfigurationFile);
}
+ catch (FileNotFoundException)
+ {
+ IrssLog.Warn("Configuration file not found, using defaults");
+
+ CreateDefaultSettings();
+ return;
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
- _serverHost = "localhost";
- _remoteSkin = DefaultSkin;
- _webPort = DefaultWebPort;
- //_passwordHash = null;
-
+ CreateDefaultSettings();
return;
}
@@ -445,7 +448,16 @@
IrssLog.Error(ex);
}
}
+ static void CreateDefaultSettings()
+ {
+ _serverHost = "localhost";
+ _remoteSkin = DefaultSkin;
+ _webPort = DefaultWebPort;
+ //_passwordHash = null;
+ SaveSettings();
+ }
+
static void CommsFailure(object obj)
{
Exception ex = obj as Exception;
Modified: trunk/plugins/ShortcutFileSupport/LnkPlayer.cs
===================================================================
--- trunk/plugins/ShortcutFileSupport/LnkPlayer.cs 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/ShortcutFileSupport/LnkPlayer.cs 2008-03-04 00:52:52 UTC (rev 1420)
@@ -61,6 +61,10 @@
GUIGraphicsContext.ResetLastActivity();
GUIWindowManager.SendThreadMessage(message);
+
+ message = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO, 0, null);
+ GUIGraphicsContext.ResetLastActivity();
+ GUIWindowManager.SendThreadMessage(message);
}
#endregion Implementation
Modified: trunk/plugins/ShortcutFileSupport/ShortcutFileSupport Plugin.csproj
===================================================================
--- trunk/plugins/ShortcutFileSupport/ShortcutFileSupport Plugin.csproj 2008-03-03 23:19:19 UTC (rev 1419)
+++ trunk/plugins/ShortcutFileSupport/ShortcutFileSupport Plugin.csproj 2008-03-04 00:52:52 UTC (rev 1420)
@@ -51,19 +51,18 @@
<Compile Include="ShellLink.cs" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Core, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\MediaPortal 0.2.3.0\Core.DLL</HintPath>
+ <HintPath>..\..\MediaPortal\xbmc\bin\Release\Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.2.4.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\MediaPortal 0.2.3.0\Utils.DLL</HintPath>
+ <HintPath>..\..\MediaPortal\xbmc\bin\Release\Utils.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
