From: <sa...@us...> - 2010-12-04 17:50:09
|
Revision: 4005 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4005&view=rev Author: saamand Date: 2010-12-04 17:50:02 +0000 (Sat, 04 Dec 2010) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs trunk/plugins/MyLyrics/LyricsEngine/app.config trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs trunk/plugins/MyLyrics/My Lyrics/change log.txt trunk/plugins/MyLyrics/MyLyrics.sln Property Changed: ---------------- trunk/plugins/MyLyrics/LyricsEngine/ trunk/plugins/MyLyrics/My Lyrics/ Property changes on: trunk/plugins/MyLyrics/LyricsEngine ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.suo *.user thumbs.db [Bb]in obj [Dd]ebug [Rr]elease *.aps *.eto Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -15,8 +16,25 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -110,7 +128,6 @@ <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> <DependentUpon>Reference.map</DependentUpon> - <SubType>Component</SubType> </Compile> <Compile Include="LyricsSites\LyricWiki.cs" /> </ItemGroup> @@ -138,6 +155,23 @@ <LastGenOutput>Reference.cs</LastGenOutput> </None> </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> + <Visible>False</Visible> + <ProductName>Windows Installer 3.1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Resources.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.1434 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/LyricsEngine/Properties/Settings.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); Modified: trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,7 +1,7 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,477 +9,384 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.3053. +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.1. // -using System; -using System.CodeDom.Compiler; -using System.ComponentModel; -using System.Data; -using System.Diagnostics; -using System.Threading; -using System.Web.Services; -using System.Web.Services.Description; -using System.Web.Services.Protocols; -using LyricsEngine.Properties; - #pragma warning disable 1591 -namespace LyricsEngine.lrcfinder -{ +namespace LyricsEngine.lrcfinder { + using System; + using System.Web.Services; + using System.Diagnostics; + using System.Web.Services.Protocols; + using System.ComponentModel; + using System.Xml.Serialization; + using System.Data; + + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] - [DebuggerStepThrough()] - [DesignerCategory("code")] - [WebServiceBinding(Name = "LrcFinderSoap", Namespace = "http://tempuri.org/")] - public partial class LrcFinder : SoapHttpClientProtocol - { - private SendOrPostCallback FindLRCOperationCompleted; - - private SendOrPostCallback FindLRCsOperationCompleted; - private SendOrPostCallback NewDomainOperationCompleted; - - private SendOrPostCallback SaveLRCOperationCompleted; - - private SendOrPostCallback SaveLRCWithGuidOperationCompleted; - + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="LrcFinderSoap", Namespace="http://tempuri.org/")] + public partial class LrcFinder : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback FindLRCOperationCompleted; + + private System.Threading.SendOrPostCallback FindLRCsOperationCompleted; + + private System.Threading.SendOrPostCallback SaveLRCOperationCompleted; + + private System.Threading.SendOrPostCallback SaveLRCWithGuidOperationCompleted; + + private System.Threading.SendOrPostCallback NewDomainOperationCompleted; + private bool useDefaultCredentialsSetExplicitly; - + /// <remarks/> - public LrcFinder() - { - Url = Settings.Default.LyricsEngine_lrcfinder_LrcFinder; - if ((IsLocalFileSystemWebService(Url) == true)) - { - UseDefaultCredentials = true; - useDefaultCredentialsSetExplicitly = false; + public LrcFinder() { + this.Url = global::LyricsEngine.Properties.Settings.Default.LyricsEngine_lrcfinder_LrcFinder; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; } - else - { - useDefaultCredentialsSetExplicitly = true; + else { + this.useDefaultCredentialsSetExplicitly = true; } } - - public new string Url - { - get { return base.Url; } - set - { - if ((((IsLocalFileSystemWebService(base.Url) == true) - && (useDefaultCredentialsSetExplicitly == false)) - && (IsLocalFileSystemWebService(value) == false))) - { + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { base.UseDefaultCredentials = false; } base.Url = value; } } - - public new bool UseDefaultCredentials - { - get { return base.UseDefaultCredentials; } - set - { + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { base.UseDefaultCredentials = value; - useDefaultCredentialsSetExplicitly = true; + this.useDefaultCredentialsSetExplicitly = true; } } - + /// <remarks/> public event FindLRCCompletedEventHandler FindLRCCompleted; - + /// <remarks/> public event FindLRCsCompletedEventHandler FindLRCsCompleted; - + /// <remarks/> public event SaveLRCCompletedEventHandler SaveLRCCompleted; - + /// <remarks/> public event SaveLRCWithGuidCompletedEventHandler SaveLRCWithGuidCompleted; - + /// <remarks/> public event NewDomainCompletedEventHandler NewDomainCompleted; - + /// <remarks/> - [SoapDocumentMethod("http://tempuri.org/FindLRC", RequestNamespace = "http://tempuri.org/", - ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - public string FindLRC(string artist, string title) - { - object[] results = Invoke("FindLRC", new object[] - { - artist, - title - }); - return ((string) (results[0])); + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/FindLRC", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string FindLRC(string artist, string title) { + object[] results = this.Invoke("FindLRC", new object[] { + artist, + title}); + return ((string)(results[0])); } - + /// <remarks/> - public void FindLRCAsync(string artist, string title) - { - FindLRCAsync(artist, title, null); + public void FindLRCAsync(string artist, string title) { + this.FindLRCAsync(artist, title, null); } - + /// <remarks/> - public void FindLRCAsync(string artist, string title, object userState) - { - if ((FindLRCOperationCompleted == null)) - { - FindLRCOperationCompleted = new SendOrPostCallback(OnFindLRCOperationCompleted); + public void FindLRCAsync(string artist, string title, object userState) { + if ((this.FindLRCOperationCompleted == null)) { + this.FindLRCOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFindLRCOperationCompleted); } - InvokeAsync("FindLRC", new object[] - { - artist, - title - }, FindLRCOperationCompleted, userState); + this.InvokeAsync("FindLRC", new object[] { + artist, + title}, this.FindLRCOperationCompleted, userState); } - - private void OnFindLRCOperationCompleted(object arg) - { - if ((FindLRCCompleted != null)) - { - InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg)); - FindLRCCompleted(this, - new FindLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, - invokeArgs.Cancelled, invokeArgs.UserState)); + + private void OnFindLRCOperationCompleted(object arg) { + if ((this.FindLRCCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FindLRCCompleted(this, new FindLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// <remarks/> - [SoapDocumentMethod("http://tempuri.org/FindLRCs", RequestNamespace = "http://tempuri.org/", - ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - public DataTable FindLRCs(string artist, string title) - { - object[] results = Invoke("FindLRCs", new object[] - { - artist, - title - }); - return ((DataTable) (results[0])); + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/FindLRCs", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public System.Data.DataTable FindLRCs(string artist, string title) { + object[] results = this.Invoke("FindLRCs", new object[] { + artist, + title}); + return ((System.Data.DataTable)(results[0])); } - + /// <remarks/> - public void FindLRCsAsync(string artist, string title) - { - FindLRCsAsync(artist, title, null); + public void FindLRCsAsync(string artist, string title) { + this.FindLRCsAsync(artist, title, null); } - + /// <remarks/> - public void FindLRCsAsync(string artist, string title, object userState) - { - if ((FindLRCsOperationCompleted == null)) - { - FindLRCsOperationCompleted = new SendOrPostCallback(OnFindLRCsOperationCompleted); + public void FindLRCsAsync(string artist, string title, object userState) { + if ((this.FindLRCsOperationCompleted == null)) { + this.FindLRCsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFindLRCsOperationCompleted); } - InvokeAsync("FindLRCs", new object[] - { - artist, - title - }, FindLRCsOperationCompleted, userState); + this.InvokeAsync("FindLRCs", new object[] { + artist, + title}, this.FindLRCsOperationCompleted, userState); } - - private void OnFindLRCsOperationCompleted(object arg) - { - if ((FindLRCsCompleted != null)) - { - InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg)); - FindLRCsCompleted(this, - new FindLRCsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, - invokeArgs.Cancelled, invokeArgs.UserState)); + + private void OnFindLRCsOperationCompleted(object arg) { + if ((this.FindLRCsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FindLRCsCompleted(this, new FindLRCsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// <remarks/> - [SoapDocumentMethod("http://tempuri.org/SaveLRC", RequestNamespace = "http://tempuri.org/", - ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - public string SaveLRC(string lrcFileString) - { - object[] results = Invoke("SaveLRC", new object[] - { - lrcFileString - }); - return ((string) (results[0])); + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SaveLRC", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string SaveLRC(string lrcFileString) { + object[] results = this.Invoke("SaveLRC", new object[] { + lrcFileString}); + return ((string)(results[0])); } - + /// <remarks/> - public void SaveLRCAsync(string lrcFileString) - { - SaveLRCAsync(lrcFileString, null); + public void SaveLRCAsync(string lrcFileString) { + this.SaveLRCAsync(lrcFileString, null); } - + /// <remarks/> - public void SaveLRCAsync(string lrcFileString, object userState) - { - if ((SaveLRCOperationCompleted == null)) - { - SaveLRCOperationCompleted = new SendOrPostCallback(OnSaveLRCOperationCompleted); + public void SaveLRCAsync(string lrcFileString, object userState) { + if ((this.SaveLRCOperationCompleted == null)) { + this.SaveLRCOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveLRCOperationCompleted); } - InvokeAsync("SaveLRC", new object[] - { - lrcFileString - }, SaveLRCOperationCompleted, userState); + this.InvokeAsync("SaveLRC", new object[] { + lrcFileString}, this.SaveLRCOperationCompleted, userState); } - - private void OnSaveLRCOperationCompleted(object arg) - { - if ((SaveLRCCompleted != null)) - { - InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg)); - SaveLRCCompleted(this, - new SaveLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, - invokeArgs.Cancelled, invokeArgs.UserState)); + + private void OnSaveLRCOperationCompleted(object arg) { + if ((this.SaveLRCCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SaveLRCCompleted(this, new SaveLRCCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// <remarks/> - [SoapDocumentMethod("http://tempuri.org/SaveLRCWithGuid", RequestNamespace = "http://tempuri.org/", - ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - public string SaveLRCWithGuid(string lrcFileString, Guid guid) - { - object[] results = Invoke("SaveLRCWithGuid", new object[] - { - lrcFileString, - guid - }); - return ((string) (results[0])); + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SaveLRCWithGuid", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string SaveLRCWithGuid(string lrcFileString, System.Guid guid) { + object[] results = this.Invoke("SaveLRCWithGuid", new object[] { + lrcFileString, + guid}); + return ((string)(results[0])); } - + /// <remarks/> - public void SaveLRCWithGuidAsync(string lrcFileString, Guid guid) - { - SaveLRCWithGuidAsync(lrcFileString, guid, null); + public void SaveLRCWithGuidAsync(string lrcFileString, System.Guid guid) { + this.SaveLRCWithGuidAsync(lrcFileString, guid, null); } - + /// <remarks/> - public void SaveLRCWithGuidAsync(string lrcFileString, Guid guid, object userState) - { - if ((SaveLRCWithGuidOperationCompleted == null)) - { - SaveLRCWithGuidOperationCompleted = new SendOrPostCallback(OnSaveLRCWithGuidOperationCompleted); + public void SaveLRCWithGuidAsync(string lrcFileString, System.Guid guid, object userState) { + if ((this.SaveLRCWithGuidOperationCompleted == null)) { + this.SaveLRCWithGuidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveLRCWithGuidOperationCompleted); } - InvokeAsync("SaveLRCWithGuid", new object[] - { - lrcFileString, - guid - }, SaveLRCWithGuidOperationCompleted, userState); + this.InvokeAsync("SaveLRCWithGuid", new object[] { + lrcFileString, + guid}, this.SaveLRCWithGuidOperationCompleted, userState); } - - private void OnSaveLRCWithGuidOperationCompleted(object arg) - { - if ((SaveLRCWithGuidCompleted != null)) - { - InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg)); - SaveLRCWithGuidCompleted(this, - new SaveLRCWithGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, - invokeArgs.Cancelled, - invokeArgs.UserState)); + + private void OnSaveLRCWithGuidOperationCompleted(object arg) { + if ((this.SaveLRCWithGuidCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SaveLRCWithGuidCompleted(this, new SaveLRCWithGuidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// <remarks/> - [SoapDocumentMethod("http://tempuri.org/NewDomain", RequestNamespace = "http://tempuri.org/", - ResponseNamespace = "http://tempuri.org/", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - public string[] NewDomain() - { - object[] results = Invoke("NewDomain", new object[0]); - return ((string[]) (results[0])); + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/NewDomain", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string[] NewDomain() { + object[] results = this.Invoke("NewDomain", new object[0]); + return ((string[])(results[0])); } - + /// <remarks/> - public void NewDomainAsync() - { - NewDomainAsync(null); + public void NewDomainAsync() { + this.NewDomainAsync(null); } - + /// <remarks/> - public void NewDomainAsync(object userState) - { - if ((NewDomainOperationCompleted == null)) - { - NewDomainOperationCompleted = new SendOrPostCallback(OnNewDomainOperationCompleted); + public void NewDomainAsync(object userState) { + if ((this.NewDomainOperationCompleted == null)) { + this.NewDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNewDomainOperationCompleted); } - InvokeAsync("NewDomain", new object[0], NewDomainOperationCompleted, userState); + this.InvokeAsync("NewDomain", new object[0], this.NewDomainOperationCompleted, userState); } - - private void OnNewDomainOperationCompleted(object arg) - { - if ((NewDomainCompleted != null)) - { - InvokeCompletedEventArgs invokeArgs = ((InvokeCompletedEventArgs) (arg)); - NewDomainCompleted(this, - new NewDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, - invokeArgs.Cancelled, invokeArgs.UserState)); + + private void OnNewDomainOperationCompleted(object arg) { + if ((this.NewDomainCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.NewDomainCompleted(this, new NewDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } - + /// <remarks/> - public new void CancelAsync(object userState) - { + public new void CancelAsync(object userState) { base.CancelAsync(userState); } - - private bool IsLocalFileSystemWebService(string url) - { - if (((url == null) - || (url == string.Empty))) - { + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { return false; } - Uri wsUri = new Uri(url); - if (((wsUri.Port >= 1024) - && (string.Compare(wsUri.Host, "localHost", StringComparison.OrdinalIgnoreCase) == 0))) - { + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { return true; } return false; } } - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] public delegate void FindLRCCompletedEventHandler(object sender, FindLRCCompletedEventArgs e); - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] - [DebuggerStepThrough()] - [DesignerCategory("code")] - public partial class FindLRCCompletedEventArgs : AsyncCompletedEventArgs - { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FindLRCCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + private object[] results; - - internal FindLRCCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) : - base(exception, cancelled, userState) - { + + internal FindLRCCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { this.results = results; } - + /// <remarks/> - public string Result - { - get - { - RaiseExceptionIfNecessary(); - return ((string) (results[0])); + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); } } } - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] public delegate void FindLRCsCompletedEventHandler(object sender, FindLRCsCompletedEventArgs e); - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] - [DebuggerStepThrough()] - [DesignerCategory("code")] - public partial class FindLRCsCompletedEventArgs : AsyncCompletedEventArgs - { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FindLRCsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + private object[] results; - - internal FindLRCsCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) : - base(exception, cancelled, userState) - { + + internal FindLRCsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { this.results = results; } - + /// <remarks/> - public DataTable Result - { - get - { - RaiseExceptionIfNecessary(); - return ((DataTable) (results[0])); + public System.Data.DataTable Result { + get { + this.RaiseExceptionIfNecessary(); + return ((System.Data.DataTable)(this.results[0])); } } } - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] public delegate void SaveLRCCompletedEventHandler(object sender, SaveLRCCompletedEventArgs e); - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] - [DebuggerStepThrough()] - [DesignerCategory("code")] - public partial class SaveLRCCompletedEventArgs : AsyncCompletedEventArgs - { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveLRCCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + private object[] results; - - internal SaveLRCCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) : - base(exception, cancelled, userState) - { + + internal SaveLRCCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { this.results = results; } - + /// <remarks/> - public string Result - { - get - { - RaiseExceptionIfNecessary(); - return ((string) (results[0])); + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); } } } - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] public delegate void SaveLRCWithGuidCompletedEventHandler(object sender, SaveLRCWithGuidCompletedEventArgs e); - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] - [DebuggerStepThrough()] - [DesignerCategory("code")] - public partial class SaveLRCWithGuidCompletedEventArgs : AsyncCompletedEventArgs - { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveLRCWithGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + private object[] results; - - internal SaveLRCWithGuidCompletedEventArgs(object[] results, Exception exception, bool cancelled, - object userState) : - base(exception, cancelled, userState) - { + + internal SaveLRCWithGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { this.results = results; } - + /// <remarks/> - public string Result - { - get - { - RaiseExceptionIfNecessary(); - return ((string) (results[0])); + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); } } } - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] public delegate void NewDomainCompletedEventHandler(object sender, NewDomainCompletedEventArgs e); - + /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.3053")] - [DebuggerStepThrough()] - [DesignerCategory("code")] - public partial class NewDomainCompletedEventArgs : AsyncCompletedEventArgs - { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class NewDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + private object[] results; - - internal NewDomainCompletedEventArgs(object[] results, Exception exception, bool cancelled, object userState) : - base(exception, cancelled, userState) - { + + internal NewDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { this.results = results; } - + /// <remarks/> - public string[] Result - { - get - { - RaiseExceptionIfNecessary(); - return ((string[]) (results[0])); + public string[] Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string[])(this.results[0])); } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/app.config =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/app.config 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/LyricsEngine/app.config 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0"?> <configuration> <configSections> - <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > - <section name="LyricsEngine.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <section name="LyricsEngine.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> </sectionGroup> </configSections> <applicationSettings> @@ -18,4 +18,4 @@ </setting> </LyricsEngine.Properties.Settings> </applicationSettings> -</configuration> \ No newline at end of file +<startup><supportedRuntime version="v2.0.50727"/></startup></configuration> Property changes on: trunk/plugins/MyLyrics/My Lyrics ___________________________________________________________________ Modified: svn:ignore - *.suo *.user thumbs.db + *.suo *.user thumbs.db [Bb]in obj [Dd]ebug [Rr]elease *.aps *.eto Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -80,7 +80,7 @@ this.lbInfo1.Name = "lbInfo1"; this.lbInfo1.Size = new System.Drawing.Size(197, 18); this.lbInfo1.TabIndex = 3; - this.lbInfo1.Text = "MyLyrics plugin, version 1.5.2.0"; + this.lbInfo1.Text = "MyLyrics plugin, version 1.5.5.0"; // // label2 // Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -234,7 +234,7 @@ rdTrackBar_CheckedChanged(null, null); tbLimit.Text = xmlreader.GetValueAsString("myLyrics", "limit", m_TotalTitles.ToString()); - tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics"); + tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "Lyrics"); m_enableLogging = xmlreader.GetValue("myLyrics", "loggingEnabled").Equals("True"); cbEnableLogging.Checked = m_enableLogging; @@ -251,7 +251,7 @@ cbMusicTagAlwaysCheck.Checked = m_automaticReadFromToMusicTag; cbUseAutoScrollAsDefault.Checked = xmlreader.GetValue("myLyrics", "useAutoscroll").Equals("yes"); - tbLrcTaggingOffset.Text = xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "0"); + tbLrcTaggingOffset.Text = xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "500"); tbLrcTaggingName.Text = xmlreader.GetValueAsString("myLyrics", "LrcTaggingName", ""); m_guidString = ((string) xmlreader.GetValueAsString("myLyrics", "Guid", "")); @@ -1183,6 +1183,14 @@ cbLyrDB.Checked = false; cbLyricsPluginSite.Checked = false; + cbLyricsOnDemand.Enabled = false; + cbLyrics007.Enabled = false; + cbLrcFinder.Enabled = false; + cbLyricsPluginSite.Enabled = false; + cbHotLyrics.Enabled = false; + cbActionext.Enabled = false; + cbLyrDB.Enabled = false; + cbMusicTagAlwaysCheck.Checked = false; cbMusicTagWrite.Checked = true; @@ -1230,7 +1238,9 @@ xmlwriter.SetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", cbMoveSongFrom.Checked); xmlwriter.SetValueAsBool("myLyrics", "automaticWriteToMusicTag", cbMusicTagWrite.Checked); xmlwriter.SetValueAsBool("myLyrics", "automaticReadFromMusicTag", cbMusicTagAlwaysCheck.Checked); + xmlwriter.SetValue("myLyrics", "LrcTaggingOffset", tbLrcTaggingOffset.Text); + string text = comboBoxLanguages.SelectedItem as string; if (!string.IsNullOrEmpty(text)) { Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -704,7 +704,11 @@ (xmlreader.GetValueAsString("myLyrics", "useAutoOnLyricLength", "False")).Equals("yes") ? true : false; - _LrcTaggingOffset = (xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "0")); + _LrcTaggingOffset = (xmlreader.GetValueAsString("myLyrics", "LrcTaggingOffset", "´500")); + + string strButtonText = (xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics")); + GUIPropertyManager.SetProperty("#currentmodule", strButtonText); + _LrcTaggingName = (xmlreader.GetValueAsString("myLyrics", "LrcTaggingName", "")); _uploadLrcToLrcFinder = @@ -919,11 +923,11 @@ return base.OnMessage(message); } - public override void OnAction(Action action) + public override void OnAction(MediaPortal.GUI.Library.Action action) { if (!enableMouseControl()) { - if (action.wID == Action.ActionType.ACTION_MOUSE_MOVE) + if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOUSE_MOVE) { return; } @@ -933,21 +937,21 @@ switch (action.wID) { - case Action.ActionType.ACTION_PREVIOUS_MENU: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREVIOUS_MENU: { //_OkToCallPreviousMenu = true; //GUIWindowManager.ShowPreviousWindow(); //return; break; } - case Action.ActionType.ACTION_MOVE_LEFT: - case Action.ActionType.ACTION_MOVE_RIGHT: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT: { if (_selectedScreen == (int)MyLyricsSettings.Screen.LRC_PICK) { - if (action.wID == Action.ActionType.ACTION_MOVE_LEFT) + if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT) _selectedinLRCPicker--; - if (action.wID == Action.ActionType.ACTION_MOVE_RIGHT) + if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT) _selectedinLRCPicker++; if (_selectedinLRCPicker < 0) @@ -965,7 +969,7 @@ } break; } - case Action.ActionType.ACTION_SELECT_ITEM: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM: { if (!isFocusedBlacklisted()) { @@ -976,7 +980,7 @@ } break; } - case Action.ActionType.ACTION_KEY_PRESSED: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED: { if (/*action.m_key.KeyChar.Equals(13) || */action.m_key.KeyChar.Equals(35) || action.m_key.KeyChar.Equals(41)) // 'Enter' or '#' or ')' { @@ -1162,19 +1166,19 @@ } break; } - case Action.ActionType.ACTION_REWIND: - case Action.ActionType.ACTION_FORWARD: - case Action.ActionType.ACTION_MUSIC_FORWARD: - case Action.ActionType.ACTION_MUSIC_PLAY: - case Action.ActionType.ACTION_MUSIC_REWIND: - case Action.ActionType.ACTION_PAUSE: - case Action.ActionType.ACTION_PLAY: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_REWIND: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_FORWARD: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_FORWARD: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_PLAY: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_REWIND: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAUSE: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_PLAY: { break; } - case Action.ActionType.ACTION_EXIT: - case Action.ActionType.ACTION_END: - case Action.ActionType.ACTION_SHUTDOWN: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_EXIT: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_END: + case MediaPortal.GUI.Library.Action.ActionType.ACTION_SHUTDOWN: { break; } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -17,7 +18,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <PublishUrl>publish\</PublishUrl> <Install>true</Install> <InstallFrom>Disk</InstallFrom> @@ -30,9 +33,9 @@ <MapFileExtensions>true</MapFileExtensions> <ApplicationRevision>0</ApplicationRevision> <ApplicationVersion>1.0.0.%2a</ApplicationVersion> - <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -214,6 +217,11 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> <Visible>False</Visible> <ProductName>.NET Framework 2.0 %28x86%29</ProductName> @@ -229,6 +237,11 @@ <ProductName>.NET Framework 3.5</ProductName> <Install>false</Install> </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>false</Install> + </BootstrapperPackage> </ItemGroup> <ItemGroup> <Content Include="change log.txt" /> Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/My Lyrics/Properties/Resources.Designer.cs 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.1434 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,4 +1,4 @@ -Release notes to MyLyrics 1.5.3.0 +Release notes to MyLyrics 1.5.5.0 MyLyrics displays the lyric of the currently played song inside MediaPortal. The plugin can show LRC's and plain lyrics. It uses both musictags and online searches to find lyrics. @@ -33,10 +33,7 @@ Compatible with MediaPortal 1.1.0 nad 1.1.1 -Changes and fixes since version 1.5.2.0 -- Fix: LyricsPluginSite changed once again and an invalid result was returned when no lyric was found. - -Changes and fixes since version 1.5.1.0 -- Fix: LyricsPluginSite fixed and reenabled (big thanks to yoavain). -- Fix: Lyrics007 which didn't return valid result. -- Rem: LyricWiki didn't work and could not be fixed. +Changes and fixes since version 1.5.3.0 +- Add: Gui property #currentmodule returns user defined plugin name +- Fix: LRC tagging offset value wasn't saved in version 1.5.2.0 +- Fix: Minor fixes in configuration \ No newline at end of file Modified: trunk/plugins/MyLyrics/MyLyrics.sln =================================================================== --- trunk/plugins/MyLyrics/MyLyrics.sln 2010-12-04 09:34:26 UTC (rev 4004) +++ trunk/plugins/MyLyrics/MyLyrics.sln 2010-12-04 17:50:02 UTC (rev 4005) @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LyricsEngine", "LyricsEngine\LyricsEngine.csproj", "{B0760CE8-086F-4301-9091-C9BE54F261FD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLyrics", "My Lyrics\MyLyrics.csproj", "{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |