Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4581] trunk/plugins/APODPlugin/APODPlugin
|
From: <jmb...@us...> - 2013-06-27 08:19:54
|
Revision: 4581
http://sourceforge.net/p/mp-plugins/code/4581
Author: jmbillings
Date: 2013-06-27 08:19:45 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Change to add 1.4 compatibility. Still trouble moving back where image not found to be fixed.
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
Modified: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-06-21 22:22:46 UTC (rev 4580)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-06-27 08:19:45 UTC (rev 4581)
@@ -28,11 +28,19 @@
apodURLs.Add(APODURL);
}
- internal void GetImage(int step)
+ internal bool GetImage(int step)
{
- currentStep = step;
- client.OpenReadCompleted += new OpenReadCompletedEventHandler(readComplete);
- client.OpenReadAsync(new Uri(apodURLs[step]));
+ try
+ {
+ currentStep = step;
+ client.OpenReadCompleted += new OpenReadCompletedEventHandler(readComplete);
+ client.OpenReadAsync(new Uri(apodURLs[step]));
+ return true;
+ }
+ catch (IndexOutOfRangeException ex)
+ {
+ return false; //no image to get!
+ }
}
private void readComplete(object sender, OpenReadCompletedEventArgs args)
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-06-21 22:22:46 UTC (rev 4580)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-06-27 08:19:45 UTC (rev 4581)
@@ -133,7 +133,18 @@
GUIWaitCursor.Show();
downloading = true;
imageStep = imageStep + 1;
- downloader.GetImage(imageStep);
+ if (!downloader.GetImage(imageStep))
+ {
+ GUIDialogOK dlgOK = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
+ if (dlgOK != null)
+ {
+ dlgOK.SetHeading("Info");
+ dlgOK.SetLine(1, "This is the first image!");
+ dlgOK.DoModal(this.GetWindowId());
+ }
+ downloading = false;
+ imageStep = imageStep - 1; //set counter back to where we were
+ }
}
else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT)
{
@@ -147,6 +158,7 @@
dlgOK.SetLine(1, "This is the most recent image!");
dlgOK.DoModal(this.GetWindowId());
}
+ downloading = false;
return;
}
GUIWaitCursor.Show();
@@ -193,7 +205,7 @@
GUIDialogOK dlgOK = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
if (dlgOK != null)
{
- dlgOK.SetHeading("Error" /* or Message */);
+ dlgOK.SetHeading("Error");
dlgOK.SetLine(1, "An exception occurred during download:");
dlgOK.SetLine(2, e.downloadException.Message);
dlgOK.DoModal(this.GetWindowId());
Modified: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-06-21 22:22:46 UTC (rev 4580)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-06-27 08:19:45 UTC (rev 4581)
@@ -14,7 +14,7 @@
[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: CompatibleVersion("1.2.300.0")]
+[assembly: CompatibleVersion("1.4.0.0")]
[assembly: UsesSubsystem("MP.SkinEngine")]
[assembly: UsesSubsystem("MP.Config")]
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-06-21 22:22:46 UTC (rev 4580)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-06-27 08:19:45 UTC (rev 4581)
@@ -18,3 +18,5 @@
c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.dll
c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.pdb
c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\APODPlugin.xml
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Microsoft.WindowsAPICodePack.Shell.dll
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Microsoft.WindowsAPICodePack.dll
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
