Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2760] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-04-06 15:10:00
|
Revision: 2760
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2760&view=rev
Author: saamand
Date: 2009-04-06 15:09:56 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings
trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
trunk/plugins/MyLyrics/LyricsEngine/app.config
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/LyricsLibrary.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.cs
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-04-06 15:09:56 UTC (rev 2760)
@@ -54,6 +54,7 @@
<Compile Include="LyricSearch.cs" />
<Compile Include="LyricDiagnostics.cs" />
<Compile Include="LyricsSites\Actionext.cs" />
+ <Compile Include="LyricsSites\LrcFinder.cs" />
<Compile Include="LyricsSites\LyrDB.cs" />
<Compile Include="LyricsSites\HotLyrics.cs" />
<Compile Include="LyricsSites\Lyrics007.cs" />
@@ -102,6 +103,11 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="Setup.cs" />
+ <Compile Include="Web References\lrcfinder\Reference.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Reference.map</DependentUpon>
+ </Compile>
<Compile Include="Web References\org.lyricwiki\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -113,6 +119,17 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
+ <WebReferenceUrl Include="http://lrcfinder.profiler.nl/LrcFinder.asmx%3fop=FindLRC">
+ <UrlBehavior>Dynamic</UrlBehavior>
+ <RelPath>Web References\lrcfinder\</RelPath>
+ <UpdateFromURL>http://lrcfinder.profiler.nl/LrcFinder.asmx%3fop=FindLRC</UpdateFromURL>
+ <ServiceLocationURL>
+ </ServiceLocationURL>
+ <CachedDynamicPropName>
+ </CachedDynamicPropName>
+ <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+ <CachedSettingsPropName>LyricsEngine_lrcfinder_LrcFinder</CachedSettingsPropName>
+ </WebReferenceUrl>
<WebReferenceUrl Include="http://lyricwiki.org/server.php%3fwsdl">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\org.lyricwiki\</RelPath>
@@ -125,6 +142,14 @@
<CachedSettingsPropName>LyricsEngine_org_lyricwiki_LyricWiki</CachedSettingsPropName>
</WebReferenceUrl>
</ItemGroup>
+ <ItemGroup>
+ <None Include="Web References\lrcfinder\LrcFinder.disco" />
+ <None Include="Web References\lrcfinder\LrcFinder.wsdl" />
+ <None Include="Web References\lrcfinder\Reference.map">
+ <Generator>MSDiscoCodeGenerator</Generator>
+ <LastGenOutput>Reference.cs</LastGenOutput>
+ </None>
+ </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/LyricsEngine/LyricsSites/Wiki.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -79,8 +79,10 @@
{
return MakeLyricFit(lyricsResult.lyrics);
}
-
- return "Not found";
+ else
+ {
+ return "Not found";
+ }
}
catch (Exception)
{
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -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.23")]
+[assembly: AssemblyVersion("1.30")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -32,5 +32,33 @@
return ((string)(this["LyricsEngine_org_lyricwiki_LyricWiki"]));
}
}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://api.google.com/search/beta2")]
+ public string Google_GoogleSearchService {
+ get {
+ return ((string)(this["Google_GoogleSearchService"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://api.google.com/search/beta2")]
+ public string MyLyrics_Google_GoogleSearchService {
+ get {
+ return ((string)(this["MyLyrics_Google_GoogleSearchService"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://lrcfinder.profiler.nl/LrcFinder.asmx")]
+ public string LyricsEngine_lrcfinder_LrcFinder {
+ get {
+ return ((string)(this["LyricsEngine_lrcfinder_LrcFinder"]));
+ }
+ }
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.settings 2009-04-06 15:09:56 UTC (rev 2760)
@@ -5,5 +5,14 @@
<Setting Name="LyricsEngine_org_lyricwiki_LyricWiki" Type="(Web Service URL)" Scope="Application">
<Value Profile="(Default)">http://lyricwiki.org/server.php</Value>
</Setting>
+ <Setting Name="Google_GoogleSearchService" Type="System.String" Scope="Application">
+ <Value Profile="(Default)">http://api.google.com/search/beta2</Value>
+ </Setting>
+ <Setting Name="MyLyrics_Google_GoogleSearchService" Type="System.String" Scope="Application">
+ <Value Profile="(Default)">http://api.google.com/search/beta2</Value>
+ </Setting>
+ <Setting Name="LyricsEngine_lrcfinder_LrcFinder" Type="(Web Service URL)" Scope="Application">
+ <Value Profile="(Default)">http://lrcfinder.profiler.nl/LrcFinder.asmx</Value>
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -6,8 +6,9 @@
{
public static class Setup
{
- public static string[] BatchSearchSites = new string[7]
+ public static string[] BatchSearchSites = new string[8]
{
+ "LrcFinder",
"LyricWiki",
"Lyrics007",
"LyricsOnDemand",
Modified: trunk/plugins/MyLyrics/LyricsEngine/app.config
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/app.config 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/LyricsEngine/app.config 2009-04-06 15:09:56 UTC (rev 2760)
@@ -7,14 +7,11 @@
</configSections>
<applicationSettings>
<LyricsEngine.Properties.Settings>
- <setting name="Google_GoogleSearchService" serializeAs="String">
- <value>http://api.google.com/search/beta2</value>
- </setting>
<setting name="LyricsEngine_org_lyricwiki_LyricWiki" serializeAs="String">
<value>http://lyricwiki.org/server.php</value>
</setting>
- <setting name="MyLyrics_Google_GoogleSearchService" serializeAs="String">
- <value>http://api.google.com/search/beta2</value>
+ <setting name="LyricsEngine_lrcfinder_LrcFinder" serializeAs="String">
+ <value>http://lrcfinder.profiler.nl/LrcFinder.asmx</value>
</setting>
</LyricsEngine.Properties.Settings>
</applicationSettings>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -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.23";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.30";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -52,6 +52,7 @@
this.cbLyricWiki = 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();
@@ -176,6 +177,7 @@
//
// gbLyricSites
//
+ this.gbLyricSites.Controls.Add(this.cbLrcFinder);
this.gbLyricSites.Controls.Add(this.cbLyrDB);
this.gbLyricSites.Controls.Add(this.cbActionext);
this.gbLyricSites.Controls.Add(this.btCancel);
@@ -199,7 +201,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(111, 44);
+ this.cbLyrDB.Location = new System.Drawing.Point(237, 21);
this.cbLyrDB.Name = "cbLyrDB";
this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
this.cbLyrDB.TabIndex = 18;
@@ -212,7 +214,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(18, 44);
+ this.cbActionext.Location = new System.Drawing.Point(110, 21);
this.cbActionext.Name = "cbActionext";
this.cbActionext.Size = new System.Drawing.Size(68, 17);
this.cbActionext.TabIndex = 17;
@@ -235,7 +237,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(346, 21);
+ this.cbHotLyrics.Location = new System.Drawing.Point(338, 44);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 14;
@@ -248,7 +250,7 @@
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(246, 44);
+ 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;
@@ -261,7 +263,7 @@
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(111, 21);
+ this.cbLyricsOnDemand.Location = new System.Drawing.Point(110, 44);
this.cbLyricsOnDemand.Name = "cbLyricsOnDemand";
this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17);
this.cbLyricsOnDemand.TabIndex = 12;
@@ -274,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(246, 21);
+ this.cbLyrics007.Location = new System.Drawing.Point(237, 44);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
this.cbLyrics007.TabIndex = 13;
@@ -287,7 +289,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(16, 21);
+ this.cbLyricWiki.Location = new System.Drawing.Point(18, 44);
this.cbLyricWiki.Name = "cbLyricWiki";
this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
this.cbLyricWiki.TabIndex = 11;
@@ -315,6 +317,19 @@
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);
@@ -371,5 +386,6 @@
private System.Windows.Forms.Button btCancel;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbActionext;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrDB;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbLrcFinder;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -82,6 +82,7 @@
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
+ cbLrcFinder.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLrcFinder", "True")).ToString().Equals("True") ? true : false;
cbLyricWiki.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false;
cbActionext.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True") ? true : false;
cbLyrDB.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrDB", "True")).ToString().Equals("True") ? true : false;
@@ -152,6 +153,10 @@
sitesToSearch = new List<string>();
+ if (cbLrcFinder.Checked)
+ {
+ sitesToSearch.Add("LrcFinder");
+ }
if (cbLyricWiki.Checked)
{
sitesToSearch.Add("LyricWiki");
@@ -303,7 +308,7 @@
if (markedDatabase && m_moveLyricFromMarkedDatabase)
{
- parent.RemoveSong(originalArtist, originalTitle);
+ parent.RemoveSong(originalArtist, originalTitle, true);
string key = DatabaseUtil.CorrectKeyFormat(originalArtist, originalTitle);
MyLyricsSettings.LyricsDB[key] = new LyricsItem(originalArtist, originalTitle, lyric, site);
DatabaseUtil.SerializeLyricDB();
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -88,7 +88,7 @@
}
}
}
- catch {;}
+ catch { ;}
finally
{
treeView.Sort();
@@ -194,7 +194,7 @@
treeView.Update();
}
- public void RemoveSong(string artist, string title)
+ public void RemoveSong(string artist, string title, bool serializeDB)
{
try
{
@@ -225,7 +225,11 @@
// remove title from database
CurrentDB.Remove(DatabaseUtil.CorrectKeyFormat(artist, title));
- DatabaseUtil.SerializeDB(CurrentDB);
+
+ if (serializeDB)
+ {
+ DatabaseUtil.SerializeDB(CurrentDB);
+ }
}
}
@@ -384,14 +388,14 @@
{
for (int i = 0; i < titles.Count; i++)
{
- RemoveSong(m_CurrentArtist, (string)titles[i]);
+ RemoveSong(m_CurrentArtist, (string)titles[i], i == titles.Count - 1);
}
}
}
else
{
- RemoveSong(m_CurrentArtist, m_CurrentTitle);
+ RemoveSong(m_CurrentArtist, m_CurrentTitle, true);
highlightSong(m_CurrentArtist, m_CurrentTitle, true);
}
updateLyricDatabaseStats();
@@ -554,7 +558,7 @@
LyricsItem item = CurrentDB[key];
// remove song from treeview and current database
- RemoveSong(artist, title);
+ RemoveSong(artist, title, true);
// add song to other database and serialize it
if (CurrentDB.Equals(MyLyricsSettings.LyricsDB))
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -306,6 +306,8 @@
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
+ if (((string)xmlreader.GetValueAsString("myLyrics", "useLrcFinder", "True")).ToString().Equals("True"))
+ sitesToSearch.Add("LrcFinder");
if (((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True"))
sitesToSearch.Add("LyricWiki");
if (((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True"))
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -90,7 +90,9 @@
this.tbPluginName = new MediaPortal.UserInterface.Controls.MPTextBox();
this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.rbLrcMode = new System.Windows.Forms.RadioButton();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.cbLrcFinder = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -804,6 +806,7 @@
//
// gbLyricSites
//
+ this.gbLyricSites.Controls.Add(this.rbLrcMode);
this.gbLyricSites.Controls.Add(this.groupBox2);
this.gbLyricSites.Controls.Add(this.groupBox1);
this.gbLyricSites.Controls.Add(this.rdDefault);
@@ -816,8 +819,21 @@
this.gbLyricSites.TabStop = false;
this.gbLyricSites.Text = "Lyrics sites settings";
//
+ // rbLrcMode
+ //
+ this.rbLrcMode.AutoSize = true;
+ this.rbLrcMode.Location = new System.Drawing.Point(254, 23);
+ this.rbLrcMode.Name = "rbLrcMode";
+ this.rbLrcMode.Size = new System.Drawing.Size(75, 17);
+ this.rbLrcMode.TabIndex = 29;
+ this.rbLrcMode.Text = "LRC mode";
+ this.rbLrcMode.UseVisualStyleBackColor = true;
+ this.rbLrcMode.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ this.rbLrcMode.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
+ //
// groupBox2
//
+ this.groupBox2.Controls.Add(this.cbLrcFinder);
this.groupBox2.Controls.Add(this.cbLyrDB);
this.groupBox2.Controls.Add(this.cbActionext);
this.groupBox2.Controls.Add(this.cbLyrics007);
@@ -832,13 +848,26 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "User select mode";
//
+ // 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(20, 70);
+ this.cbLrcFinder.Name = "cbLrcFinder";
+ this.cbLrcFinder.Size = new System.Drawing.Size(68, 17);
+ this.cbLrcFinder.TabIndex = 10;
+ 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(131, 71);
+ this.cbLyrDB.Location = new System.Drawing.Point(216, 26);
this.cbLyrDB.Name = "cbLyrDB";
this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
this.cbLyrDB.TabIndex = 9;
@@ -852,7 +881,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, 49);
+ this.cbActionext.Location = new System.Drawing.Point(131, 70);
this.cbActionext.Name = "cbActionext";
this.cbActionext.Size = new System.Drawing.Size(68, 17);
this.cbActionext.TabIndex = 8;
@@ -866,7 +895,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(17, 48);
+ this.cbLyrics007.Location = new System.Drawing.Point(20, 49);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
this.cbLyrics007.TabIndex = 4;
@@ -880,7 +909,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(17, 71);
+ this.cbLyricWiki.Location = new System.Drawing.Point(131, 26);
this.cbLyricWiki.Name = "cbLyricWiki";
this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
this.cbLyricWiki.TabIndex = 2;
@@ -894,7 +923,7 @@
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(17, 26);
+ this.cbLyricsOnDemand.Location = new System.Drawing.Point(20, 26);
this.cbLyricsOnDemand.Name = "cbLyricsOnDemand";
this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17);
this.cbLyricsOnDemand.TabIndex = 5;
@@ -908,7 +937,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, 26);
+ this.cbHotLyrics.Location = new System.Drawing.Point(131, 48);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 7;
@@ -922,7 +951,7 @@
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, 26);
+ this.cbSeekLyrics.Location = new System.Drawing.Point(216, 49);
this.cbSeekLyrics.Name = "cbSeekLyrics";
this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17);
this.cbSeekLyrics.TabIndex = 6;
@@ -985,19 +1014,20 @@
this.rdDefault.TabIndex = 23;
this.rdDefault.Text = "Default select mode";
this.rdDefault.UseVisualStyleBackColor = true;
- this.rdDefault.Leave += new System.EventHandler(this.rdTrackBar_CheckedChanged);
+ this.rdDefault.Leave += new System.EventHandler(this.WriteMediaPortalXML);
this.rdDefault.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
//
// rbUserDefined
//
this.rbUserDefined.AutoSize = true;
- this.rbUserDefined.Location = new System.Drawing.Point(150, 23);
+ this.rbUserDefined.Location = new System.Drawing.Point(141, 23);
this.rbUserDefined.Name = "rbUserDefined";
this.rbUserDefined.Size = new System.Drawing.Size(107, 17);
this.rbUserDefined.TabIndex = 22;
this.rbUserDefined.Text = "User select mode";
this.rbUserDefined.UseVisualStyleBackColor = true;
- this.rbUserDefined.Leave += new System.EventHandler(this.rdTrackBar_CheckedChanged);
+ this.rbUserDefined.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ this.rbUserDefined.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
//
// tabPageReplace
//
@@ -1218,5 +1248,7 @@
internal MediaPortal.UserInterface.Controls.MPCheckBox cbAutoChangeToLineLimit;
private MediaPortal.UserInterface.Controls.MPLabel lblyricLengthLimit;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbUseAutoScrollAsDefault;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbLrcFinder;
+ private System.Windows.Forms.RadioButton rbLrcMode;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -300,6 +300,7 @@
trackBar.Enabled = false;
rbUserDefined.Checked = true;
+ cbLrcFinder.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLrcFinder", "True")).ToString().Equals("True") ? true : false;
cbLyricWiki.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false;
cbActionext.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True") ? true : false;
cbLyrDB.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrDB", "True")).ToString().Equals("True") ? true : false;
@@ -467,6 +468,8 @@
ArrayList sitesToSearch = new ArrayList();
+ if (cbLrcFinder.Checked)
+ sitesToSearch.Add("LrcFinder");
if (cbLyricWiki.Checked)
sitesToSearch.Add("LyricWiki");
if (cbActionext.Checked)
@@ -487,7 +490,7 @@
ThreadFinished = new string[] { "", "", "You haven't selected any sites to search", "error" };
return;
}
-
+
sitesToSearchArray = (string[])sitesToSearch.ToArray(typeof(string));
@@ -657,7 +660,7 @@
private void bgWorkerSearch_DoWork(object sender, DoWorkEventArgs e)
{
-// Thread.CurrentThread.Name = "bgWorker - Search";
+ // Thread.CurrentThread.Name = "bgWorker - Search";
#region 1. Sorting song
lyricConfigInfosQueue = new Queue();
@@ -779,7 +782,7 @@
#endregion
- startSearch:
+ startSearch:
#region 2. Search music tags for lyrics
@@ -1020,6 +1023,7 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = false;
+ cbLrcFinder.Checked = false;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
cbSeekLyrics.Checked = false;
@@ -1030,6 +1034,7 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = true;
+ cbLrcFinder.Checked = false;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
cbSeekLyrics.Checked = false;
@@ -1040,6 +1045,7 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = true;
+ cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
cbActionext.Checked = true;
@@ -1050,6 +1056,7 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = true;
+ cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
cbSeekLyrics.Checked = true;
@@ -1066,6 +1073,7 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = true;
+ cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
cbSeekLyrics.Checked = false;
@@ -1081,6 +1089,7 @@
trackBar.Enabled = true;
cbLyricsOnDemand.Enabled = false;
cbLyrics007.Enabled = false;
+ cbLrcFinder.Enabled = false;
cbLyricWiki.Enabled = false;
cbHotLyrics.Enabled = false;
cbSeekLyrics.Enabled = false;
@@ -1088,17 +1097,40 @@
cbLyrDB.Enabled = false;
trackBar_Scroll(null, null);
}
- else
+ else if (rbUserDefined.Checked)
{
trackBar.Enabled = false;
cbLyricsOnDemand.Enabled = true;
cbLyrics007.Enabled = true;
+ cbLrcFinder.Enabled = true;
cbLyricWiki.Enabled = true;
cbHotLyrics.Enabled = true;
cbSeekLyrics.Enabled = true;
cbActionext.Enabled = true;
cbLyrDB.Enabled = true;
}
+ else if (rbLrcMode.Checked)
+ {
+ trackBar.Enabled = false;
+
+ cbLyricsOnDemand.Enabled = false;
+ cbLyrics007.Enabled = false;
+ cbLrcFinder.Enabled = false;
+ cbLyricWiki.Enabled = false;
+ cbHotLyrics.Enabled = false;
+ cbSeekLyrics.Enabled = false;
+ cbActionext.Enabled = false;
+ cbLyrDB.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;
+ }
}
private void WriteMediaPortalXML(object sender, EventArgs e)
@@ -1109,6 +1141,7 @@
xmlwriter.SetValue("myLyrics", "defaultSitesModeValue", trackBar.Value);
xmlwriter.SetValue("myLyrics", "limit", tbLimit.Text);
xmlwriter.SetValue("myLyrics", "pluginsName", tbPluginName.Text);
+ xmlwriter.SetValue("myLyrics", "useLrcFinder", cbLrcFinder.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useLyricWiki", cbLyricWiki.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useActionext", cbActionext.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useLyrDB", cbLyrDB.Checked.ToString());
@@ -1144,14 +1177,11 @@
}
}
- if (find.ToString() != "" && replace.ToString() != "")
- {
- xmlwriter.SetValue("myLyrics", "find", find.ToString());
- xmlwriter.SetValue("myLyrics", "replace", replace.ToString());
+ xmlwriter.SetValue("myLyrics", "find", find.ToString());
+ xmlwriter.SetValue("myLyrics", "replace", replace.ToString());
- m_find = find.ToString();
- m_replace = replace.ToString();
- }
+ m_find = find.ToString();
+ m_replace = replace.ToString();
}
catch (Exception ex)
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -350,11 +350,12 @@
resetGUI(selectedScreen);
- bool useLyricWiki, useLyrics007, useLyricsOnDemand, useSeekLyrics, useHotLyrics, useActionext, useLyrDB;
+ bool useLyricWiki, useLrcFinder, useLyrics007, useLyricsOnDemand, useSeekLyrics, useHotLyrics, useActionext, useLyrDB;
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
UseID3 = xmlreader.GetValueAsBool("musicfiles", "showid3", true);
+ useLrcFinder = ((string)xmlreader.GetValueAsString("myLyrics", "useLrcFinder", "True")).ToString().Equals("True") ? true : false;
useLyricWiki = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false;
useLyrics007 = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrics007", "True")).ToString().Equals("True") ? true : false;
useLyricsOnDemand = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True") ? true : false;
@@ -399,6 +400,10 @@
m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
ArrayList sitesToSearch = new ArrayList();
+ if (useLrcFinder && Setup.IsMember("LrcFinder"))
+ {
+ sitesToSearch.Add("LrcFinder");
+ }
if (useLyricWiki && Setup.IsMember("LyricWiki"))
{
sitesToSearch.Add("LyricWiki");
@@ -712,81 +717,7 @@
if (m_AutomaticReadFromMusicTag && ((CurrentTrackTag.Lyrics.Length != 0 && (lrc = new SimpleLRC(m_artist, m_title, CurrentTrackTag.Lyrics)).IsValid))
|| (lyricText.Length != 0 && (lrc = new SimpleLRC(m_artist, m_title, lyricText)).IsValid))
{
- lyricsFound = true;
- m_ValidLrcLyric = true;
-
- lrcTimeCollection = lrc.SimpleLRCTimeAndLineCollection;
- lines = lrcTimeCollection.Copy();
-
- //Let's see if the basic or wide version of the LRC-screen should be shown
- bool aLongLinePresent = false;
- if (m_useAutoOnLyricLength)
- {
- for (int i = 0; i < lines.Length; i++)
- {
- if (lines[i].Length > m_basicWideLimit)
- {
- aLongLinePresent = true;
- break;
- }
- }
- }
-
- if (basicScreenSelected.HasValue)
- {
- if (basicScreenSelected.Value)
- {
- resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
- }
- else
- {
- resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
- }
- }
- else
- {
- if (aLongLinePresent)
- {
- resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
- }
- else
- {
- resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
- }
- }
-
- m_StatusText = "";
- GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, m_StatusText);
-
- // If lyricText is empty, the LRC file was pulled out of the music tag and is still not in the lyrics database
- if (string.IsNullOrEmpty(lyricText))
- {
- LyricsItem item = new LyricsItem(m_artist, m_title, CurrentTrackTag.Lyrics, "music tag");
- LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)] = item;
-
- string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
- using (FileStream fs = new FileStream(path, FileMode.Open))
- {
- BinaryFormatter bf = new BinaryFormatter();
- LyricsDB.SetLastModified();
- bf.Serialize(fs, LyricsDB);
- fs.Close();
- }
- }
- else
- {
- m_LyricText = lyricText;
- }
-
- try
- {
- for (int i = tagRoundFinished * TAG_IN_ROUND; i < (tagRoundFinished + 1) * TAG_IN_ROUND; i++)
- {
- ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, lines[i]);
- ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, lines[i]);
- }
- }
- catch { ;}
+ StartShowingLrc(lyricText);
}
// 3) Lyric in music tag
@@ -832,6 +763,86 @@
}
}
+ private void StartShowingLrc(string lyricText)
+ {
+ lyricsFound = true;
+ m_ValidLrcLyric = true;
+
+ lrcTimeCollection = lrc.SimpleLRCTimeAndLineCollection;
+ lines = lrcTimeCollection.Copy();
+
+ //Let's see if the basic or wide version of the LRC-screen should be shown
+ bool aLongLinePresent = false;
+ if (m_useAutoOnLyricLength)
+ {
+ for (int i = 0; i < lines.Length; i++)
+ {
+ if (lines[i].Length > m_basicWideLimit)
+ {
+ aLongLinePresent = true;
+ break;
+ }
+ }
+ }
+
+ if (basicScreenSelected.HasValue)
+ {
+ if (basicScreenSelected.Value)
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
+ }
+ else
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
+ }
+ }
+ else
+ {
+ if (aLongLinePresent)
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
+ }
+ else
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
+ }
+ }
+
+ m_StatusText = "";
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, m_StatusText);
+
+ // If lyricText is empty, the LRC file was pulled out of the music tag and is still not in the lyrics database
+ if (string.IsNullOrEmpty(lyricText))
+ {
+ LyricsItem item = new LyricsItem(m_artist, m_title, CurrentTrackTag.Lyrics, "music tag");
+ LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)] = item;
+
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
+ using (FileStream fs = new FileStream(path, FileMode.Open))
+ {
+ BinaryFormatter bf = new BinaryFormatter();
+ LyricsDB.SetLastModified();
+ bf.Serialize(fs, LyricsDB);
+ fs.Close();
+ }
+ }
+ else
+ {
+ m_LyricText = lyricText;
+ }
+
+ try
+ {
+ for (int i = tagRoundFinished * TAG_IN_ROUND; i < (tagRoundFinished + 1) * TAG_IN_ROUND; i++)
+ {
+ ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, lines[i]);
+ ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, lines[i]);
+ }
+ }
+ catch { ;}
+
+ }
+
private void tagLine()
{
if (alreadyValidLRC == false && selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
@@ -997,22 +1008,32 @@
}
else
{
- m_LyricText = MediaPortalUtil.MakePlainLyricPerfectToShow(m_LyricText);
+ // If LRC that has been found, then show lyric in LRC-mode
+ lrc = new SimpleLRC(null, null, m_LyricText);
- if (basicScreenSelected.HasValue == false || basicScreenSelected.Value)
+ if (lrc.IsValid)
{
- resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
- GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, m_LyricText);
- GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
+ StartShowingLrc(m_LyricText);
}
+ // else show plain lyric
else
{
- resetGUI((int)MyLyricsSettings.Screen.LYRICS_WIDE);
- GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, m_LyricText);
- GUIControl.FocusControl(GetID, CONTROL_LYRICWIDE_SELECTED);
+ m_LyricText = MediaPortalUtil.MakePlainLyricPerfectToShow(m_LyricText);
+
+ if (basicScreenSelected.HasValue == false || basicScreenSelected.Value)
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, m_LyricText);
+ GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
+ }
+ else
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS_WIDE);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, m_LyricText);
+ GUIControl.FocusControl(GetID, CONTROL_LYRICWIDE_SELECTED);
+ }
}
-
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-04-06 15:09:56 UTC (rev 2760)
@@ -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.23")]
-[assembly: AssemblyFileVersion("1.23")]
+[assembly: AssemblyVersion("1.30")]
+[assembly: AssemblyFileVersion("1.30")]
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-04-06 12:08:03 UTC (rev 2759)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-04-06 15:09:56 UTC (rev 2760)
@@ -1,4 +1,4 @@
-Release notes to MyLyrics 1.23
+Release notes to MyLyrics 1.30
MyLyrics is a windows plugin for MediaPortal which 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.
@@ -16,31 +16,27 @@
Keys:
- W key (or '#' button on remote): Toggle between basic and wide screen.
- E key (or '*' button on remote): Toggle between lyric and editor screen.
-- S key: Increase the vertical scroll speed. A total of six speed values.
+- S key: Increase the vertical scroll speed when in scroll mode. A total of six speed values.
- Enter key (or 'OK' on remote): Tag line on LRC editor screen.
Screens:
- Lyrics basic: shows lyric with coverart on the right (default lyrics screen).
- Lyrics wide: shows wider lyric area and no coverart.
+ (Two sub modes for both Lyrics basic and Lyrics wide: static mode (default) or scroll mode)
- LRC basic: shows lrc file and coverart on the right (default lrc screen).
- LRC wide: shows wider lrc area and no coverart (the plugin autoselects this if the lrc contains one or more long lines).
-- LRC editor: enables the creation of lrc lyric from a plain lyric.
+- LRC editor: enables the creation of lrc lyric from a plain lyric.
Compatible with MediaPortal 1.0.0.0 final.
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.21:
-* Fix: Better support for non-English characters.
-* Fix: Support for credentials for proxy calls helping users behind a proxy.
-* Add: Support automatic scroll using the textboxscrollup controls (requires MyLyrics 1.22+ compatible skin!).
-* Add: The lyrics line limit length in LRC can manually be set in configuration.
-* Add: Support for the lyric site LyrDB - Song Lyrics - The biggest lyrics portal on the net!.
-* Add: On the Lyrics database tab you can choose to see only the LRCs of your lyrics database.
-* Add: StreamedMP skin supported (MyLyrics 1.22+ compatible).
-* Fix: Vertical black lines caused by use of "\r\n" in Label controls is eliminated by using "\n" instead.
-* Fix: Show previous screen issue and back trace issues with MP fixed.
+Noteworthy changes since version 1.23:
+* Add: Support for BeenieBoys LrcFinder webservice (thanks BeenieBoy!).
+* Add: LRC mode added to the configuration (searches only for LRC-files).
+* Fix: Deleted entries in "Find & replace" dialogue were not removed correctly.
+* Fix: Performance improvement when deleting entry in lyrics database.
For skin-makers:
I've added the scroll feature once again which basically means that all skin-makers must add a couple of new controls to the MyLyrics.xml file. The two new controls have the id's 1020 and 1021 and are basically twins of the two textbox controls with id's 20 and 21. The main difference is that the new controls are of the type textboxscrollup and also have a little smaller value for the height (due to nature of the textboxscrollup control).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
