Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1069] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2007-11-16 16:09:07
|
Revision: 1069
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1069&view=rev
Author: saamand
Date: 2007-11-16 08:09:02 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.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.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -42,10 +42,10 @@
public LyricsController(ILyricForm mainForm,
ManualResetEvent eventStopThread,
string[] lyricSites,
- bool allowAllToSearch, bool automaticUpdate)
+ bool allowAllToComplete, bool automaticUpdate)
{
this.m_Form = mainForm;
- this.m_allowAllToComplete = allowAllToSearch;
+ this.m_allowAllToComplete = allowAllToComplete;
this.m_automaticUpdate = automaticUpdate;
m_noOfLyricsToSearch = 1;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -27,6 +27,7 @@
this.columnHeaderStatus2 = new System.Windows.Forms.ColumnHeader();
this.btAdd = new System.Windows.Forms.Button();
this.gbMusicDatabase = new System.Windows.Forms.GroupBox();
+ this.lbStats = new System.Windows.Forms.Label();
this.btAddAll = new System.Windows.Forms.Button();
this.lbSelectedArtist = new System.Windows.Forms.Label();
this.lvArtists = new System.Windows.Forms.ListView();
@@ -39,7 +40,6 @@
this.btRemove = new System.Windows.Forms.Button();
this.btSearch = new System.Windows.Forms.Button();
this.bw = new System.ComponentModel.BackgroundWorker();
- this.lbStats = new System.Windows.Forms.Label();
this.gbMusicDatabase.SuspendLayout();
this.gbSelected.SuspendLayout();
this.SuspendLayout();
@@ -74,7 +74,7 @@
this.lvSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.lvSongs.Location = new System.Drawing.Point(189, 33);
this.lvSongs.Name = "lvSongs";
- this.lvSongs.Size = new System.Drawing.Size(332, 164);
+ this.lvSongs.Size = new System.Drawing.Size(332, 162);
this.lvSongs.SmallImageList = this.imageList;
this.lvSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.lvSongs.TabIndex = 8;
@@ -122,7 +122,7 @@
this.lvSelectedSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.lvSelectedSongs.Location = new System.Drawing.Point(11, 19);
this.lvSelectedSongs.Name = "lvSelectedSongs";
- this.lvSelectedSongs.Size = new System.Drawing.Size(510, 164);
+ this.lvSelectedSongs.Size = new System.Drawing.Size(510, 162);
this.lvSelectedSongs.SmallImageList = this.imageList;
this.lvSelectedSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.lvSelectedSongs.TabIndex = 11;
@@ -177,6 +177,16 @@
this.gbMusicDatabase.TabStop = false;
this.gbMusicDatabase.Text = "Select songs from music database";
//
+ // lbStats
+ //
+ this.lbStats.AutoSize = true;
+ this.lbStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbStats.Location = new System.Drawing.Point(191, 201);
+ this.lbStats.Name = "lbStats";
+ this.lbStats.Size = new System.Drawing.Size(35, 13);
+ this.lbStats.TabIndex = 17;
+ this.lbStats.Text = "[stats]";
+ //
// btAddAll
//
this.btAddAll.Location = new System.Drawing.Point(194, 219);
@@ -205,7 +215,7 @@
this.lvArtists.Location = new System.Drawing.Point(11, 33);
this.lvArtists.MultiSelect = false;
this.lvArtists.Name = "lvArtists";
- this.lvArtists.Size = new System.Drawing.Size(172, 164);
+ this.lvArtists.Size = new System.Drawing.Size(172, 162);
this.lvArtists.TabIndex = 13;
this.lvArtists.UseCompatibleStateImageBehavior = false;
this.lvArtists.View = System.Windows.Forms.View.Details;
@@ -302,16 +312,6 @@
this.bw.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.bw_RunWorkerCompleted);
this.bw.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bw_ProgressChanged);
//
- // lbStats
- //
- this.lbStats.AutoSize = true;
- this.lbStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbStats.Location = new System.Drawing.Point(191, 201);
- this.lbStats.Name = "lbStats";
- this.lbStats.Size = new System.Drawing.Size(35, 13);
- this.lbStats.TabIndex = 17;
- this.lbStats.Text = "[stats]";
- //
// MusicDatabaseBrowse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -444,6 +444,11 @@
{
if (lvi.Text.Equals(artist) && lvi.SubItems[1].Text.Equals(title))
{
+ if (lvi.SubItems[3].Text.Equals("miss"))
+ {
+ MessageBox.Show("This is an error and should not be able to happen!");
+ }
+
lvi.ImageIndex = 0;
lvi.SubItems[2].Text = "LyricsDB";
lvi.SubItems[3].Text = "OK";
@@ -555,12 +560,11 @@
{
m_noOfCurrentlySearches += 1;
string[] lyricID = (string[])songs.Dequeue();
+ bw.ReportProgress(counter++);
lc.AddNewLyricSearch(lyricID[0], lyricID[1]);
-
- bw.ReportProgress(counter++);
}
- Thread.Sleep(100);
+ Thread.Sleep(200);
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -324,7 +324,7 @@
this.btCancel.Name = "btCancel";
this.btCancel.Size = new System.Drawing.Size(78, 23);
this.btCancel.TabIndex = 33;
- this.btCancel.Text = "Stop";
+ this.btCancel.Text = "Cancel";
this.btCancel.UseVisualStyleBackColor = true;
this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -186,7 +186,9 @@
{
alreadyValidLRC = false;
- CurrentTrackTag = new MusicTag();
+ MusicDatabase mDB = MusicDatabase.Instance;
+ CurrentTrackTag = mDB.GetTag(g_Player.CurrentFile);
+
CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
@@ -437,7 +439,6 @@
case Action.ActionType.ACTION_PREVIOUS_MENU:
{
GUIWindowManager.ShowPreviousWindow();
- base.OnAction(action);
break;
}
case Action.ActionType.ACTION_KEY_PRESSED:
@@ -589,9 +590,13 @@
3) Lyric in database
4) Search the Internet */
+ string lyricText = string.Empty;
// 1) + 2) Check if LRC in music tag or Database
- string lyricText = LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)].Lyrics;
+ if (LyricsDB.ContainsKey(DatabaseUtil.CorrectKeyFormat(m_artist, m_title)))
+ {
+ lyricText = LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)].Lyrics;
+ }
if ((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))
@@ -946,7 +951,8 @@
private void resetGUI(int screenID)
{
- if (skin.Equals("ReVision") && (screenID == (int)MyLyricsSettings.Screen.LYRICS_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_EDITOR))
+ if ((skin.Equals("ReVision") || skin.Equals("Replicant")) &&
+ (screenID == (int)MyLyricsSettings.Screen.LYRICS_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_EDITOR))
{
GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_UPNEXT);
GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_ALBUM);
@@ -1033,15 +1039,18 @@
GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, "");
- // 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);
+ // album art only visible for lyrics_basic screen AND also for Xface skin
+ if (!skin.Equals("Xface"))
+ {
+ 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);
+ }
// Hide LRC controls
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
@@ -1110,15 +1119,18 @@
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- // album art only visible for 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);
+ // album art only visible for lyrics_basic screen AND also for Xface skin
+ if (!skin.Equals("Xface"))
+ {
+ 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);
+ }
// LRC controls
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
@@ -1156,15 +1168,18 @@
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- // 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);
+ // album art only visible for lyrics_basic screen AND also for Xface skin
+ if (!skin.Equals("Xface"))
+ {
+ 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);
+ }
// LRC controls
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-16 16:09:02 UTC (rev 1069)
@@ -5,7 +5,7 @@
<ProductVersion>8.0.50727</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/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -117,10 +117,14 @@
PreviousTrackTag = CurrentTrackTag;
if (!isCurSongCdTrack)
- CurrentTrackTag = GetTrackTag(dbs, CurrentTrackFileName, UseID3);
+ {
+ CurrentTrackTag = dbs.GetTag(CurrentTrackFileName);
+ CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
+ }
if (!isNextSongCdTrack)
- NextTrackTag = GetTrackTag(dbs, NextTrackFileName, UseID3);
+ NextTrackTag = dbs.GetTag(NextTrackFileName);
if (isCurSongCdTrack || isNextSongCdTrack)
{
@@ -161,6 +165,8 @@
{
MediaPortal.Freedb.CDTrackDetail curTrack = GUIMusicFiles.MusicCD.getTrack(curCDTrackNum);
CurrentTrackTag = GetTrackTag(curTrack);
+ CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
}
if (nextCDTrackNum < GUIMusicFiles.MusicCD.Tracks.Length)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
