Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3488] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2010-03-04 20:09:32
|
Revision: 3488
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3488&view=rev
Author: saamand
Date: 2010-03-04 20:09:24 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
* Within MP LRC files were always shown/searched even when LRCFinder was deselected within configuration
* First word of every other line was not translated due to inproper position of newline code '\n'
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
Property Changed:
----------------
trunk/plugins/MyLyrics/
trunk/plugins/MyLyrics/TranslateProvider/
Property changes on: trunk/plugins/MyLyrics
___________________________________________________________________
Modified: svn:ignore
- *.suo
*.user
thumbs.db
+ *.suo
*.user
UpgradeLog.XML
_UpgradeReport_Files
thumbs.db
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-04 08:00:53 UTC (rev 3487)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-04 20:09:24 UTC (rev 3488)
@@ -104,7 +104,7 @@
private bool _useLyricWiki;
private bool _ValidLrcLyric;
- // A valid LRC-lyric always overwrites a normal lyric in both Lyrics db and music tag (if allowed)
+ // A valid LRC-lyric always overwrites a normal lyric in both Lyrics db and music tag (if allowed)
private Timer _WriteTagTimer;
@@ -167,7 +167,7 @@
public override bool Init()
{
- _selectedScreen = (int) MyLyricsSettings.Screen.LYRICS;
+ _selectedScreen = (int)MyLyricsSettings.Screen.LYRICS;
_startingScrollSpeedVertical = GUIGraphicsContext.ScrollSpeedVertical;
GUIGraphicsContext.ScrollSpeedVertical = 0;
@@ -182,9 +182,9 @@
public override void Process()
{
- if ((_newTrack || _SearchingState != (int) SEARCH_STATE.NOT_SEARCHING)
+ if ((_newTrack || _SearchingState != (int)SEARCH_STATE.NOT_SEARCHING)
&& (!g_Player.IsRadio || !string.IsNullOrEmpty(_artist)))
- //&& (!g_Player.IsRadio || _CurrentTrackTag!=null))
+ //&& (!g_Player.IsRadio || _CurrentTrackTag!=null))
{
if (_newTrack)
{
@@ -198,7 +198,7 @@
MusicDatabase mDB = MusicDatabase.Instance;
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, "");
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, "");
if (g_Player.IsRadio == false)
{
@@ -246,7 +246,7 @@
resetGUI(_selectedScreen);
_StatusText = "No music file is playing";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
}
else
@@ -266,22 +266,23 @@
_CurrentTrackTag.Lyrics = LyricUtil.FixLyrics(_CurrentTrackTag.Lyrics);
}
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LYRICS
- || _selectedScreen == (int) MyLyricsSettings.Screen.LRC
- || _selectedScreen == (int) MyLyricsSettings.Screen.LRC_PICK)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LYRICS
+ || _selectedScreen == (int)MyLyricsSettings.Screen.LRC
+ || _selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
// Get lyric
if (_artist.Length != 0 && _title.Length != 0)
{
- if (_SearchingState == (int) SEARCH_STATE.NOT_SEARCHING)
+ if (_SearchingState == (int)SEARCH_STATE.NOT_SEARCHING)
{
- if (_SearchType == (int) SEARCH_TYPES.BOTH_LRCS_AND_LYRICS
- || _SearchType == (int) SEARCH_TYPES.ONLY_LRCS)
+ if (_useLrcFinder &&
+ (_SearchType == (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS
+ || _SearchType == (int)SEARCH_TYPES.ONLY_LRCS))
{
bool lrcFoundInTagOrLyricDb = FindLrc();
if (lrcFoundInTagOrLyricDb)
{
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
}
else
{
@@ -301,27 +302,27 @@
}
}
}
- else if (_SearchingState == (int) SEARCH_STATE.SEARCHING_FOR_LRC &&
+ else if (_SearchingState == (int)SEARCH_STATE.SEARCHING_FOR_LRC &&
!_LyriccontrollerIsWorking)
{
- if (_SearchType == (int) SEARCH_TYPES.BOTH_LRCS_AND_LYRICS
- || _SearchType == (int) SEARCH_TYPES.ONLY_LYRICS)
+ if (_SearchType == (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS
+ || _SearchType == (int)SEARCH_TYPES.ONLY_LYRICS)
{
FindLyric();
- _SearchingState = (int) SEARCH_STATE.SEARCHING_FOR_LYRIC;
+ _SearchingState = (int)SEARCH_STATE.SEARCHING_FOR_LYRIC;
}
else
{
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
}
}
- else if (_SearchingState == (int) SEARCH_STATE.SEARCHING_FOR_LYRIC &&
+ else if (_SearchingState == (int)SEARCH_STATE.SEARCHING_FOR_LYRIC &&
!_LyriccontrollerIsWorking)
{
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
}
}
- else if ((_artist.Length==0 && _title.Length>0) || (_title.Length==0 && _artist.Length>0))
+ else if ((_artist.Length == 0 && _title.Length > 0) || (_title.Length == 0 && _artist.Length > 0))
{
//_ImagePathContainer.Clear();
//GUIelement_ImgCoverArt.FreeResources();
@@ -349,7 +350,7 @@
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
}
- else if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ else if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
_newTrack = false;
nextLRCLineIndex = 0;
@@ -415,8 +416,8 @@
if (_lyricsFound)
{
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC
- || _selectedScreen == (int) MyLyricsSettings.Screen.LRC_PICK)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC
+ || _selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
CalculateNextInterval();
}
@@ -431,7 +432,7 @@
private void ShowLRCtoEdit()
{
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
-
+
if (!string.IsNullOrEmpty(_LyricText))
{
_LyricText = _LyricText.Trim();
@@ -441,7 +442,7 @@
if (lrc.IsValid)
{
_alreadyValidLRC = true;
- _lines = new string[1] {"This song already has a valid LRC lyric"};
+ _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]);
@@ -452,21 +453,21 @@
{
resetLrcFields();
- _lines = _LyricText.Split(new string[2] {"\r\n", "\n"}, StringSplitOptions.None);
+ _lines = _LyricText.Split(new string[2] { "\r\n", "\n" }, StringSplitOptions.None);
try
{
- for (int i = _tagRoundFinished*_TAG_IN_ROUND;
- i < (_tagRoundFinished + 1)*_TAG_IN_ROUND;
+ for (int i = _tagRoundFinished * _TAG_IN_ROUND;
+ i < (_tagRoundFinished + 1) * _TAG_IN_ROUND;
i++)
{
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
//GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i, _lines[i]);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i,
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i, _lines[i]);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i,
_lines[i]);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i, "[xx:xx.xx]");
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i, "[xx:xx.xx]");
}
}
catch
@@ -477,7 +478,7 @@
else
{
_StatusText = "No valid lyric found";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
if (_CurrentTrackTag == null)
@@ -569,8 +570,8 @@
private void LoadSettings()
{
_newTrack = true;
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
- _SearchType = (int) SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
+ _SearchType = (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
_LyricsToWriteToTag = new List<string[]>();
@@ -632,7 +633,7 @@
string translationString =
(xmlreader.GetValueAsString("myLyrics", "translationLanguage", "English (en)"));
- string[] strings = translationString.Split(new string[1] {"("}, StringSplitOptions.None);
+ string[] strings = translationString.Split(new string[1] { "(" }, StringSplitOptions.None);
_translationLanguage = strings[0].Trim();
_translationLanguageCode = strings[1].Replace(")", string.Empty);
@@ -714,7 +715,7 @@
sitesToSearch.Add("LyricsPluginSite");
}
- _LyricSitesTosearch = (string[]) sitesToSearch.ToArray(typeof (string));
+ _LyricSitesTosearch = (string[])sitesToSearch.ToArray(typeof(string));
_settingsRead = true;
@@ -724,17 +725,17 @@
string path = Config.GetFile(Config.Dir.Database, MLyricsDbName);
FileStream fs = new FileStream(path, FileMode.Open);
BinaryFormatter bf = new BinaryFormatter();
- LyricsDb = (LyricsDatabase) bf.Deserialize(fs);
+ LyricsDb = (LyricsDatabase)bf.Deserialize(fs);
fs.Close();
path = Config.GetFile(Config.Dir.Database, MLyricsMarkedDbName);
fs = new FileStream(path, FileMode.Open);
- LyricsMarkedDb = (LyricsDatabase) bf.Deserialize(fs);
+ LyricsMarkedDb = (LyricsDatabase)bf.Deserialize(fs);
fs.Close();
}
catch
{
- GUIDialogOK dlg = (GUIDialogOK) GUIWindowManager.GetWindow((int) Window.WINDOW_DIALOG_OK);
+ GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
dlg.SetHeading("No lyric database found");
dlg.SetLine(1, "Please run the MyLyrics configuration");
dlg.SetLine(2, "before running the plugin.");
@@ -757,7 +758,7 @@
if (_ImageChangeTimer == null)
{
_ImageChangeTimer = new Timer();
- _ImageChangeTimer.Interval = 15*1000;
+ _ImageChangeTimer.Interval = 15 * 1000;
_ImageChangeTimer.Elapsed += OnImageTimerTickEvent;
_ImageChangeTimer.Start();
}
@@ -765,7 +766,7 @@
if (_LRCPickTimer == null)
{
_LRCPickTimer = new Timer();
- _LRCPickTimer.Interval = 3*1000;
+ _LRCPickTimer.Interval = 3 * 1000;
_LRCPickTimer.Elapsed += OnLRCPickTimerTickEvent;
_LRCPickTimer.Stop();
}
@@ -785,7 +786,7 @@
if (worker.IsBusy)
worker.CancelAsync();
resetAll();
- resetGUI((int) MyLyricsSettings.Screen.LYRICS);
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS);
GUIGraphicsContext.ScrollSpeedVertical = _startingScrollSpeedVertical;
@@ -823,7 +824,7 @@
message.Message == GUIMessage.MessageType.GUI_MSG_LABEL_SET ||
message.Message == GUIMessage.MessageType.GUI_MSG_LABEL_RESET
) &&
- message.TargetWindowId == GetID &&
+ message.TargetWindowId == GetID &&
message.TargetControlId == (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS)
{
_LRCPickTimer.Stop();
@@ -889,10 +890,10 @@
{
if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK && !action.m_key.KeyChar.Equals(42))
ShowLrcPick();
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
TagLine();
}
- else if (action.m_key.KeyChar.Equals(40) || action.m_key.KeyChar.Equals(48) ||action.m_key.KeyChar.Equals(101)) // '(' or '0' or 'E' - 42 is actually '(' ???
+ else if (action.m_key.KeyChar.Equals(40) || action.m_key.KeyChar.Equals(48) || action.m_key.KeyChar.Equals(101)) // '(' or '0' or 'E' - 42 is actually '(' ???
{
// Don't use a stream to create a LRC
if (g_Player.IsRadio)
@@ -901,7 +902,7 @@
}
_lyricsFound = false;
- if (_selectedScreen != (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ if (_selectedScreen != (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
resetGUI((int)MyLyricsSettings.Screen.LRC_EDITOR);
ShowLRCtoEdit();
@@ -934,7 +935,7 @@
GUIGraphicsContext.ScrollSpeedVertical = 8;
else if (GUIGraphicsContext.ScrollSpeedVertical >= 4)
GUIGraphicsContext.ScrollSpeedVertical = 7; // MediaPortal BUG here, scroll 6 gets many errors in log:
- //GUITextScrollUpControl.cs: if (_frameLimiter % (6 - GUIGraphicsContext.ScrollSpeedVertical) == 0)
+ //GUITextScrollUpControl.cs: if (_frameLimiter % (6 - GUIGraphicsContext.ScrollSpeedVertical) == 0)
else if (GUIGraphicsContext.ScrollSpeedVertical >= 2)
GUIGraphicsContext.ScrollSpeedVertical = 4;
else if (GUIGraphicsContext.ScrollSpeedVertical >= 0)
@@ -984,7 +985,7 @@
}
else
{
- _SearchType = (int)SEARCH_TYPES.ONLY_LRCS;
+ _SearchType = (int) SEARCH_TYPES.ONLY_LRCS;
}
}
else if (_SearchType == (int)SEARCH_TYPES.ONLY_LRCS)
@@ -993,12 +994,26 @@
}
else
{
- _SearchType = (int)SEARCH_TYPES.ONLY_LRCS;
+ _SearchType = (int) SEARCH_TYPES.ONLY_LRCS;
}
if (hasValidLRC && _SearchType == (int)SEARCH_TYPES.ONLY_LYRICS)
_SearchType = (int)SEARCH_TYPES.ONLY_LRCS;
+ if (_SearchType != (int)SEARCH_TYPES.ONLY_LYRICS && !_useLrcFinder)
+ {
+ _SearchType = (int)SEARCH_TYPES.ONLY_LYRICS;
+
+ GUIDialogOK dlg2 = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
+ dlg2.SetHeading("LRC screen disabled");
+ dlg2.SetLine(1, "You have not enabled LRCFinder");
+ dlg2.SetLine(2, "in configuration and have thereby");
+ dlg2.SetLine(3, "disabled the LRC screen.");
+ dlg2.DoModal(GUIWindowManager.ActiveWindow);
+
+ return;
+ }
+
//resetGUI((int)MyLyricsSettings.Screen.LRC);
shouldNewTrack = true;
@@ -1076,7 +1091,7 @@
{
if (String.IsNullOrEmpty(_artist)) return;
- if (_selectedScreen != (int) MyLyricsSettings.Screen.LRC_PICK)
+ if (_selectedScreen != (int)MyLyricsSettings.Screen.LRC_PICK)
{
LrcFinder lrcFinder = new LrcFinder();
_LrcTable = lrcFinder.FindLRCs(_artist, _title);
@@ -1085,12 +1100,12 @@
if (_LrcTable != null && _LrcTable.Rows.Count > 0)
{
_selectedinLRCPicker = 0;
- if (_SimpleLrc != null)
+ if (_SimpleLrc != null)
{
- for (int i=0; i<_LrcTable.Rows.Count; i++)
+ for (int i = 0; i < _LrcTable.Rows.Count; i++)
{
SimpleLRC _SimpleLrcTemp = new SimpleLRC(null, null, _LrcTable.Rows[i]["Lyrics"] as string);
- if (_SimpleLrc.LyricAsLRC == _SimpleLrcTemp.LyricAsLRC)
+ if (_SimpleLrc.LyricAsLRC == _SimpleLrcTemp.LyricAsLRC)
{
_selectedinLRCPicker = i;
break;
@@ -1112,7 +1127,7 @@
status = string.Format("LRC {0} of {1} shown", _selectedinLRCPicker + 1, _LrcTable.Rows.Count);
}
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
}
else if (_LrcTable == null)
{
@@ -1148,12 +1163,12 @@
//worker.RunWorkerAsync(data);
//SaveLyricToTagLists(_CurrentTrackTag.FileName, _LyricText);
SaveLyricToTagLists(this, new DoWorkEventArgs(data));
-
+
}
_LrcTable = null;
_newTrack = true;
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
Process();
}
@@ -1162,7 +1177,7 @@
protected override void OnShowContextMenu()
{
- GUIDialogMenu dlg = (GUIDialogMenu) GUIWindowManager.GetWindow((int) Window.WINDOW_DIALOG_MENU);
+ GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_MENU);
if (dlg == null)
{
return;
@@ -1177,7 +1192,7 @@
string translateLabelString = "Translate to " + _translationLanguage.ToLower();
dlg.Add(translateLabelString);
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_PICK)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
dlg.Add("Use picked LRC");
}
@@ -1186,7 +1201,7 @@
dlg.Add("Pick LRC");
}
- if (CONTROL_LYRIC_SELECTED == (int) GUI_Lyrics_Controls.CONTROL_Lyric)
+ if (CONTROL_LYRIC_SELECTED == (int)GUI_Lyrics_Controls.CONTROL_Lyric)
{
dlg.Add("Show scrolling lyric");
}
@@ -1204,16 +1219,28 @@
switch (dlg.SelectedLabelText)
{
case "Find LRC":
- _SearchType = (int) SEARCH_TYPES.ONLY_LRCS;
+ if (_useLrcFinder)
+ {
+ _SearchType = (int) SEARCH_TYPES.ONLY_LRCS;
- //_selectedScreen = (int) MyLyricsSettings.Screen.LRC;
- resetGUI((int)MyLyricsSettings.Screen.LRC);
+ //_selectedScreen = (int) MyLyricsSettings.Screen.LRC;
+ resetGUI((int) MyLyricsSettings.Screen.LRC);
- _newTrack = true;
+ _newTrack = true;
+ }
+ else
+ {
+ GUIDialogOK dlg2 = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
+ dlg2.SetHeading("LRC screen disabled");
+ dlg2.SetLine(1, "You have not enabled LRCFinder");
+ dlg2.SetLine(2, "in configuration and have thereby");
+ dlg2.SetLine(3, "disabled the LRC screen.");
+ dlg2.DoModal(GUIWindowManager.ActiveWindow);
+ }
break;
case "Find lyric":
- _SearchType = (int) SEARCH_TYPES.ONLY_LYRICS;
+ _SearchType = (int)SEARCH_TYPES.ONLY_LYRICS;
//_selectedScreen = (int) MyLyricsSettings.Screen.LYRICS;
resetGUI((int)MyLyricsSettings.Screen.LYRICS);
@@ -1225,7 +1252,7 @@
// Don't use a stream to create a LRC
if (g_Player.IsRadio)
{
- GUIDialogOK dlg2 = (GUIDialogOK) GUIWindowManager.GetWindow((int) Window.WINDOW_DIALOG_OK);
+ GUIDialogOK dlg2 = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
dlg2.SetHeading("LRC editor error");
dlg2.SetLine(1, "You cannot tag a streaming");
dlg2.SetLine(2, "media due to inproper timestamps.");
@@ -1234,13 +1261,13 @@
return;
}
- GUIControl.HideControl(GetID, (int) GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
//CONTROL_LYRIC_SELECTED = (int) GUI_Lyrics_Controls.CONTROL_Lyric;
//_lyricsFound = false;
- if (_selectedScreen != (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ if (_selectedScreen != (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
- resetGUI((int) MyLyricsSettings.Screen.LRC_EDITOR);
+ resetGUI((int)MyLyricsSettings.Screen.LRC_EDITOR);
}
//_newTrack = true;
@@ -1259,24 +1286,24 @@
case "Show scrolling lyric":
case "Show static lyric":
- _SearchType = (int) SEARCH_TYPES.ONLY_LYRICS;
+ _SearchType = (int)SEARCH_TYPES.ONLY_LYRICS;
//_selectedScreen = (int)MyLyricsSettings.Screen.LYRICS;
- resetGUI((int) MyLyricsSettings.Screen.LYRICS);
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS);
_newTrack = true;
- if (CONTROL_LYRIC_SELECTED == (int) GUI_Lyrics_Controls.CONTROL_Lyric)
+ if (CONTROL_LYRIC_SELECTED == (int)GUI_Lyrics_Controls.CONTROL_Lyric)
{
- CONTROL_LYRIC_SELECTED = (int) GUI_Lyrics_Controls.CONTROL_Lyric_Scroll;
- GUIControl.ShowControl(GetID, (int) GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
- GUIControl.HideControl(GetID, (int) GUI_Lyrics_Controls.CONTROL_Lyric);
+ CONTROL_LYRIC_SELECTED = (int)GUI_Lyrics_Controls.CONTROL_Lyric_Scroll;
+ GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
}
else
{
- CONTROL_LYRIC_SELECTED = (int) GUI_Lyrics_Controls.CONTROL_Lyric;
- GUIControl.HideControl(GetID, (int) GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
- GUIControl.ShowControl(GetID, (int) GUI_Lyrics_Controls.CONTROL_Lyric);
+ CONTROL_LYRIC_SELECTED = (int)GUI_Lyrics_Controls.CONTROL_Lyric;
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
+ GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
}
break;
@@ -1309,7 +1336,7 @@
}
catch (FileNotFoundException ex)
{
- GUIDialogOK dlg3 = (GUIDialogOK) GUIWindowManager.GetWindow((int) Window.WINDOW_DIALOG_OK);
+ GUIDialogOK dlg3 = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
dlg3.SetHeading("File not found");
dlg3.SetLine(1, "The TranslateProvider.dll assembly");
dlg3.SetLine(2, "could not be found.");
@@ -1321,15 +1348,19 @@
bool reliable;
double confidence;
+ lyricToTranslate = lyricToTranslate.Replace("\n", "\n ");
+
string translation = translate.Translate(lyricToTranslate, _translationLanguageCode,
out detectedLanguage, out reliable, out confidence, "\n");
+ translation = translation.Replace("\n ", "\n");
+
translation = MediaPortalUtil.MakePlainLyricPerfectToShow(translation);
- resetGUI((int) MyLyricsSettings.Screen.LYRICS);
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS);
_isInTranslation = true;
GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, translation);
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_TITLE,
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE,
string.Format("{0} translation", _translationLanguage));
GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
@@ -1352,8 +1383,8 @@
StopThread();
resetAll();
_newTrack = true;
- _SearchType = (int) SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
+ _SearchType = (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
Process();
}
else
@@ -1368,7 +1399,7 @@
resetGUI(_selectedScreen);
_StatusText = "No music file is playing";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
}
else if (g_Player.IsRadio)
@@ -1380,7 +1411,7 @@
|| string.IsNullOrEmpty(GUIPropertyManager.GetProperty("#Play.Current.Title")))
{
_StatusText = "Stream info not complete";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
else if (!g_Player.CurrentFile.Equals(_LastStreamFile)
|| !newArtist.Equals(_artist) || !newTitle.Equals(_title))
@@ -1389,8 +1420,8 @@
StopThread();
resetAll();
- _SearchType = (int) SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
- _SearchingState = (int) SEARCH_STATE.NOT_SEARCHING;
+ _SearchType = (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
+ _SearchingState = (int)SEARCH_STATE.NOT_SEARCHING;
_LastStreamFile = g_Player.CurrentFile;
@@ -1434,7 +1465,7 @@
GUIControl.ClearControl(GetID, CONTROL_LYRIC_SELECTED);
GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, "");
- resetGUI((int) MyLyricsSettings.Screen.LRC);
+ resetGUI((int)MyLyricsSettings.Screen.LRC);
if ((_CurrentTrackTag != null && _CurrentTrackTag.Artist != "") || g_Player.IsRadio)
{
@@ -1456,10 +1487,10 @@
6) Search for lyric */
// (1 of 2) Search LRCS
- if (_SearchType != (int) SEARCH_TYPES.ONLY_LYRICS)
+ if (_SearchType != (int)SEARCH_TYPES.ONLY_LYRICS)
{
_StatusText = "Searching for a matching LRC...";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
#region 1) LRC in music tag
@@ -1525,7 +1556,7 @@
{
_SearchType = (int)SEARCH_TYPES.ONLY_LYRICS;
_StatusText = "No matching LRC found";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
#endregion
@@ -1563,15 +1594,15 @@
lyricText = LyricsDb[DatabaseUtil.CorrectKeyFormat(_artist, _title)].Lyrics;
}
- if (_SearchType != (int) SEARCH_TYPES.ONLY_LRCS)
+ if (_SearchType != (int)SEARCH_TYPES.ONLY_LRCS)
{
#region 4) Lyric in music tag
if (_AutomaticReadFromMusicTag && g_Player.IsRadio == false
&& _CurrentTrackTag != null && _CurrentTrackTag.Lyrics.Length != 0
&&
- !((_SearchType == (int) SEARCH_TYPES.ONLY_LYRICS) &&
- new SimpleLRC(_artist, _title, _CurrentTrackTag.Lyrics).IsValid))
+ !((!_useLrcFinder &&
+ new SimpleLRC(_artist, _title, _CurrentTrackTag.Lyrics).IsValid)))
{
string lyric = LyricUtil.FixLyrics(_CurrentTrackTag.Lyrics);
_CurrentTrackTag.Lyrics = lyric;
@@ -1585,22 +1616,22 @@
#region 5) Lyric in music database
if (lyricText.Length != 0 &&
- !((_SearchType == (int) SEARCH_TYPES.ONLY_LYRICS) && _CurrentTrackTag != null &&
- new SimpleLRC(_artist, _title, lyricText).IsValid))
+ !((!_useLrcFinder && _CurrentTrackTag != null &&
+ new SimpleLRC(_artist, _title, lyricText).IsValid)))
{
LyricFound = new Object[] { lyricText, _artist, _title, "lyrics database" };
return true;
}
- #endregion
+ #endregion
- #region 6) Search the Internet for a lyric
+ #region 6) Search the Internet for a lyric
else if (_LyricSitesTosearch.Length > 0)
{
_StatusText = "Searching for a matching lyric...";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
- resetGUI((int) MyLyricsSettings.Screen.LYRICS);
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS);
_lyricsFound = false;
@@ -1664,22 +1695,22 @@
if (showLrcPickScreen)
{
- resetGUI((int) MyLyricsSettings.Screen.LRC_PICK);
+ resetGUI((int)MyLyricsSettings.Screen.LRC_PICK);
}
else
{
- resetGUI((int) MyLyricsSettings.Screen.LRC);
+ resetGUI((int)MyLyricsSettings.Screen.LRC);
}
_SearchType = (int)SEARCH_TYPES.ONLY_LRCS;
_StatusText = "";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
_LyricText = lyricText;
try
{
- for (int i = _tagRoundFinished*_TAG_IN_ROUND; i < (_tagRoundFinished + 1)*_TAG_IN_ROUND; i++)
+ for (int i = _tagRoundFinished * _TAG_IN_ROUND; i < (_tagRoundFinished + 1) * _TAG_IN_ROUND; i++)
{
if (useEditControlsOnLRCPick() && _selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
@@ -1693,13 +1724,13 @@
}
}
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_PICK)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
- for (int i = _tagRoundFinished*_TAG_IN_ROUND; i < (_tagRoundFinished + 1)*_TAG_IN_ROUND; i++)
+ for (int i = _tagRoundFinished * _TAG_IN_ROUND; i < (_tagRoundFinished + 1) * _TAG_IN_ROUND; i++)
{
SimpleLRCTimeAndLine currentLine = _LrcTimeCollection[i];
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
currentLine.TimeString);
}
}
@@ -1711,7 +1742,7 @@
private void TagLine()
{
- if (_alreadyValidLRC == false && _selectedScreen == (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ if (_alreadyValidLRC == false && _selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
if (_Stopwatch == null)
return;
@@ -1751,9 +1782,9 @@
for (int i = 0; i < _TAG_IN_ROUND && _LRCLinesTotal + i < _lines.Length; i++)
{
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i,
- _lines[_tagRoundFinished*_TAG_IN_ROUND + i]);
+ _lines[_tagRoundFinished * _TAG_IN_ROUND + i]);
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i,
- _lines[_tagRoundFinished*_TAG_IN_ROUND + i]);
+ _lines[_tagRoundFinished * _TAG_IN_ROUND + i]);
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
@@ -1811,7 +1842,7 @@
SaveLyricToTagLists(this, new DoWorkEventArgs(data));
}
- _selectedScreen = (int) MyLyricsSettings.Screen.LRC;
+ _selectedScreen = (int)MyLyricsSettings.Screen.LRC;
ShowLyricOnScreen(_LyricText, "MediaPortal");
// Upload LRC to LrcFinder if user has accepted in configuration
@@ -1822,7 +1853,7 @@
else if (_alwaysAskUploadLrcToLrcFinder || !_confirmedNoUploadLrcToLrcFinder)
{
GUIDialogYesNo dlgYesNo =
- (GUIDialogYesNo) GUIWindowManager.GetWindow((int) Window.WINDOW_DIALOG_YES_NO);
+ (GUIDialogYesNo)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_YES_NO);
if (dlgYesNo != null)
{
dlgYesNo.SetHeading("Upload to LRCFinder?");
@@ -1867,12 +1898,12 @@
if (lrcUploaded)
{
string status = "Your LRC was successfully uploaded";
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
}
else
{
string status = "LrcFinder could not be reached";
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
}
}
@@ -1891,21 +1922,21 @@
if (--nextLRCLineIndex < 0)
{
- nextLRCLineIndex = _TAG_IN_ROUND-1;
+ nextLRCLineIndex = _TAG_IN_ROUND - 1;
--_tagRoundFinished;
try
{
for (int i = 0; i < _TAG_IN_ROUND; i++)
{
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
- _lines[_tagRoundFinished*_TAG_IN_ROUND + i].Substring(0, 9));
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i,
- _lines[_tagRoundFinished*_TAG_IN_ROUND + i].Substring(9));
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i,
- _lines[_tagRoundFinished*_TAG_IN_ROUND + i].Substring(9));
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
+ _lines[_tagRoundFinished * _TAG_IN_ROUND + i].Substring(0, 9));
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i,
+ _lines[_tagRoundFinished * _TAG_IN_ROUND + i].Substring(9));
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i,
+ _lines[_tagRoundFinished * _TAG_IN_ROUND + i].Substring(9));
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
}
}
catch
@@ -1913,9 +1944,9 @@
;
}
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + nextLRCLineIndex);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + nextLRCLineIndex);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + nextLRCLineIndex,
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + nextLRCLineIndex);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + nextLRCLineIndex);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + nextLRCLineIndex,
"[xx:xx.xx]");
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + nextLRCLineIndex,
@@ -1925,9 +1956,9 @@
}
else
{
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + nextLRCLineIndex);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + nextLRCLineIndex);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + nextLRCLineIndex,
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + nextLRCLineIndex);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + nextLRCLineIndex);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + nextLRCLineIndex,
"[xx:xx.xx]");
}
}
@@ -1937,7 +1968,7 @@
{
if (_LrcTimeCollection != null)
{
- int trackTime = (int) (g_Player.CurrentPosition*1000);
+ int trackTime = (int)(g_Player.CurrentPosition * 1000);
nextLRCLineIndex = _LrcTimeCollection.GetSimpleLRCTimeAndLineIndex(trackTime);
SimpleLRCTimeAndLine currentLine = _LrcTimeCollection[nextLRCLineIndex];
@@ -2027,14 +2058,14 @@
}
}
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_PICK)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK)
{
for (int i = 0; i < _TAG_IN_ROUND; i++)
{
SimpleLRCTimeAndLine currentLineTime =
- _LrcTimeCollection[_tagRoundFinished*_TAG_IN_ROUND + i];
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
+ _LrcTimeCollection[_tagRoundFinished * _TAG_IN_ROUND + i];
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i,
(currentLineTime != null
? currentLineTime.TimeString
: string.Empty));
@@ -2107,9 +2138,9 @@
_SearchType = (int)SEARCH_TYPES.ONLY_LYRICS;
_StatusText = "";
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
ShowLRCtoEdit();
}
@@ -2123,7 +2154,7 @@
_SearchType = (int)SEARCH_TYPES.ONLY_LRCS;
StartShowingLrc(_LyricText, false);
}
- // else show plain lyric
+ // else show plain lyric
else
{
_SearchType = (int)SEARCH_TYPES.ONLY_LYRICS;
@@ -2248,28 +2279,28 @@
GUIPropertyManager.OnPropertyChanged -= TimeHandler;
- if (_selectedScreen == (int) MyLyricsSettings.Screen.LYRICS)
+ if (_selectedScreen == (int)MyLyricsSettings.Screen.LYRICS)
{
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_TITLE, "Lyrics screen");
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "Lyrics screen");
GUIControl.ClearControl(GetID, CONTROL_LYRIC_SELECTED);
GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
// Reset general and lyrics controls
- GUIControl.ShowControl(GetID, (int) GUI_General_Controls.CONTROL_LBStatus);
+ GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
GUIControl.ShowControl(GetID, CONTROL_LYRIC_SELECTED);
GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_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);
- 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);
+ 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);
// Hide LRC controls
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_TAGPICKBUTTON, "");
@@ -2278,12 +2309,12 @@
for (int i = 0; i < _TAG_IN_ROUND; i++)
{
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
}
for (int i = 0; i < 5; i++)
@@ -2293,26 +2324,26 @@
}
}
- else if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC)
+ else if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC)
{
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_TITLE, "LRC screen");
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "LRC screen");
GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
// Lyrics controls
- GUIControl.ShowControl(GetID, (int) GUI_General_Controls.CONTROL_LBStatus);
+ GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
//GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, "");
GUIControl.HideControl(GetID, CONTROL_LYRIC_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);
- 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);
+ 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.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_TAGPICKBUTTON, "");
@@ -2322,22 +2353,22 @@
for (int i = 0; i < _TAG_IN_ROUND; i++)
{
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE + i, "");
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, "");
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, "");
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, "");
}
if (string.IsNullOrEmpty(_artist))
{
for (int i = 0; i < _TAG_IN_ROUND; i++)
{
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE + i, "");
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, "");
}
}
@@ -2349,26 +2380,26 @@
}
- else if (_selectedScreen == (int) MyLyricsSettings.Screen.LRC_EDITOR)
+ else if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
GUIPropertyManager.OnPropertyChanged += TimeHandler;
- GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_TITLE, "LRC editor");
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "LRC editor");
// Lyrics controls
- GUIControl.ShowControl(GetID, (int) GUI_General_Controls.CONTROL_LBStatus);
+ GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, "");
//GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, "");
GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
- 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);
+ 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.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_TAGPICKBUTTON, "Tag line");
@@ -2378,15 +2409,15 @@
for (int i = 0; i < _TAG_IN_ROUND; i++)
{
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_TIME + i, "");
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_TIME + i, "");
//GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i);
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + i, "");
- GUIControl.ShowControl(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + i, "");
+ GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i);
+ GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + i, "");
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
- GUIControl.HideControl(GetID, (int) GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
}
for (int i = 0; i < 5; i++)
@@ -2396,23 +2427,23 @@
}
}...
[truncated message content] |
