Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [360] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2007-04-30 18:55:06
|
Revision: 360
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=360&view=rev
Author: saamand
Date: 2007-04-30 11:55:03 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs
trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -112,8 +112,8 @@
public void Dispose()
{
- m_EventStop_LyricController.Close();
- m_EventStopped_LyricController.Close();
+ //m_EventStop_LyricController.Close();
+ //m_EventStopped_LyricController.Close();
// clean-up operations may be placed here
for (int i = 0; i < threadList.Count; i++)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -3,7 +3,7 @@
using System.Text;
using System.Runtime.Serialization;
-namespace LyricsEngine.Database
+namespace MyLyrics
{
[Serializable]
public class LyricsDatabase : IDictionary<string, LyricsItem>, ISerializable
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -3,7 +3,7 @@
using System.Text;
using System.Runtime.Serialization;
-namespace LyricsEngine.Database
+namespace MyLyrics
{
[Serializable]
public class LyricsItem
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.20")]
+[assembly: AssemblyVersion("0.21")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -4,8 +4,6 @@
using System.IO;
using System.Xml;
-using LyricsEngine.Database;
-
namespace MyLyrics
{
class ConvertFromXMLtoLyricsDatabase
Modified: trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -5,7 +5,6 @@
using System.Runtime.Serialization.Formatters.Binary;
using LyricsEngine;
-using LyricsEngine.Database;
namespace MyLyrics
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -11,7 +11,6 @@
using System.Timers;
using LyricsEngine;
-using LyricsEngine.Database;
using LyricsEngine.LRC;
using MediaPortal.GUI.Library;
@@ -341,17 +340,28 @@
m_sitesToSearch = (string[])sitesToSearch.ToArray(typeof(string));
// Deserialize lyrics and marked database, and save references in LyricsDB
- string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
- FileStream fs = new FileStream(path, FileMode.Open);
- BinaryFormatter bf = new BinaryFormatter();
- LyricsDB = (LyricsDatabase)bf.Deserialize(fs);
- fs.Close();
+ try
+ {
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
+ FileStream fs = new FileStream(path, FileMode.Open);
+ BinaryFormatter bf = new BinaryFormatter();
+ LyricsDB = (LyricsDatabase)bf.Deserialize(fs);
+ fs.Close();
- path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName);
- fs = new FileStream(path, FileMode.Open);
- LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs);
- fs.Close();
-
+ path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName);
+ fs = new FileStream(path, FileMode.Open);
+ LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs);
+ fs.Close();
+ }
+ catch
+ {
+ GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
+ dlg.SetHeading("No lyric database found");
+ dlg.SetLine(1, "Please run the MyLyrics configuration");
+ dlg.SetLine(2, "before running the plugin.");
+ dlg.SetLine(3, String.Empty);
+ dlg.DoModal(GUIWindowManager.ActiveWindow);
+ }
}
void SaveSettings()
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-30 18:55:03 UTC (rev 360)
@@ -5,13 +5,12 @@
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
+ <StartupObject>MyLyrics.MyLyricsSetup_test</StartupObject>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,10 +45,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\..\Program Files\Team Mediaportal\MediaPortal\Plugins\Windows\Dialogs.DLL</HintPath>
</Reference>
- <Reference Include="LyricsEngine, Version=0.13.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\LyricsEngine\bin\Debug\LyricsEngine.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -128,6 +123,12 @@
<ItemGroup>
<Content Include="Changelog.txt" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\LyricsEngine\LyricsEngine.csproj">
+ <Project>{B0760CE8-086F-4301-9091-C9BE54F261FD}</Project>
+ <Name>LyricsEngine</Name>
+ </ProjectReference>
+ </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.
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Text;
-using LyricsEngine.Database;
-
namespace MyLyrics
{
class MyLyricsSettings
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -23,7 +23,6 @@
using MediaPortal.Profile;
using LyricsEngine;
-using LyricsEngine.Database;
namespace MyLyrics
{
@@ -835,9 +834,6 @@
private void MyLyricsSetup_FormClosing(object sender, FormClosingEventArgs e)
{
-
-
-
LyricDiagnostics.Dispose();
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -22,7 +22,6 @@
using LyricsEngine;
using LyricsEngine.LRC;
-using LyricsEngine.Database;
namespace MyLyrics
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -8,7 +8,6 @@
using System.Threading;
using LyricsEngine;
-using LyricsEngine.Database;
namespace MyLyrics
{
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-04-30 18:53:08 UTC (rev 359)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-04-30 18:55:03 UTC (rev 360)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.20")]
-[assembly: AssemblyFileVersion("0.20")]
+[assembly: AssemblyVersion("0.21")]
+[assembly: AssemblyFileVersion("0.21")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
