Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [421] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2007-05-23 16:46:19
|
Revision: 421
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=421&view=rev
Author: saamand
Date: 2007-05-23 09:45:51 -0700 (Wed, 23 May 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
trunk/plugins/MyLyrics/MyLyrics.suo
Modified: trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs 2007-05-23 16:10:27 UTC (rev 420)
+++ trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs 2007-05-23 16:45:51 UTC (rev 421)
@@ -126,7 +126,7 @@
public static void SerializeLyricDB()
{
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
using (FileStream fs = new FileStream(path, FileMode.Open))
{
BinaryFormatter bf = new BinaryFormatter();
@@ -138,7 +138,7 @@
public static void SerializeLyricMarkedDB()
{
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
using (FileStream fs = new FileStream(path, FileMode.Open))
{
BinaryFormatter bf = new BinaryFormatter();
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-05-23 16:10:27 UTC (rev 420)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-05-23 16:45:51 UTC (rev 421)
@@ -354,13 +354,13 @@
// Deserialize lyrics and marked database, and save references in LyricsDB
try
{
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
FileStream fs = new FileStream(path, FileMode.Open);
BinaryFormatter bf = new BinaryFormatter();
LyricsDB = (LyricsDatabase)bf.Deserialize(fs);
fs.Close();
- path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName);
+ path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName);
fs = new FileStream(path, FileMode.Open);
LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs);
fs.Close();
@@ -391,7 +391,7 @@
LoadSettings();
- LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log, logName));
+ LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, logName));
LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Start, 0, LyricDiagnostics.ElapsedTimeString() + "MyLyrics opens.");
return true;
}
@@ -757,7 +757,7 @@
LyricsItem item = new LyricsItem(artist, title, lyricAsString, "LRC-editor screen");
LyricsDB[DatabaseUtil.CorrectKeyFormat(artist, title)] = item;
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
using (FileStream fs = new FileStream(path, FileMode.Open))
{
BinaryFormatter bf = new BinaryFormatter();
@@ -868,7 +868,7 @@
{
LyricsDB.Add(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, m_LyricText, site));
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
using (FileStream fs = new FileStream(path, FileMode.Open))
{
BinaryFormatter bf = new BinaryFormatter();
@@ -882,7 +882,7 @@
{
LyricsMarkedDB.Remove(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle));
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, LyricsMarkedDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName);
using (FileStream fs = new FileStream(path, FileMode.Open))
{
BinaryFormatter bf = new BinaryFormatter();
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-05-23 16:10:27 UTC (rev 420)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-05-23 16:45:51 UTC (rev 421)
@@ -105,8 +105,8 @@
public MyLyricsSetup()
{
- LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log, MyLyricsSettings.LogName));
- //LyricDiagnostics.OpenLog(MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Log));
+ LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, MyLyricsSettings.LogName));
+ //LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log));
#region Initialize GUI and class
InitializeComponent();
@@ -162,7 +162,7 @@
#endregion
#region Serialzie/deserialize lyricsdatabases
- string lyricsXMLpath = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Base, MyLyricsSettings.LyricsXMLName);
+ string lyricsXMLpath = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Base, MyLyricsSettings.LyricsXMLName);
FileInfo lyricsXMLfileInfo = new FileInfo(lyricsXMLpath);
@@ -170,7 +170,7 @@
if (lyricsXMLfileInfo.Exists)
{
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
FileInfo fileInfo = new FileInfo(path);
// .. but only if it hasn't already been converted
@@ -192,7 +192,7 @@
fs.Close();
// Create likewise a database for the remainingLyrics
- path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
+ path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
fs = new FileStream(path, FileMode.Create);
MyLyricsSettings.LyricsMarkedDB = new LyricsDatabase();
bf.Serialize(fs, MyLyricsSettings.LyricsMarkedDB);
@@ -212,13 +212,13 @@
// If no Lyrics.xml present in base, then create new serialized databases
else
{
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
FileInfo fileInfo = new FileInfo(path);
// .. but only if the databases hasn't been created
if (fileInfo.Exists == false)
{
- path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
+ path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
// Serialize empty LyricsDatabase if no lyrics.xml present
FileStream fs = new FileStream(path, FileMode.Create);
@@ -228,7 +228,7 @@
fs.Close();
// Serialize empty LyricsMarkedDatabase
- path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
+ path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
fs = new FileStream(path, FileMode.Create);
MyLyricsSettings.LyricsMarkedDB = new LyricsDatabase();
bf.Serialize(fs, MyLyricsSettings.LyricsMarkedDB);
@@ -822,7 +822,7 @@
private void DeserializeBothDB()
{
- string path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName);
// Open database to read data from
FileStream fs = new FileStream(path, FileMode.Open);
@@ -835,7 +835,7 @@
fs.Close();
// Deserialize LyricsRemainingDatabase
- path = MediaPortal.Util.Config.GetFile(MediaPortal.Util.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
+ path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsMarkedDBName);
fs = new FileStream(path, FileMode.Open);
MyLyricsSettings.LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-05-23 16:10:27 UTC (rev 420)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-05-23 16:45:51 UTC (rev 421)
@@ -628,7 +628,7 @@
{
if (MessageBox.Show(this, "Are you sure the Lyrics database should be deleted?", "Delete Lyrics database", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
{
- string path = MediaPortal.Util.Config.GetFolder(MediaPortal.Util.Config.Dir.Database) + "\\" + MyLyricsSettings.LyricsDBName;
+ string path = MediaPortal.Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Database) + "\\" + MyLyricsSettings.LyricsDBName;
FileStream fs = new FileStream(path, FileMode.Create);
BinaryFormatter bf = new BinaryFormatter();
MyLyricsSettings.LyricsDB = new LyricsDatabase();
@@ -647,7 +647,7 @@
{
if (MessageBox.Show(this, "Are you sure you want to delete the database with marked titles?", "Delete title database", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
{
- string path = MediaPortal.Util.Config.GetFolder(MediaPortal.Util.Config.Dir.Database) + "\\" + MyLyricsSettings.LyricsMarkedDBName;
+ string path = MediaPortal.Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Database) + "\\" + MyLyricsSettings.LyricsMarkedDBName;
FileStream fs = new FileStream(path, FileMode.Create);
BinaryFormatter bf = new BinaryFormatter();
MyLyricsSettings.LyricsMarkedDB = new LyricsDatabase();
Modified: trunk/plugins/MyLyrics/MyLyrics.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
