Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3031] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-07-26 11:48:22
|
Revision: 3031
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3031&view=rev
Author: saamand
Date: 2009-07-26 11:48:12 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Version 1.33
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Added Paths:
-----------
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-07-26 11:48:12 UTC (rev 3031)
@@ -59,7 +59,7 @@
<Compile Include="LyricsSites\HotLyrics.cs" />
<Compile Include="LyricsSites\Lyrics007.cs" />
<Compile Include="LyricsSites\LyricsOnDemand.cs" />
- <Compile Include="LyricsSites\SeekLyrics.cs" />
+ <Compile Include="LyricsSites\LyricsPluginSite.cs" />
<Compile Include="LyricsWebClient.cs">
<SubType>Component</SubType>
</Compile>
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -129,7 +129,7 @@
lyricTemp = new StringBuilder();
line = sr.ReadLine().Trim();
- while (line.IndexOf("<BR><BR>") == -1)
+ while (line.Contains("<p>") == false)
{
lyricTemp.Append(line);
if (sr.EndOfStream || ++noOfLinesCount > 300)
Added: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs (rev 0)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -0,0 +1,243 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Diagnostics;
+using System.Net;
+using System.Threading;
+using System.Timers;
+using System.Text.RegularExpressions;
+
+namespace LyricsEngine.LyricSites
+{
+ class LyricsPluginSite
+ {
+ string lyric = "";
+ bool complete;
+ System.Timers.Timer timer;
+ int timeLimit;
+
+ public string Lyric
+ {
+ get { return lyric; }
+ }
+
+ public LyricsPluginSite(string artist, string title, ManualResetEvent m_EventStop_SiteSearches, int timeLimit)
+ {
+ this.timeLimit = timeLimit;
+ timer = new System.Timers.Timer();
+
+ artist = LyricUtil.RemoveFeatComment(artist);
+ title = LyricUtil.TrimForParenthesis(title);
+
+ // Escape characters
+ artist = fixEscapeCharacters(artist);
+ title = fixEscapeCharacters(title);
+
+ // Hebrew letters
+ artist = fixHebrew(artist);
+ title = fixHebrew(title);
+
+ string urlString = "http://www.lyricsplugin.com/winamp03/plugin/?" + "artist=" + artist + "&title=" + title;
+
+ timer.Enabled = true;
+ timer.Interval = timeLimit;
+ timer.Elapsed += new ElapsedEventHandler(timer_Elapsed);
+ timer.Start();
+
+ Uri uri = new Uri(urlString);
+ LyricsWebClient client = new LyricsWebClient();
+ client.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(callbackMethod);
+ client.OpenReadAsync(uri);
+
+ while (complete == false)
+ {
+ if (m_EventStop_SiteSearches.WaitOne(1, true))
+ {
+ complete = true;
+ }
+ else
+ {
+ System.Threading.Thread.Sleep(100);
+ }
+ }
+ }
+
+ private static string fixEscapeCharacters(string text)
+ {
+ text = text.Replace("(", "");
+ text = text.Replace(")", "");
+ text = text.Replace("#", "");
+ text = text.Replace("/", "");
+
+ text = text.Replace("%", "%25");
+
+ text = text.Replace(" ", "%20");
+ text = text.Replace("$", "%24");
+ text = text.Replace("&", "%26");
+ text = text.Replace("+", "%2B");
+ text = text.Replace(",", "%2C");
+ text = text.Replace(":", "%3A");
+ text = text.Replace(";", "%3B");
+ text = text.Replace("=", "%3D");
+ text = text.Replace("?", "%3F");
+ text = text.Replace("@", "%40");
+
+ return text;
+ }
+
+ private static string fixHebrew(string text)
+ {
+ text = text.Replace("?", "%d7%90");
+ text = text.Replace("?", "%D7%91");
+ text = text.Replace("?", "%D7%92");
+ text = text.Replace("?", "%D7%93");
+ text = text.Replace("?", "%D7%94");
+ text = text.Replace("?", "%D7%95");
+ text = text.Replace("?", "%D7%96");
+ text = text.Replace("?", "%D7%97");
+ text = text.Replace("?", "%D7%98");
+ text = text.Replace("?", "%D7%99");
+ text = text.Replace("?", "%D7%9A");
+ text = text.Replace("?", "%D7%9B");
+ text = text.Replace("?", "%D7%9C");
+ text = text.Replace("?", "%D7%9D");
+ text = text.Replace("?", "%D7%9E");
+ text = text.Replace("?", "%D7%9F");
+ text = text.Replace("?", "%D7%A0");
+ text = text.Replace("?", "%D7%A1");
+ text = text.Replace("?", "%D7%A2");
+ text = text.Replace("?", "%D7%A3");
+ text = text.Replace("?", "%D7%A4");
+ text = text.Replace("?", "%D7%A5");
+ text = text.Replace("?", "%D7%A6");
+ text = text.Replace("?", "%D7%A7");
+ text = text.Replace("?", "%D7%A8");
+ text = text.Replace("?", "%D7%A9");
+ text = text.Replace("?", "%D7%AA");
+
+ text = text.Replace("\xE0", "%d7%90");
+ text = text.Replace("\xE1", "%D7%91");
+ text = text.Replace("\xE2", "%D7%92");
+ text = text.Replace("\xE3", "%D7%93");
+ text = text.Replace("\xE4", "%D7%94");
+ text = text.Replace("\xE5", "%D7%95");
+ text = text.Replace("\xE6", "%D7%96");
+ text = text.Replace("\xE7", "%D7%97");
+ text = text.Replace("\xE8", "%D7%98");
+ text = text.Replace("\xE9", "%D7%99");
+ text = text.Replace("\xEA", "%D7%9A");
+ text = text.Replace("\xEB", "%D7%9B");
+ text = text.Replace("\xEC", "%D7%9C");
+ text = text.Replace("\xED", "%D7%9D");
+ text = text.Replace("\xEE", "%D7%9E");
+ text = text.Replace("\xEF", "%D7%9F");
+ text = text.Replace("\xF0", "%D7%A0");
+ text = text.Replace("\xF1", "%D7%A1");
+ text = text.Replace("\xF2", "%D7%A2");
+ text = text.Replace("\xF3", "%D7%A3");
+ text = text.Replace("\xF4", "%D7%A4");
+ text = text.Replace("\xF5", "%D7%A5");
+ text = text.Replace("\xF6", "%D7%A6");
+ text = text.Replace("\xF7", "%D7%A7");
+ text = text.Replace("\xF8", "%D7%A8");
+ text = text.Replace("\xF9", "%D7%A9");
+ text = text.Replace("\xFA", "%D7%AA");
+
+ return text;
+ }
+
+ private void callbackMethod(object sender, OpenReadCompletedEventArgs e)
+ {
+ bool thisMayBeTheCorrectLyric = true;
+ StringBuilder lyricTemp = new StringBuilder();
+
+ LyricsWebClient client = (LyricsWebClient)sender;
+ Stream reply = null;
+ StreamReader sr = null;
+
+ try
+ {
+ reply = (Stream)e.Result;
+ sr = new StreamReader(reply, Encoding.UTF8);
+
+ string line = "";
+ int noOfLinesCount = 0;
+
+ while (line.IndexOf(@"<div id=""lyrics"">") == -1)
+ {
+ if (sr.EndOfStream || ++noOfLinesCount > 300)
+ {
+ thisMayBeTheCorrectLyric = false;
+ break;
+ }
+ else
+ {
+ line = sr.ReadLine();
+ }
+ }
+
+
+ if (thisMayBeTheCorrectLyric)
+ {
+ lyricTemp = new StringBuilder();
+ line = sr.ReadLine();
+
+ while (line.IndexOf("</div>") == -1)
+ {
+ lyricTemp.Append(line);
+
+ if (sr.EndOfStream)
+ {
+ thisMayBeTheCorrectLyric = false;
+ break;
+ }
+ else
+ {
+ line = sr.ReadLine();
+ }
+ }
+
+ lyricTemp.Replace("<br>", Environment.NewLine);
+ lyricTemp.Replace("<br />", Environment.NewLine);
+ lyricTemp.Replace(""", "\"");
+
+ lyric = lyricTemp.ToString().Trim();
+
+ if (lyric.Length == 0)
+ {
+ lyric = "Not found";
+ }
+ }
+ }
+ catch
+ {
+ lyric = "Not found";
+ }
+ finally
+ {
+ if (sr != null)
+ {
+ sr.Close();
+ }
+
+ if (reply != null)
+ {
+ reply.Close();
+ }
+ complete = true;
+ }
+ }
+
+ void timer_Elapsed(object sender, ElapsedEventArgs e)
+ {
+ timer.Stop();
+ timer.Close();
+ timer.Dispose();
+
+ lyric = "Not found";
+ complete = true;
+ Thread.CurrentThread.Abort();
+ }
+ }
+}
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -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("1.32")]
+[assembly: AssemblyVersion("1.33")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -15,7 +15,7 @@
"HotLyrics",
"Actionext",
"LyrDB",
- "SeekLyrics"
+ "LyricsPluginSite"
};
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -80,7 +80,7 @@
this.lbInfo1.Name = "lbInfo1";
this.lbInfo1.Size = new System.Drawing.Size(197, 18);
this.lbInfo1.TabIndex = 3;
- this.lbInfo1.Text = "MyLyrics plugin, version 1.32";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.33";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -32,6 +32,7 @@
this.tbTitle = new System.Windows.Forms.TextBox();
this.lbTitle = new System.Windows.Forms.Label();
this.tbArtist = new System.Windows.Forms.TextBox();
+ this.btCancel = new System.Windows.Forms.Button();
this.lbArtist = new System.Windows.Forms.Label();
this.btFind = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -42,17 +43,16 @@
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.tbLyrics = new System.Windows.Forms.TextBox();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.cbLrcFinder = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.btCancel = new System.Windows.Forms.Button();
this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbLyricsPluginSite = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.btClose = new System.Windows.Forms.Button();
this.btUpdate = new System.Windows.Forms.Button();
- this.cbLrcFinder = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.gbSearchInfo.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -64,17 +64,19 @@
this.gbSearchInfo.Controls.Add(this.tbTitle);
this.gbSearchInfo.Controls.Add(this.lbTitle);
this.gbSearchInfo.Controls.Add(this.tbArtist);
+ this.gbSearchInfo.Controls.Add(this.btCancel);
this.gbSearchInfo.Controls.Add(this.lbArtist);
- this.gbSearchInfo.Location = new System.Drawing.Point(12, 12);
+ this.gbSearchInfo.Controls.Add(this.btFind);
+ this.gbSearchInfo.Location = new System.Drawing.Point(9, 12);
this.gbSearchInfo.Name = "gbSearchInfo";
- this.gbSearchInfo.Size = new System.Drawing.Size(432, 85);
+ this.gbSearchInfo.Size = new System.Drawing.Size(432, 97);
this.gbSearchInfo.TabIndex = 0;
this.gbSearchInfo.TabStop = false;
- this.gbSearchInfo.Text = "Search information";
+ this.gbSearchInfo.Text = "Song information";
//
// tbTitle
//
- this.tbTitle.Location = new System.Drawing.Point(73, 53);
+ this.tbTitle.Location = new System.Drawing.Point(73, 42);
this.tbTitle.Name = "tbTitle";
this.tbTitle.Size = new System.Drawing.Size(344, 20);
this.tbTitle.TabIndex = 2;
@@ -82,7 +84,7 @@
// lbTitle
//
this.lbTitle.AutoSize = true;
- this.lbTitle.Location = new System.Drawing.Point(15, 56);
+ this.lbTitle.Location = new System.Drawing.Point(15, 45);
this.lbTitle.Name = "lbTitle";
this.lbTitle.Size = new System.Drawing.Size(30, 13);
this.lbTitle.TabIndex = 2;
@@ -90,15 +92,25 @@
//
// tbArtist
//
- this.tbArtist.Location = new System.Drawing.Point(73, 26);
+ this.tbArtist.Location = new System.Drawing.Point(73, 19);
this.tbArtist.Name = "tbArtist";
this.tbArtist.Size = new System.Drawing.Size(344, 20);
this.tbArtist.TabIndex = 1;
//
+ // btCancel
+ //
+ this.btCancel.Location = new System.Drawing.Point(354, 68);
+ this.btCancel.Name = "btCancel";
+ this.btCancel.Size = new System.Drawing.Size(65, 23);
+ this.btCancel.TabIndex = 4;
+ this.btCancel.Text = "&Cancel";
+ this.btCancel.UseVisualStyleBackColor = true;
+ this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
+ //
// lbArtist
//
this.lbArtist.AutoSize = true;
- this.lbArtist.Location = new System.Drawing.Point(15, 29);
+ this.lbArtist.Location = new System.Drawing.Point(15, 22);
this.lbArtist.Name = "lbArtist";
this.lbArtist.Size = new System.Drawing.Size(33, 13);
this.lbArtist.TabIndex = 0;
@@ -106,7 +118,7 @@
//
// btFind
//
- this.btFind.Location = new System.Drawing.Point(283, 67);
+ this.btFind.Location = new System.Drawing.Point(283, 68);
this.btFind.Name = "btFind";
this.btFind.Size = new System.Drawing.Size(65, 23);
this.btFind.TabIndex = 3;
@@ -117,9 +129,9 @@
// groupBox1
//
this.groupBox1.Controls.Add(this.lvSearchResults);
- this.groupBox1.Location = new System.Drawing.Point(13, 207);
+ this.groupBox1.Location = new System.Drawing.Point(9, 196);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(431, 147);
+ this.groupBox1.Size = new System.Drawing.Size(432, 182);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Search results";
@@ -134,7 +146,7 @@
this.lvSearchResults.Location = new System.Drawing.Point(17, 21);
this.lvSearchResults.MultiSelect = false;
this.lvSearchResults.Name = "lvSearchResults";
- this.lvSearchResults.Size = new System.Drawing.Size(399, 111);
+ this.lvSearchResults.Size = new System.Drawing.Size(399, 146);
this.lvSearchResults.TabIndex = 10;
this.lvSearchResults.UseCompatibleStateImageBehavior = false;
this.lvSearchResults.View = System.Windows.Forms.View.Details;
@@ -159,9 +171,9 @@
// groupBox2
//
this.groupBox2.Controls.Add(this.tbLyrics);
- this.groupBox2.Location = new System.Drawing.Point(13, 360);
+ this.groupBox2.Location = new System.Drawing.Point(9, 384);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(431, 183);
+ this.groupBox2.Size = new System.Drawing.Size(432, 156);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Lyric";
@@ -172,7 +184,7 @@
this.tbLyrics.Multiline = true;
this.tbLyrics.Name = "tbLyrics";
this.tbLyrics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.tbLyrics.Size = new System.Drawing.Size(399, 153);
+ this.tbLyrics.Size = new System.Drawing.Size(399, 131);
this.tbLyrics.TabIndex = 0;
//
// gbLyricSites
@@ -180,28 +192,39 @@
this.gbLyricSites.Controls.Add(this.cbLrcFinder);
this.gbLyricSites.Controls.Add(this.cbLyrDB);
this.gbLyricSites.Controls.Add(this.cbActionext);
- this.gbLyricSites.Controls.Add(this.btCancel);
- this.gbLyricSites.Controls.Add(this.btFind);
this.gbLyricSites.Controls.Add(this.cbHotLyrics);
- this.gbLyricSites.Controls.Add(this.cbSeekLyrics);
this.gbLyricSites.Controls.Add(this.cbLyricsOnDemand);
this.gbLyricSites.Controls.Add(this.cbLyrics007);
this.gbLyricSites.Controls.Add(this.cbLyricWiki);
+ this.gbLyricSites.Controls.Add(this.cbLyricsPluginSite);
this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbLyricSites.Location = new System.Drawing.Point(12, 103);
+ this.gbLyricSites.Location = new System.Drawing.Point(9, 115);
this.gbLyricSites.Name = "gbLyricSites";
- this.gbLyricSites.Size = new System.Drawing.Size(432, 98);
+ this.gbLyricSites.Size = new System.Drawing.Size(432, 75);
this.gbLyricSites.TabIndex = 29;
this.gbLyricSites.TabStop = false;
this.gbLyricSites.Text = "Lyric sites to search";
//
+ // cbLrcFinder
+ //
+ this.cbLrcFinder.AutoSize = true;
+ this.cbLrcFinder.Checked = true;
+ this.cbLrcFinder.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLrcFinder.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLrcFinder.Location = new System.Drawing.Point(338, 21);
+ this.cbLrcFinder.Name = "cbLrcFinder";
+ this.cbLrcFinder.Size = new System.Drawing.Size(68, 17);
+ this.cbLrcFinder.TabIndex = 19;
+ this.cbLrcFinder.Text = "LrcFinder";
+ this.cbLrcFinder.UseVisualStyleBackColor = true;
+ //
// cbLyrDB
//
this.cbLyrDB.AutoSize = true;
this.cbLyrDB.Checked = true;
this.cbLyrDB.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrDB.Location = new System.Drawing.Point(237, 21);
+ this.cbLyrDB.Location = new System.Drawing.Point(338, 44);
this.cbLyrDB.Name = "cbLyrDB";
this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
this.cbLyrDB.TabIndex = 18;
@@ -214,56 +237,33 @@
this.cbActionext.Checked = true;
this.cbActionext.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbActionext.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbActionext.Location = new System.Drawing.Point(110, 21);
+ this.cbActionext.Location = new System.Drawing.Point(131, 44);
this.cbActionext.Name = "cbActionext";
this.cbActionext.Size = new System.Drawing.Size(68, 17);
this.cbActionext.TabIndex = 17;
this.cbActionext.Text = "Actionext";
this.cbActionext.UseVisualStyleBackColor = true;
//
- // btCancel
- //
- this.btCancel.Location = new System.Drawing.Point(352, 67);
- this.btCancel.Name = "btCancel";
- this.btCancel.Size = new System.Drawing.Size(65, 23);
- this.btCancel.TabIndex = 4;
- this.btCancel.Text = "&Cancel";
- this.btCancel.UseVisualStyleBackColor = true;
- this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
- //
// cbHotLyrics
//
this.cbHotLyrics.AutoSize = true;
this.cbHotLyrics.Checked = true;
this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbHotLyrics.Location = new System.Drawing.Point(338, 44);
+ this.cbHotLyrics.Location = new System.Drawing.Point(237, 44);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 14;
this.cbHotLyrics.Text = "Hot Lyrics";
this.cbHotLyrics.UseVisualStyleBackColor = true;
//
- // cbSeekLyrics
- //
- this.cbSeekLyrics.AutoSize = true;
- this.cbSeekLyrics.Checked = true;
- this.cbSeekLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbSeekLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbSeekLyrics.Location = new System.Drawing.Point(338, 21);
- this.cbSeekLyrics.Name = "cbSeekLyrics";
- this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17);
- this.cbSeekLyrics.TabIndex = 15;
- this.cbSeekLyrics.Text = "Seek Lyrics";
- this.cbSeekLyrics.UseVisualStyleBackColor = true;
- //
// cbLyricsOnDemand
//
this.cbLyricsOnDemand.AutoSize = true;
this.cbLyricsOnDemand.Checked = true;
this.cbLyricsOnDemand.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyricsOnDemand.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricsOnDemand.Location = new System.Drawing.Point(110, 44);
+ this.cbLyricsOnDemand.Location = new System.Drawing.Point(17, 21);
this.cbLyricsOnDemand.Name = "cbLyricsOnDemand";
this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17);
this.cbLyricsOnDemand.TabIndex = 12;
@@ -276,7 +276,7 @@
this.cbLyrics007.Checked = true;
this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrics007.Location = new System.Drawing.Point(237, 44);
+ this.cbLyrics007.Location = new System.Drawing.Point(237, 21);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
this.cbLyrics007.TabIndex = 13;
@@ -296,9 +296,22 @@
this.cbLyricWiki.Text = "LyricWiki";
this.cbLyricWiki.UseVisualStyleBackColor = true;
//
+ // cbLyricsPluginSite
+ //
+ this.cbLyricsPluginSite.AutoSize = true;
+ this.cbLyricsPluginSite.Checked = true;
+ this.cbLyricsPluginSite.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLyricsPluginSite.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLyricsPluginSite.Location = new System.Drawing.Point(131, 21);
+ this.cbLyricsPluginSite.Name = "cbLyricsPluginSite";
+ this.cbLyricsPluginSite.Size = new System.Drawing.Size(80, 17);
+ this.cbLyricsPluginSite.TabIndex = 15;
+ this.cbLyricsPluginSite.Text = "LyricsPlugin";
+ this.cbLyricsPluginSite.UseVisualStyleBackColor = true;
+ //
// btClose
//
- this.btClose.Location = new System.Drawing.Point(364, 549);
+ this.btClose.Location = new System.Drawing.Point(361, 546);
this.btClose.Name = "btClose";
this.btClose.Size = new System.Drawing.Size(65, 23);
this.btClose.TabIndex = 30;
@@ -309,7 +322,7 @@
// btUpdate
//
this.btUpdate.Enabled = false;
- this.btUpdate.Location = new System.Drawing.Point(295, 549);
+ this.btUpdate.Location = new System.Drawing.Point(292, 546);
this.btUpdate.Name = "btUpdate";
this.btUpdate.Size = new System.Drawing.Size(65, 23);
this.btUpdate.TabIndex = 11;
@@ -317,19 +330,6 @@
this.btUpdate.UseVisualStyleBackColor = true;
this.btUpdate.Click += new System.EventHandler(this.btUpdate_Click);
//
- // cbLrcFinder
- //
- this.cbLrcFinder.AutoSize = true;
- this.cbLrcFinder.Checked = true;
- this.cbLrcFinder.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLrcFinder.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLrcFinder.Location = new System.Drawing.Point(18, 21);
- this.cbLrcFinder.Name = "cbLrcFinder";
- this.cbLrcFinder.Size = new System.Drawing.Size(68, 17);
- this.cbLrcFinder.TabIndex = 19;
- this.cbLrcFinder.Text = "LrcFinder";
- this.cbLrcFinder.UseVisualStyleBackColor = true;
- //
// FindLyric
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -373,10 +373,10 @@
private System.Windows.Forms.TextBox tbLyrics;
private MediaPortal.UserInterface.Controls.MPGroupBox gbLyricSites;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbHotLyrics;
- internal MediaPortal.UserInterface.Controls.MPCheckBox cbSeekLyrics;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsOnDemand;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrics007;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricWiki;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsPluginSite;
private System.Windows.Forms.ListView lvSearchResults;
private System.Windows.Forms.ColumnHeader cbSite;
private System.Windows.Forms.ColumnHeader cbResult;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -88,7 +88,7 @@
cbLyrDB.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrDB", "True")).ToString().Equals("True") ? true : false;
cbLyrics007.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrics007", "True")).ToString().Equals("True") ? true : false;
cbLyricsOnDemand.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True") ? true : false;
- cbSeekLyrics.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useSeekLyrics", "True")).ToString().Equals("True") ? true : false;
+ cbLyricsPluginSite.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsPluginSite", "True")).ToString().Equals("True") ? true : false;
cbHotLyrics.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True") ? true : false;
m_automaticFetch = xmlreader.GetValueAsBool("myLyrics", "automaticFetch", true);
m_automaticUpdate = xmlreader.GetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", false);
@@ -181,9 +181,9 @@
{
sitesToSearch.Add("LyricsOnDemand");
}
- if (cbSeekLyrics.Checked)
+ if (cbLyricsPluginSite.Checked)
{
- sitesToSearch.Add("SeekLyrics");
+ sitesToSearch.Add("LyricsPluginSite");
}
// If automaticUpdate is set then return after the first positive search
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -318,10 +318,10 @@
sitesToSearch.Add("Lyrics007");
if (((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True"))
sitesToSearch.Add("LyricsOnDemand");
- if (((string)xmlreader.GetValueAsString("myLyrics", "useSeekLyrics", "True")).ToString().Equals("True"))
- sitesToSearch.Add("SeekLyrics");
if (((string)xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True"))
sitesToSearch.Add("HotLyrics");
+ if (((string)xmlreader.GetValueAsString("myLyrics", "useLyricsPluginSite", "True")).ToString().Equals("True"))
+ sitesToSearch.Add("LyricsPluginSite");
m_find = xmlreader.GetValueAsString("myLyrics", "find", "");
m_replace = xmlreader.GetValueAsString("myLyrics", "replace", "");
@@ -788,6 +788,8 @@
// If all found in music tags, then no need for online search
if (m_noOfSearchesCompleted == m_noOfSearchesToComplete)
{
+ m_Searching = false;
+ ChangeButtonsEnableState();
return;
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -106,7 +106,7 @@
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbSeekLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbLyricsPluginSite = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
this.trackBar = new System.Windows.Forms.TrackBar();
@@ -156,7 +156,7 @@
this.tabControl.Location = new System.Drawing.Point(0, 0);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(558, 530);
+ this.tabControl.Size = new System.Drawing.Size(558, 538);
this.tabControl.TabIndex = 1;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
@@ -165,7 +165,7 @@
this.tabPageLyricsDatabase.Location = new System.Drawing.Point(4, 22);
this.tabPageLyricsDatabase.Name = "tabPageLyricsDatabase";
this.tabPageLyricsDatabase.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageLyricsDatabase.Size = new System.Drawing.Size(550, 504);
+ this.tabPageLyricsDatabase.Size = new System.Drawing.Size(550, 512);
this.tabPageLyricsDatabase.TabIndex = 1;
this.tabPageLyricsDatabase.Text = "Lyrics database";
this.tabPageLyricsDatabase.UseVisualStyleBackColor = true;
@@ -622,7 +622,7 @@
this.tabPageSetup.Location = new System.Drawing.Point(4, 22);
this.tabPageSetup.Name = "tabPageSetup";
this.tabPageSetup.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageSetup.Size = new System.Drawing.Size(550, 504);
+ this.tabPageSetup.Size = new System.Drawing.Size(550, 512);
this.tabPageSetup.TabIndex = 2;
this.tabPageSetup.Text = "Settings";
this.tabPageSetup.UseVisualStyleBackColor = true;
@@ -867,7 +867,7 @@
//
this.cbEnableLogging.AutoSize = true;
this.cbEnableLogging.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbEnableLogging.Location = new System.Drawing.Point(360, 20);
+ this.cbEnableLogging.Location = new System.Drawing.Point(359, 20);
this.cbEnableLogging.Name = "cbEnableLogging";
this.cbEnableLogging.Size = new System.Drawing.Size(94, 17);
this.cbEnableLogging.TabIndex = 11;
@@ -929,10 +929,10 @@
this.groupBox2.Controls.Add(this.cbLyrDB);
this.groupBox2.Controls.Add(this.cbActionext);
this.groupBox2.Controls.Add(this.cbLyrics007);
+ this.groupBox2.Controls.Add(this.cbLyricsOnDemand);
this.groupBox2.Controls.Add(this.cbLyricWiki);
- this.groupBox2.Controls.Add(this.cbLyricsOnDemand);
this.groupBox2.Controls.Add(this.cbHotLyrics);
- this.groupBox2.Controls.Add(this.cbSeekLyrics);
+ this.groupBox2.Controls.Add(this.cbLyricsPluginSite);
this.groupBox2.Location = new System.Drawing.Point(229, 48);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(301, 90);
@@ -946,7 +946,7 @@
this.cbLrcFinder.Checked = true;
this.cbLrcFinder.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLrcFinder.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLrcFinder.Location = new System.Drawing.Point(20, 61);
+ this.cbLrcFinder.Location = new System.Drawing.Point(130, 19);
this.cbLrcFinder.Name = "cbLrcFinder";
this.cbLrcFinder.Size = new System.Drawing.Size(68, 17);
this.cbLrcFinder.TabIndex = 10;
@@ -959,7 +959,7 @@
this.cbLyrDB.Checked = true;
this.cbLyrDB.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrDB.Location = new System.Drawing.Point(216, 17);
+ this.cbLyrDB.Location = new System.Drawing.Point(216, 40);
this.cbLyrDB.Name = "cbLyrDB";
this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
this.cbLyrDB.TabIndex = 9;
@@ -973,7 +973,7 @@
this.cbActionext.Checked = true;
this.cbActionext.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbActionext.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbActionext.Location = new System.Drawing.Point(131, 61);
+ this.cbActionext.Location = new System.Drawing.Point(216, 19);
this.cbActionext.Name = "cbActionext";
this.cbActionext.Size = new System.Drawing.Size(68, 17);
this.cbActionext.TabIndex = 8;
@@ -987,7 +987,7 @@
this.cbLyrics007.Checked = true;
this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrics007.Location = new System.Drawing.Point(20, 40);
+ this.cbLyrics007.Location = new System.Drawing.Point(20, 61);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
this.cbLyrics007.TabIndex = 4;
@@ -1001,7 +1001,7 @@
this.cbLyricWiki.Checked = true;
this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricWiki.Location = new System.Drawing.Point(131, 17);
+ this.cbLyricWiki.Location = new System.Drawing.Point(130, 40);
this.cbLyricWiki.Name = "cbLyricWiki";
this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
this.cbLyricWiki.TabIndex = 2;
@@ -1029,7 +1029,7 @@
this.cbHotLyrics.Checked = true;
this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbHotLyrics.Location = new System.Drawing.Point(131, 39);
+ this.cbHotLyrics.Location = new System.Drawing.Point(130, 61);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 7;
@@ -1037,19 +1037,19 @@
this.cbHotLyrics.UseVisualStyleBackColor = true;
this.cbHotLyrics.Leave += new System.EventHandler(this.WriteMediaPortalXML);
//
- // cbSeekLyrics
+ // cbLyricsPluginSite
//
- this.cbSeekLyrics.AutoSize = true;
- this.cbSeekLyrics.Checked = true;
- this.cbSeekLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbSeekLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbSeekLyrics.Location = new System.Drawing.Point(216, 40);
- this.cbSeekLyrics.Name = "cbSeekLyrics";
- this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17);
- this.cbSeekLyrics.TabIndex = 6;
- this.cbSeekLyrics.Text = "Seek Lyrics";
- this.cbSeekLyrics.UseVisualStyleBackColor = true;
- this.cbSeekLyrics.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ this.cbLyricsPluginSite.AutoSize = true;
+ this.cbLyricsPluginSite.Checked = true;
+ this.cbLyricsPluginSite.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbLyricsPluginSite.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbLyricsPluginSite.Location = new System.Drawing.Point(20, 40);
+ this.cbLyricsPluginSite.Name = "cbLyricsPluginSite";
+ this.cbLyricsPluginSite.Size = new System.Drawing.Size(80, 17);
+ this.cbLyricsPluginSite.TabIndex = 9;
+ this.cbLyricsPluginSite.Text = "LyricsPlugin";
+ this.cbLyricsPluginSite.UseVisualStyleBackColor = true;
+ this.cbLyricsPluginSite.Leave += new System.EventHandler(this.WriteMediaPortalXML);
//
// groupBox1
//
@@ -1189,7 +1189,7 @@
//
// btClose
//
- this.btClose.Location = new System.Drawing.Point(468, 502);
+ this.btClose.Location = new System.Drawing.Point(468, 507);
this.btClose.Name = "btClose";
this.btClose.Size = new System.Drawing.Size(78, 23);
this.btClose.TabIndex = 99;
@@ -1209,15 +1209,15 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(558, 530);
+ this.ClientSize = new System.Drawing.Size(558, 538);
this.ControlBox = false;
this.Controls.Add(this.btClose);
this.Controls.Add(this.tabControl);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.MaximizeBox = false;
- this.MaximumSize = new System.Drawing.Size(568, 560);
+ this.MaximumSize = new System.Drawing.Size(568, 568);
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(568, 560);
+ this.MinimumSize = new System.Drawing.Size(568, 568);
this.Name = "MyLyricsSetup";
this.ShowIcon = false;
this.Text = "MyLyrics Configuration";
@@ -1299,7 +1299,7 @@
private MediaPortal.UserInterface.Controls.MPLabel lbPluginName;
private MediaPortal.UserInterface.Controls.MPGroupBox gbLyricSites;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbHotLyrics;
- internal MediaPortal.UserInterface.Controls.MPCheckBox cbSeekLyrics;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsPluginSite;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsOnDemand;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrics007;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricWiki;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -223,8 +223,8 @@
cbLyrDB.Checked = xmlreader.GetValue("myLyrics", "useLyrDB").Equals("True");
cbLyrics007.Checked = xmlreader.GetValue("myLyrics", "useLyrics007").Equals("True");
cbLyricsOnDemand.Checked = xmlreader.GetValue("myLyrics", "useLyricsOnDemand").Equals("True");
- cbSeekLyrics.Checked = xmlreader.GetValue("myLyrics", "useSeekLyrics").Equals("True");
cbHotLyrics.Checked = xmlreader.GetValue("myLyrics", "useHotLyrics").Equals("True");
+ cbLyricsPluginSite.Checked = xmlreader.GetValue("myLyrics", "useLyricsPluginSite").Equals("True");
}
else
{
@@ -490,10 +490,10 @@
sitesToSearch.Add("Lyrics007");
if (cbLyricsOnDemand.Checked)
sitesToSearch.Add("LyricsOnDemand");
- if (cbSeekLyrics.Checked)
- sitesToSearch.Add("SeekLyrics");
if (cbHotLyrics.Checked)
sitesToSearch.Add("HotLyrics");
+ if (cbLyricsPluginSite.Checked)
+ sitesToSearch.Add("LyricsPluginSite");
if (sitesToSearch.Count == 0)
{
@@ -1101,11 +1101,11 @@
if (trackBar.Value == 0)
{
cbLyricsOnDemand.Checked = true;
+ cbLyricsPluginSite.Checked = false;
cbLyrics007.Checked = false;
cbLrcFinder.Checked = false;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
- cbSeekLyrics.Checked = false;
cbActionext.Checked = false;
cbLyrDB.Checked = false;
}
@@ -1113,23 +1113,23 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = true;
+ cbLyricsPluginSite.Checked = true;
cbLrcFinder.Checked = false;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
- cbSeekLyrics.Checked = false;
cbActionext.Checked = false;
cbLyrDB.Checked = false;
}
else if (trackBar.Value == 2)
{
cbLyricsOnDemand.Checked = true;
+ cbLyricsPluginSite.Checked = true;
cbLyrics007.Checked = true;
cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
- cbActionext.Checked = true;
- cbLyrDB.Checked = true;
- cbSeekLyrics.Checked = false;
+ cbActionext.Checked = false;
+ cbLyrDB.Checked = false;
}
else if (trackBar.Value == 3)
{
@@ -1138,9 +1138,9 @@
cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
- cbSeekLyrics.Checked = true;
cbLyrDB.Checked = true;
cbActionext.Checked = true;
+ cbLyricsPluginSite.Checked = true;
}
if (sender != null)
@@ -1159,7 +1159,7 @@
cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
- cbSeekLyrics.Checked = false;
+ cbLyricsPluginSite.Checked = true;
trackBar.Value = 2;
}
@@ -1174,8 +1174,8 @@
cbLyrics007.Enabled = false;
cbLrcFinder.Enabled = false;
cbLyricWiki.Enabled = false;
+ cbLyricsPluginSite.Enabled = false;
cbHotLyrics.Enabled = false;
- cbSeekLyrics.Enabled = false;
cbActionext.Enabled = false;
cbLyrDB.Enabled = false;
trackBar_Scroll(null, null);
@@ -1194,8 +1194,8 @@
cbLyrics007.Enabled = true;
cbLrcFinder.Enabled = true;
cbLyricWiki.Enabled = true;
+ cbLyricsPluginSite.Enabled = true;
cbHotLyrics.Enabled = true;
- cbSeekLyrics.Enabled = true;
cbActionext.Enabled = true;
cbLyrDB.Enabled = true;
}
@@ -1208,18 +1208,18 @@
cbLrcFinder.Enabled = false;
cbLyricWiki.Enabled = false;
cbHotLyrics.Enabled = false;
- cbSeekLyrics.Enabled = false;
cbActionext.Enabled = false;
cbLyrDB.Enabled = false;
+ cbLyricsPluginSite.Enabled = false;
cbLyricsOnDemand.Checked = false;
cbLyrics007.Checked = false;
cbLrcFinder.Checked = true;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
- cbSeekLyrics.Checked = false;
cbActionext.Checked = false;
cbLyrDB.Checked = false;
+ cbLyricsPluginSite.Checked = false;
cbMusicTagAlwaysCheck.Checked = false;
cbMusicTagWrite.Checked = true;
@@ -1258,8 +1258,8 @@
xmlwriter.SetValue("myLyrics", "useLyrDB", cbLyrDB.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useLyrics007", cbLyrics007.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useLyricsOnDemand", cbLyricsOnDemand.Checked.ToString());
- xmlwriter.SetValue("myLyrics", "useSeekLyrics", cbSeekLyrics.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useHotLyrics", cbHotLyrics.Checked.ToString());
+ xmlwriter.SetValue("myLyrics", "useLyricsPluginSite", cbLyricsPluginSite.Checked.ToString());
xmlwriter.SetValueAsBool("myLyrics", "useAutoscroll", cbUseAutoScrollAsDefault.Checked);
xmlwriter.SetValueAsBool("myLyrics", "useAutoOnLyricLength", cbAutoChangeToLineLimit.Checked);
xmlwriter.SetValue("myLyrics", "AutoLyricLength", tbLyricsLimit.Text);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-07-26 11:48:12 UTC (rev 3031)
@@ -123,6 +123,12 @@
<metadata name="Replace.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="Find.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Replace.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="bgWorkerSearch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>6, 4</value>
</metadata>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -53,7 +53,7 @@
bool m_alreadyValidLRC = false;
bool m_ValidLrcLyric = false; // A valid LRC-lyric always overwrites a normal lyric in both Lyrics db and music tag (if allowed)
- bool m_useLyricWiki, m_useLrcFinder, m_useLyrics007, m_useLyricsOnDemand, m_useSeekLyrics, m_useHotLyrics, m_useActionext, m_useLyrDB;
+ bool m_useLyricWiki, m_useLrcFinder, m_useLyrics007, m_useLyricsOnDemand, m_useLyricsPluginSite, m_useHotLyrics, m_useActionext, m_useLyrDB;
bool m_enableLogging = false;
private string logFullFileName = "";
@@ -478,7 +478,7 @@
m_useLyricWiki = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false;
m_useLyrics007 = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrics007", "True")).ToString().Equals("True") ? true : false;
m_useLyricsOnDemand = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True") ? true : false;
- m_useSeekLyrics = ((string)xmlreader.GetValueAsString("myLyrics", "useSeekLyrics", "True")).ToString().Equals("True") ? true : false;
+ m_useLyricsPluginSite = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsPluginSite", "True")).ToString().Equals("True") ? true : false;
m_useHotLyrics = ((string)xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True") ? true : false;
m_useActionext = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True") ? true : false;
m_useLyrDB = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrDB", "True")).ToString().Equals("True") ? true : false;
@@ -567,14 +567,14 @@
{
sitesToSearch.Add("LyricsOnDemand");
}
- if (m_useSeekLyrics && Setup.IsMember("SeekLyrics"))
- {
- sitesToSearch.Add("SeekLyrics");
- }
if (m_useHotLyrics && Setup.IsMember("HotLyrics"))
{
sitesToSearch.Add("HotLyrics");
}
+ if (m_useLyricsPluginSite && Setup.IsMember("LyricsPluginSite"))
+ {
+ sitesToSearch.Add("LyricsPluginSite");
+ }
m_LyricSitesTosearch = (string[])sitesToSearch.ToArray(typeof(string));
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-07-26 11:48:12 UTC (rev 3031)
@@ -5,7 +5,7 @@
<ProductVersion>9.0.21022</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>
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-07-26 11:48:12 UTC (rev 3031)
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("My Lyrics")]
-[assembly: AssemblyCopyright("Copyright © 2006")]
+[assembly: AssemblyCopyright("Copyright © 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -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("1.32")]
-[assembly: AssemblyFileVersion("1.32")]
+[assembly: AssemblyVersion("1.33")]
+[assembly: AssemblyFileVersion("1.33")]
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-07-26 10:50:11 UTC (rev 3030)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-07-26 11:48:12 UTC (rev 3031)
@@ -1,4 +1,4 @@
-Release notes to MyLyrics 1.32
+Release notes to MyLyrics 1.33
MyLyrics enables the display of lyrics for the currently played music file inside MediaPortal.
The plugin is able show LRC and plain lyrics, and uses both musictags and online searches to find lyrics.
@@ -36,8 +36,8 @@
Installation:
Simple copy the content of the zip-file into your MP library (typical C:\Program Files\Team MediaPortal\MediaPortal).
-Noteworthy changes since version 1.31:
-- Add: Improved logging system.
-- Fix: The plugin could crash and pull down MP Configuration when the artist string in the tag starting with a special char.
-- Fix: When the LRCFinder server was down not all calls to the server were terminated correcly.
-- Fix: When logging was enabled multiple threads could try to access batch file simultaneously.
\ No newline at end of file
+Noteworthy changes since version 1.32:
+- Add: Support for www.lyricsplugin.com added
+- Fix: Support for LyricsOnDemand fixed
+- Rem: Support for SeekLyrics removed
+- Fix: Various minor fixes in the 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.
|
