[Mp-plugins-svn] SF.net SVN: mp-plugins:[3477] trunk/plugins/MyLyrics/My Lyrics

[<Sil...@us...>]

Revision: 3477
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3477&view=rev
Author:   SilentException
Date:     2010-03-02 00:59:12 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
* updates to track change handler
* various improvements to lrc edit
* fixed missing album covers

Modified Paths:
--------------
    trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
    trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs

Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs	2010-03-01 22:19:49 UTC (rev 3476)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs	2010-03-02 00:59:12 UTC (rev 3477)
@@ -320,8 +320,8 @@
                         }
                         else if ((_artist.Length==0 && _title.Length>0) || (_title.Length==0 && _artist.Length>0))
                         {
-                            _ImagePathContainer.Clear();
-                            GUIelement_ImgCoverArt.FreeResources();
+                            //_ImagePathContainer.Clear();
+                            //GUIelement_ImgCoverArt.FreeResources();
 
                             resetLrcFields();
                             resetGUI(_selectedScreen);
@@ -371,12 +371,26 @@
                         else
                         {
                             _lyricsFound = false;
-                            StopThread();
 
-                            if (!string.IsNullOrEmpty(_artist))
+                            if (!string.IsNullOrEmpty(_artist) && !string.IsNullOrEmpty(_title))
                             {
-                                FindLyric();
+                                StopThread();
+                                _SearchType = (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
+                                resetGUI((int)MyLyricsSettings.Screen.LRC);
+                                _newTrack = true;
+                                //FindLyric();
                             }
+                            else if ((_artist.Length == 0 && _title.Length > 0) || (_title.Length == 0 && _artist.Length > 0))
+                            {
+                                //_ImagePathContainer.Clear();
+                                //GUIelement_ImgCoverArt.FreeResources();
+
+                                resetLrcFields();
+                                resetGUI(_selectedScreen);
+
+                                _StatusText = "Not enough data for lyric search";
+                                GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+                            }
                             else
                             {
                                 _artist = "";
@@ -413,15 +427,8 @@
 
         private void ShowLRCtoEdit()
         {
-            if (_CurrentTrackTag == null)
-            {
-                resetGUI(_selectedScreen);
-
-                _StatusText = "No music file is playing";
-                GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
-                return;
-            }
-
+            GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
+            
             if (!string.IsNullOrEmpty(_LyricText))
             {
                 _LyricText = _LyricText.Trim();
@@ -432,9 +439,11 @@
                 {
                     _alreadyValidLRC = true;
                     _lines = new string[1] {"This song already has a valid LRC lyric"};
+                    _StatusText = "This song already has a valid LRC lyric";
 
-                    GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + 0, _lines[0]);
-                    GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + 0, _lines[0]);
+                    //GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + 0, _lines[0]);
+                    //GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + 0, _lines[0]);
+                    GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _lines[0]);
                 }
                 else
                 {
@@ -467,6 +476,15 @@
                 _StatusText = "No valid lyrics found";
                 GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
             }
+
+            if (_CurrentTrackTag == null)
+            {
+                resetGUI(_selectedScreen);
+
+                _StatusText = "No music file is playing";
+                GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+                return;
+            }
         }
 
         private void LoadSettings()
@@ -1240,7 +1258,7 @@
             if (tag2.Contains("#percentage") || tag2.Contains("#currentplaytime") || tag2.Contains("#currentremaining"))
                 return;
 
-            if (tag2.Equals("#Play.Current.Track") || tag2.Equals("#Play.Current.Title") || tag2.Equals("#Play.Current.File")) // track has changed
+            if (tag2.Equals("#Play.Current.Track") || tag2.Equals("#Play.Current.Title") || tag2.Equals("#Play.Current.File") || tag2.Equals("#Play.Current.Artist")) // track has changed
             {
                 if (value.Length != 0) // additional check        
                 {

Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs	2010-03-01 22:19:49 UTC (rev 3476)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs	2010-03-02 00:59:12 UTC (rev 3477)
@@ -69,9 +69,9 @@
 
             if (GUIelement_ImgCoverArt != null)
             {
-                GUIelement_ImgCoverArt.FreeResources();
                 if (_ImagePathContainer.Count > 0)
                 {
+                    GUIelement_ImgCoverArt.FreeResources();
                     if (_ImagePathContainer.Count > 1)
                     {
                         int currentImage = 0;
@@ -90,8 +90,8 @@
                     }
                     else
                         GUIelement_ImgCoverArt.SetFileName(_ImagePathContainer[0]);
+                    GUIelement_ImgCoverArt.AllocResources();
                 }
-                GUIelement_ImgCoverArt.AllocResources();
             }
         }
 
@@ -256,10 +256,13 @@
             {
                 try
                 {
+                    GUIelement_ImgCoverArt.FreeResources();
                     GUIelement_ImgCoverArt.SetFileName(GUIGraphicsContext.Skin + @"\media\missing_coverart.png");
+                    GUIelement_ImgCoverArt.AllocResources();
                 }
                 catch (Exception ex)
                 {
+                    GUIelement_ImgCoverArt.FreeResources();
                     Log.Debug("GUIMusicPlayingNow: could not set default image - {0}", ex.Message);
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.