Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3067] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-08-26 13:22:31
|
Revision: 3067
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3067&view=rev
Author: saamand
Date: 2009-08-26 12:13:25 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2009-08-25 14:40:00 UTC (rev 3066)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2009-08-26 12:13:25 UTC (rev 3067)
@@ -76,8 +76,6 @@
m_EventStop_LyricController = eventStopThread;
m_EventStopped_LyricController = new ManualResetEvent(false);
- LyricSearch.Abort = false;
-
if (!string.IsNullOrEmpty(find) && !string.IsNullOrEmpty(replace))
{
if (find != "")
@@ -248,13 +246,11 @@
if (value == true)
{
m_StopSearches = true;
- LyricSearch.Abort = true;
//StopTheSearchAndAbort.Invoke(this, EventArgs.Empty);
}
else
{
m_StopSearches = false;
- LyricSearch.Abort = false;
}
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-08-25 14:40:00 UTC (rev 3066)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2009-08-26 12:13:25 UTC (rev 3067)
@@ -113,7 +113,7 @@
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
</Compile>
- <Compile Include="LyricsSites\Wiki.cs" />
+ <Compile Include="LyricsSites\LyricWiki.cs" />
</ItemGroup>
<ItemGroup>
<WebReferences Include="Web References\" />
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-08-25 14:40:00 UTC (rev 3066)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-08-26 12:13:25 UTC (rev 3067)
@@ -259,6 +259,8 @@
{
m_alreadyValidLRC = false;
+ m_ImagePathContainer.Clear();
+
m_lyricsFound = false;
StopThread();
m_newTrack = false;
@@ -283,6 +285,7 @@
m_title = LyricUtil.CapatalizeString(m_title);
getAlbumArt();
+ getAlbumArt(m_artist);
}
}
else
@@ -617,7 +620,7 @@
if (m_ImageChangeTimer == null)
{
m_ImageChangeTimer = new System.Timers.Timer();
- m_ImageChangeTimer.Interval = 3600 * 1000;
+ m_ImageChangeTimer.Interval = 15 * 1000;
m_ImageChangeTimer.Elapsed += new ElapsedEventHandler(OnImageTimerTickEvent);
m_ImageChangeTimer.Start();
}
@@ -1875,7 +1878,6 @@
GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
GUIControl.HideControl(GetID, CONTROL_LYRICWIDE_SELECTED);
- // album art only visible for basic screen
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
@@ -1915,15 +1917,14 @@
GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
GUIControl.HideControl(GetID, CONTROL_LYRICWIDE_SELECTED);
- // album art only visible for lyrics_basic screen
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
// LRC controls
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-08-25 14:40:00 UTC (rev 3066)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-08-26 12:13:25 UTC (rev 3067)
@@ -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/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2009-08-25 14:40:00 UTC (rev 3066)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2009-08-26 12:13:25 UTC (rev 3067)
@@ -29,7 +29,6 @@
{
public void getAlbumArt()
{
- m_ImagePathContainer.Clear();
m_CurrentTrackFileName = g_Player.CurrentFile;
GetTrackTags();
@@ -48,12 +47,6 @@
public void getAlbumArt(string artist)
{
- m_ImagePathContainer.Clear();
-
- m_PreviousTrackTag = null;
- m_CurrentTrackTag = null;
- m_NextTrackTag = null;
-
m_CurrentThumbFileName = MediaPortal.Util.Utils.GetCoverArtName(Thumbs.MusicArtists, artist);
if (m_CurrentThumbFileName.Length > 0)
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-08-25 14:40:00 UTC (rev 3066)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-08-26 12:13:25 UTC (rev 3067)
@@ -1,4 +1,4 @@
-Release notes to MyLyrics 1.34
+Release notes to MyLyrics 1.35
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,6 +36,7 @@
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.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.
+Noteworthy changes since version 1.34:
+- Fix: The LyricWiki fixed (webservice always returned information text instead of lyric).
+- Fix: Toogle between cover and artist art were deactivated, so artist art was never shown.
+- Add: Album art also shown in editor mode
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
