From: <sa...@us...> - 2009-07-27 09:38:00
|
Revision: 3032 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3032&view=rev Author: saamand Date: 2009-07-27 09:37:52 +0000 (Mon, 27 Jul 2009) Log Message: ----------- Version 1.34 Modified Paths: -------------- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.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 Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-07-26 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-07-27 09:37:52 UTC (rev 3032) @@ -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.33")] +[assembly: AssemblyVersion("1.34")] // // In order to sign your assembly you must specify a key to use. Refer to the Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-07-26 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-07-27 09:37:52 UTC (rev 3032) @@ -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.33"; + this.lbInfo1.Text = "MyLyrics plugin, version 1.34"; // // label2 // Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-07-26 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-07-27 09:37:52 UTC (rev 3032) @@ -103,8 +103,8 @@ this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox(); - this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyricsPluginSite = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -175,7 +175,7 @@ this.tabPageMusicDatabaseBrowse.Location = new System.Drawing.Point(4, 22); this.tabPageMusicDatabaseBrowse.Name = "tabPageMusicDatabaseBrowse"; this.tabPageMusicDatabaseBrowse.Padding = new System.Windows.Forms.Padding(3); - this.tabPageMusicDatabaseBrowse.Size = new System.Drawing.Size(550, 504); + this.tabPageMusicDatabaseBrowse.Size = new System.Drawing.Size(550, 512); this.tabPageMusicDatabaseBrowse.TabIndex = 3; this.tabPageMusicDatabaseBrowse.Text = "Music database browse"; this.tabPageMusicDatabaseBrowse.UseVisualStyleBackColor = true; @@ -190,7 +190,7 @@ this.tabPageDatabase.Location = new System.Drawing.Point(4, 22); this.tabPageDatabase.Name = "tabPageDatabase"; this.tabPageDatabase.Padding = new System.Windows.Forms.Padding(3); - this.tabPageDatabase.Size = new System.Drawing.Size(550, 504); + this.tabPageDatabase.Size = new System.Drawing.Size(550, 512); this.tabPageDatabase.TabIndex = 2; this.tabPageDatabase.Text = "Music database batch search"; this.tabPageDatabase.UseVisualStyleBackColor = true; @@ -952,6 +952,7 @@ this.cbLrcFinder.TabIndex = 10; this.cbLrcFinder.Text = "LrcFinder"; this.cbLrcFinder.UseVisualStyleBackColor = true; + this.cbLrcFinder.Leave += new System.EventHandler(this.WriteMediaPortalXML); // // cbLyrDB // @@ -995,6 +996,20 @@ this.cbLyrics007.UseVisualStyleBackColor = true; this.cbLyrics007.Leave += new System.EventHandler(this.WriteMediaPortalXML); // + // 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(20, 17); + this.cbLyricsOnDemand.Name = "cbLyricsOnDemand"; + this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17); + this.cbLyricsOnDemand.TabIndex = 5; + this.cbLyricsOnDemand.Text = "Lyrics OnDemand"; + this.cbLyricsOnDemand.UseVisualStyleBackColor = true; + this.cbLyricsOnDemand.Leave += new System.EventHandler(this.WriteMediaPortalXML); + // // cbLyricWiki // this.cbLyricWiki.AutoSize = true; @@ -1009,20 +1024,6 @@ this.cbLyricWiki.UseVisualStyleBackColor = true; this.cbLyricWiki.Leave += new System.EventHandler(this.WriteMediaPortalXML); // - // 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(20, 17); - this.cbLyricsOnDemand.Name = "cbLyricsOnDemand"; - this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17); - this.cbLyricsOnDemand.TabIndex = 5; - this.cbLyricsOnDemand.Text = "Lyrics OnDemand"; - this.cbLyricsOnDemand.UseVisualStyleBackColor = true; - this.cbLyricsOnDemand.Leave += new System.EventHandler(this.WriteMediaPortalXML); - // // cbHotLyrics // this.cbHotLyrics.AutoSize = true; @@ -1129,7 +1130,7 @@ this.tabPageReplace.Location = new System.Drawing.Point(4, 22); this.tabPageReplace.Name = "tabPageReplace"; this.tabPageReplace.Padding = new System.Windows.Forms.Padding(3); - this.tabPageReplace.Size = new System.Drawing.Size(550, 504); + this.tabPageReplace.Size = new System.Drawing.Size(550, 512); this.tabPageReplace.TabIndex = 5; this.tabPageReplace.Text = "Find & Replace"; this.tabPageReplace.UseVisualStyleBackColor = true; @@ -1182,7 +1183,7 @@ this.tabPageAbout.Location = new System.Drawing.Point(4, 22); this.tabPageAbout.Name = "tabPageAbout"; this.tabPageAbout.Padding = new System.Windows.Forms.Padding(3); - this.tabPageAbout.Size = new System.Drawing.Size(550, 504); + this.tabPageAbout.Size = new System.Drawing.Size(550, 512); this.tabPageAbout.TabIndex = 4; this.tabPageAbout.Text = "About"; this.tabPageAbout.UseVisualStyleBackColor = true; Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-07-26 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-07-27 09:37:52 UTC (rev 3032) @@ -123,12 +123,6 @@ <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 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-07-27 09:37:52 UTC (rev 3032) @@ -277,8 +277,10 @@ m_artist = m_artist.Replace("| ", ""); m_artist = m_artist.Replace(" |", ""); m_artist = m_artist.Replace("''", "'"); + m_artist = LyricUtil.CapatalizeString(m_artist); m_title = m_CurrentTrackTag.Title.Trim(); m_title = m_title.Replace("''", "'"); + m_title = LyricUtil.CapatalizeString(m_title); getAlbumArt(); } @@ -1114,7 +1116,7 @@ { string lyric = LyricUtil.FixLyrics(m_CurrentTrackTag.Lyrics); m_CurrentTrackTag.Lyrics = lyric; - ShowLyricOnScreen(lyric, m_CurrentTrackTag.FileName); + ShowLyricOnScreen(lyric, "music tag"); SaveLyricToDatabase(m_CurrentTrackTag.Artist, m_CurrentTrackTag.Title, lyric, "music tag", false); return true; } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-07-26 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-07-27 09:37:52 UTC (rev 3032) @@ -5,7 +5,7 @@ <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</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 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-07-27 09:37:52 UTC (rev 3032) @@ -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.33")] -[assembly: AssemblyFileVersion("1.33")] +[assembly: AssemblyVersion("1.34")] +[assembly: AssemblyFileVersion("1.34")] Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-07-26 11:48:12 UTC (rev 3031) +++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-07-27 09:37:52 UTC (rev 3032) @@ -1,4 +1,4 @@ -Release notes to MyLyrics 1.33 +Release notes to MyLyrics 1.34 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,6 @@ 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.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 +Noteworthy changes since version 1.33: +- Fix: Within MyLyrics entries in the lyrics database were often not recognized due to inproper capitalizing of title string. +- Fix: Logging messages now writes correct source when lyric found in music tag. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |