Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2487] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-01-03 17:02:45
|
Revision: 2487
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2487&view=rev
Author: saamand
Date: 2009-01-03 17:02:41 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricUtil.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 Configuration/MyLyricsSetup.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricUtil.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricUtil.cs 2009-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricUtil.cs 2009-01-03 17:02:41 UTC (rev 2487)
@@ -90,7 +90,6 @@
{
lyrics = FixLyrics(lyrics);
-
if (find != null)
{
int valueIndex = 0;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-01-03 17:02:41 UTC (rev 2487)
@@ -768,7 +768,7 @@
{
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
- if (xmlreader.GetValueAsBool("myLyrics", "automaticReadFromToMusicTag", true))
+ if (xmlreader.GetValueAsBool("myLyrics", "automaticReadFromMusicTag", true))
{
Search_Init();
SearchMusicTags();
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-01-03 17:02:41 UTC (rev 2487)
@@ -86,6 +86,7 @@
this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -107,7 +108,6 @@
this.tabPageAbout = new System.Windows.Forms.TabPage();
this.btClose = new MediaPortal.UserInterface.Controls.MPButton();
this.bgWorkerSearch = new System.ComponentModel.BackgroundWorker();
- this.cbLyrDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabControl.SuspendLayout();
this.tabPageDatabase.SuspendLayout();
this.gbGenerel.SuspendLayout();
@@ -760,6 +760,20 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "User select mode";
//
+ // 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.Name = "cbLyrDB";
+ this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
+ this.cbLyrDB.TabIndex = 9;
+ this.cbLyrDB.Text = "LyrDB";
+ this.cbLyrDB.UseVisualStyleBackColor = true;
+ this.cbLyrDB.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ //
// cbActionext
//
this.cbActionext.AutoSize = true;
@@ -995,20 +1009,6 @@
this.bgWorkerSearch.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.bgWorkerSearch_RunWorkerCompleted);
this.bgWorkerSearch.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgWorkerSearch_ProgressChanged);
//
- // 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.Name = "cbLyrDB";
- this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
- this.cbLyrDB.TabIndex = 9;
- this.cbLyrDB.Text = "LyrDB";
- this.cbLyrDB.UseVisualStyleBackColor = true;
- this.cbLyrDB.Leave += new System.EventHandler(this.WriteMediaPortalXML);
- //
// MyLyricsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-01-03 17:02:41 UTC (rev 2487)
@@ -255,7 +255,7 @@
m_automaticWriteToMusicTag = xmlreader.GetValue("myLyrics", "automaticWriteToMusicTag").Equals("yes");
cbMusicTagWrite.Checked = m_automaticWriteToMusicTag;
- m_automaticReadFromToMusicTag = xmlreader.GetValue("myLyrics", "automaticReadFromToMusicTag").Equals("yes");
+ m_automaticReadFromToMusicTag = xmlreader.GetValue("myLyrics", "automaticReadFromMusicTag").Equals("yes");
cbMusicTagAlwaysCheck.Checked = m_automaticReadFromToMusicTag;
lbSongsLimitNote.Text = ("(You have currently " + m_TotalTitles.ToString() + " titles in your music database)");
@@ -273,6 +273,8 @@
string[] replaceArray = m_replace.Split(',');
int valueIndex = 0;
+ dbGridView.Rows.Clear();
+
foreach (string findValue in findArray)
{
@@ -1112,7 +1114,7 @@
xmlwriter.SetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", cbAutomaticUpdate.Checked);
xmlwriter.SetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", cbMoveSongFrom.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticWriteToMusicTag", cbMusicTagWrite.Checked);
- xmlwriter.SetValueAsBool("myLyrics", "automaticReadFromToMusicTag", cbMusicTagAlwaysCheck.Checked);
+ xmlwriter.SetValueAsBool("myLyrics", "automaticReadFromMusicTag", cbMusicTagAlwaysCheck.Checked);
m_automaticWriteToMusicTag = cbMusicTagWrite.Checked;
m_automaticReadFromToMusicTag = cbMusicTagAlwaysCheck.Checked;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-01-03 17:02:41 UTC (rev 2487)
@@ -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-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-01-03 17:02:41 UTC (rev 2487)
@@ -90,7 +90,8 @@
bool lyricsFound = false;
- bool m_automaticWriteToMusicTag = true;
+ bool m_AutomaticWriteToMusicTag = true;
+ bool m_AutomaticReadFromMusicTag = true;
String[] m_sitesToSearch;
@@ -184,8 +185,6 @@
PlaylistPlayer = PlayListPlayer.SingletonPlayer;
GetID = (int)GUIMyLyrics.WINDOW_MYLYRICS;
-
- GUIGraphicsContext.ResetLastActivity();
}
public override bool Init()
@@ -273,6 +272,8 @@
CalculateNextInterval();
}
+ //GUIGraphicsContext.ResetLastActivity();
+
base.Process();
}
@@ -347,7 +348,8 @@
useActionext = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True") ? true : false;
useLyrDB = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrDB", "True")).ToString().Equals("True") ? true : false;
- m_automaticWriteToMusicTag = xmlreader.GetValue("myLyrics", "automaticWriteToMusicTag").Equals("yes");
+ m_AutomaticWriteToMusicTag = xmlreader.GetValue("myLyrics", "automaticWriteToMusicTag").Equals("yes");
+ m_AutomaticReadFromMusicTag = xmlreader.GetValue("myLyrics", "automaticReadFromMusicTag").Equals("yes");
skin = ((string)xmlreader.GetValueAsString("skin", "name", "Blue3"));
@@ -560,7 +562,7 @@
m_LastLyricText = m_LyricText;
m_LastFileName = CurrentTrackTag.FileName;
- if (m_automaticWriteToMusicTag)
+ if (m_AutomaticWriteToMusicTag)
{
TagReaderUtil.WriteLyrics(m_LastFileName, m_LastLyricText); ;
}
@@ -653,7 +655,7 @@
}
// 2) LRC in music tag or lyrics Database
- if ((CurrentTrackTag.Lyrics.Length != 0 && (lrc = new SimpleLRC(m_artist, m_title, CurrentTrackTag.Lyrics)).IsValid)
+ 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;
@@ -731,10 +733,11 @@
}
// 3) Lyric in music tag
- else if (CurrentTrackTag.Lyrics.Length != 0)
+ else if (m_AutomaticReadFromMusicTag && CurrentTrackTag.Lyrics.Length != 0)
{
CurrentTrackTag.Lyrics = LyricUtil.FixLyrics(CurrentTrackTag.Lyrics);
ShowLyricOnScreen(CurrentTrackTag.Lyrics, CurrentTrackTag.FileName);
+ SaveLyricToDatabase(CurrentTrackTag.Artist, CurrentTrackTag.Title, "music tag");
}
// 4) if lyric in music database
@@ -956,10 +959,10 @@
}
}
- private void SaveLyricToDatabase(string site)
+ private void SaveLyricToDatabase(string artist, string title, string site)
{
- string capArtist = LyricUtil.CapatalizeString(m_artist);
- string capTitle = LyricUtil.CapatalizeString(m_title);
+ string capArtist = LyricUtil.CapatalizeString(artist);
+ string capTitle = LyricUtil.CapatalizeString(title);
if (DatabaseUtil.IsTrackInLyricsDatabase(LyricsDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_NOT_FOUND))
{
@@ -1320,7 +1323,7 @@
if (m_artist.Equals(artist) && m_title.Equals(title))
{
ShowLyricOnScreen(lyricText, site);
- SaveLyricToDatabase(site);
+ SaveLyricToDatabase(artist, title, site);
}
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-01-02 21:10:16 UTC (rev 2486)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-01-03 17:02:41 UTC (rev 2487)
@@ -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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
