Revision: 97
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=97&view=rev
Author: saamand
Date: 2007-02-06 09:33:33 -0800 (Tue, 06 Feb 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricController.cs
trunk/plugins/MyLyrics/LyricsEngine/Wiki.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricController.cs 2007-02-06 17:33:03 UTC (rev 96)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricController.cs 2007-02-06 17:33:33 UTC (rev 97)
@@ -188,21 +188,21 @@
threadList.Add(lyricSearchThread);
}
- if (googleSites.Length > 0)
- {
- ThreadStart googleSitesThreadInstance = delegate
- {
- LyricSearch_GoogleSites lyricSearch_GoogleSites = new LyricSearch_GoogleSites(m_EventStop_LyricController, m_EventStopped_LyricController, this);
- lyricSearch_GoogleSites.setLyricInfo(lyricConfigInfo.artist, lyricConfigInfo.track, lyricConfigInfo.extra);
- lyricSearch_GoogleSites.Run();
- };
+ //if (googleSites.Length > 0)
+ //{
+ // ThreadStart googleSitesThreadInstance = delegate
+ // {
+ // LyricSearch_GoogleSites lyricSearch_GoogleSites = new LyricSearch_GoogleSites(m_EventStop_LyricController, m_EventStopped_LyricController, this);
+ // lyricSearch_GoogleSites.setLyricInfo(lyricConfigInfo.artist, lyricConfigInfo.track, lyricConfigInfo.extra);
+ // lyricSearch_GoogleSites.Run();
+ // };
- Thread lyricSearchThread = new Thread(googleSitesThreadInstance);
- lyricSearchThread.Name = "GoogleSearch for " + lyricConfigInfo.artist + " - " + lyricConfigInfo.track; // looks nice in Output window
- lyricSearchThread.IsBackground = true;
- lyricSearchThread.Start();
- threadList.Add(lyricSearchThread);
- }
+ // Thread lyricSearchThread = new Thread(googleSitesThreadInstance);
+ // lyricSearchThread.Name = "GoogleSearch for " + lyricConfigInfo.artist + " - " + lyricConfigInfo.track; // looks nice in Output window
+ // lyricSearchThread.IsBackground = true;
+ // lyricSearchThread.Start();
+ // threadList.Add(lyricSearchThread);
+ //}
}
public void suspendAllSearchThreadsExceptMe(int managedThreadId)
Modified: trunk/plugins/MyLyrics/LyricsEngine/Wiki.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Wiki.cs 2007-02-06 17:33:03 UTC (rev 96)
+++ trunk/plugins/MyLyrics/LyricsEngine/Wiki.cs 2007-02-06 17:33:33 UTC (rev 97)
@@ -77,19 +77,19 @@
}
// Step 2: search with parentheses and other disturbance removed
- //optimizeString(ref this.artist, ref this.title);
- //if (searchForWiki(this.artist, this.title))
- //{
- // return (lyricsResult.lyrics);
- //}
+ optimizeString(ref this.artist, ref this.title);
+ if (searchForWiki(this.artist, this.title))
+ {
+ return (lyricsResult.lyrics);
+ }
- //// Step 3: search with altered and strings if any
- //this.artist = LyricUtil.changeAnd_and_and(this.artist);
- //this.title = LyricUtil.changeAnd_and_and(this.title);
- //if (searchForWiki(this.artist, this.title))
- //{
- // return (lyricsResult.lyrics);
- //}
+ // Step 3: search with altered and strings if any
+ this.artist = LyricUtil.changeAnd_and_and(this.artist);
+ this.title = LyricUtil.changeAnd_and_and(this.title);
+ if (searchForWiki(this.artist, this.title))
+ {
+ return (lyricsResult.lyrics);
+ }
// final step: return "Not found" if no lyric found
return "Not found";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
