From: <sa...@us...> - 2009-05-28 13:10:34
|
Revision: 2872 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2872&view=rev Author: saamand Date: 2009-05-28 13:10:24 +0000 (Thu, 28 May 2009) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs Added Paths: ----------- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.disco trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.wsdl trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.map Added: trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.disco =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.disco (rev 0) +++ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.disco 2009-05-28 13:10:24 UTC (rev 2872) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/"> + <contractRef ref="http://lrcfinder.profiler.nl/LrcFinder.asmx?wsdl" docRef="http://lrcfinder.profiler.nl/LrcFinder.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> + <soap address="http://lrcfinder.profiler.nl/LrcFinder.asmx" xmlns:q1="http://tempuri.org/" binding="q1:LrcFinderSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> + <soap address="http://lrcfinder.profiler.nl/LrcFinder.asmx" xmlns:q2="http://tempuri.org/" binding="q2:LrcFinderSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> +</discovery> \ No newline at end of file Added: trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.wsdl =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.wsdl (rev 0) +++ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/LrcFinder.wsdl 2009-05-28 13:10:24 UTC (rev 2872) @@ -0,0 +1,252 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s1="http://microsoft.com/wsdl/types/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <wsdl:types> + <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/"> + <s:import namespace="http://microsoft.com/wsdl/types/" /> + <s:element name="FindLRC"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="artist" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="title" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="FindLRCResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="FindLRCResult" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="FindLRCs"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="artist" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="title" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="FindLRCsResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="FindLRCsResult"> + <s:complexType> + <s:sequence> + <s:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" /> + <s:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" /> + </s:sequence> + </s:complexType> + </s:element> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="SaveLRC"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="lrcFileString" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="SaveLRCResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="SaveLRCResult" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="SaveLRCWithGuid"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="lrcFileString" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="guid" type="s1:guid" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="SaveLRCWithGuidResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="SaveLRCWithGuidResult" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="NewDomain"> + <s:complexType /> + </s:element> + <s:element name="NewDomainResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="NewDomainResult" type="tns:ArrayOfString" /> + </s:sequence> + </s:complexType> + </s:element> + <s:complexType name="ArrayOfString"> + <s:sequence> + <s:element minOccurs="0" maxOccurs="unbounded" name="string" nillable="true" type="s:string" /> + </s:sequence> + </s:complexType> + </s:schema> + <s:schema elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/"> + <s:simpleType name="guid"> + <s:restriction base="s:string"> + <s:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" /> + </s:restriction> + </s:simpleType> + </s:schema> + </wsdl:types> + <wsdl:message name="FindLRCSoapIn"> + <wsdl:part name="parameters" element="tns:FindLRC" /> + </wsdl:message> + <wsdl:message name="FindLRCSoapOut"> + <wsdl:part name="parameters" element="tns:FindLRCResponse" /> + </wsdl:message> + <wsdl:message name="FindLRCsSoapIn"> + <wsdl:part name="parameters" element="tns:FindLRCs" /> + </wsdl:message> + <wsdl:message name="FindLRCsSoapOut"> + <wsdl:part name="parameters" element="tns:FindLRCsResponse" /> + </wsdl:message> + <wsdl:message name="SaveLRCSoapIn"> + <wsdl:part name="parameters" element="tns:SaveLRC" /> + </wsdl:message> + <wsdl:message name="SaveLRCSoapOut"> + <wsdl:part name="parameters" element="tns:SaveLRCResponse" /> + </wsdl:message> + <wsdl:message name="SaveLRCWithGuidSoapIn"> + <wsdl:part name="parameters" element="tns:SaveLRCWithGuid" /> + </wsdl:message> + <wsdl:message name="SaveLRCWithGuidSoapOut"> + <wsdl:part name="parameters" element="tns:SaveLRCWithGuidResponse" /> + </wsdl:message> + <wsdl:message name="NewDomainSoapIn"> + <wsdl:part name="parameters" element="tns:NewDomain" /> + </wsdl:message> + <wsdl:message name="NewDomainSoapOut"> + <wsdl:part name="parameters" element="tns:NewDomainResponse" /> + </wsdl:message> + <wsdl:portType name="LrcFinderSoap"> + <wsdl:operation name="FindLRC"> + <wsdl:input message="tns:FindLRCSoapIn" /> + <wsdl:output message="tns:FindLRCSoapOut" /> + </wsdl:operation> + <wsdl:operation name="FindLRCs"> + <wsdl:input message="tns:FindLRCsSoapIn" /> + <wsdl:output message="tns:FindLRCsSoapOut" /> + </wsdl:operation> + <wsdl:operation name="SaveLRC"> + <wsdl:input message="tns:SaveLRCSoapIn" /> + <wsdl:output message="tns:SaveLRCSoapOut" /> + </wsdl:operation> + <wsdl:operation name="SaveLRCWithGuid"> + <wsdl:input message="tns:SaveLRCWithGuidSoapIn" /> + <wsdl:output message="tns:SaveLRCWithGuidSoapOut" /> + </wsdl:operation> + <wsdl:operation name="NewDomain"> + <wsdl:input message="tns:NewDomainSoapIn" /> + <wsdl:output message="tns:NewDomainSoapOut" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="LrcFinderSoap" type="tns:LrcFinderSoap"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="FindLRC"> + <soap:operation soapAction="http://tempuri.org/FindLRC" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="FindLRCs"> + <soap:operation soapAction="http://tempuri.org/FindLRCs" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="SaveLRC"> + <soap:operation soapAction="http://tempuri.org/SaveLRC" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="SaveLRCWithGuid"> + <soap:operation soapAction="http://tempuri.org/SaveLRCWithGuid" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="NewDomain"> + <soap:operation soapAction="http://tempuri.org/NewDomain" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="LrcFinderSoap12" type="tns:LrcFinderSoap"> + <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="FindLRC"> + <soap12:operation soapAction="http://tempuri.org/FindLRC" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="FindLRCs"> + <soap12:operation soapAction="http://tempuri.org/FindLRCs" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="SaveLRC"> + <soap12:operation soapAction="http://tempuri.org/SaveLRC" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="SaveLRCWithGuid"> + <soap12:operation soapAction="http://tempuri.org/SaveLRCWithGuid" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="NewDomain"> + <soap12:operation soapAction="http://tempuri.org/NewDomain" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="LrcFinder"> + <wsdl:port name="LrcFinderSoap" binding="tns:LrcFinderSoap"> + <soap:address location="http://lrcfinder.profiler.nl/LrcFinder.asmx" /> + </wsdl:port> + <wsdl:port name="LrcFinderSoap12" binding="tns:LrcFinderSoap12"> + <soap12:address location="http://lrcfinder.profiler.nl/LrcFinder.asmx" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs (rev 0) +++ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.cs 2009-05-28 13:10:24 UTC (rev 2872) @@ -0,0 +1,395 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:2.0.50727.3053 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +// +// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.3053. +// +#pragma warning disable 1591 + +namespace LyricsEngine.lrcfinder { + using System.Diagnostics; + using System.Web.Services; + using System.ComponentModel; + using System.Web.Services.Protocols; + using System; + using System.Xml.Serialization; + using System.Data; + + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + [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() { + this.Url = global::LyricsEngine.Properties.Settings.Default.LyricsEngine_lrcfinder_LrcFinder; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } + } + + 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 { + base.UseDefaultCredentials = value; + 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/> + [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) { + this.FindLRCAsync(artist, title, null); + } + + /// <remarks/> + public void FindLRCAsync(string artist, string title, object userState) { + if ((this.FindLRCOperationCompleted == null)) { + this.FindLRCOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFindLRCOperationCompleted); + } + this.InvokeAsync("FindLRC", new object[] { + artist, + title}, this.FindLRCOperationCompleted, 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/> + [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) { + this.FindLRCsAsync(artist, title, null); + } + + /// <remarks/> + public void FindLRCsAsync(string artist, string title, object userState) { + if ((this.FindLRCsOperationCompleted == null)) { + this.FindLRCsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFindLRCsOperationCompleted); + } + this.InvokeAsync("FindLRCs", new object[] { + artist, + title}, this.FindLRCsOperationCompleted, 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/> + [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) { + this.SaveLRCAsync(lrcFileString, null); + } + + /// <remarks/> + public void SaveLRCAsync(string lrcFileString, object userState) { + if ((this.SaveLRCOperationCompleted == null)) { + this.SaveLRCOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveLRCOperationCompleted); + } + this.InvokeAsync("SaveLRC", new object[] { + lrcFileString}, this.SaveLRCOperationCompleted, 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/> + [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, System.Guid guid) { + this.SaveLRCWithGuidAsync(lrcFileString, guid, null); + } + + /// <remarks/> + public void SaveLRCWithGuidAsync(string lrcFileString, System.Guid guid, object userState) { + if ((this.SaveLRCWithGuidOperationCompleted == null)) { + this.SaveLRCWithGuidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveLRCWithGuidOperationCompleted); + } + this.InvokeAsync("SaveLRCWithGuid", new object[] { + lrcFileString, + guid}, this.SaveLRCWithGuidOperationCompleted, 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/> + [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() { + this.NewDomainAsync(null); + } + + /// <remarks/> + public void NewDomainAsync(object userState) { + if ((this.NewDomainOperationCompleted == null)) { + this.NewDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNewDomainOperationCompleted); + } + this.InvokeAsync("NewDomain", new object[0], this.NewDomainOperationCompleted, 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) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + 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/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + public delegate void FindLRCCompletedEventHandler(object sender, FindLRCCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FindLRCCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FindLRCCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + public delegate void FindLRCsCompletedEventHandler(object sender, FindLRCsCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FindLRCsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FindLRCsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public System.Data.DataTable Result { + get { + this.RaiseExceptionIfNecessary(); + return ((System.Data.DataTable)(this.results[0])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + public delegate void SaveLRCCompletedEventHandler(object sender, SaveLRCCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveLRCCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SaveLRCCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + public delegate void SaveLRCWithGuidCompletedEventHandler(object sender, SaveLRCWithGuidCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveLRCWithGuidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SaveLRCWithGuidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + public delegate void NewDomainCompletedEventHandler(object sender, NewDomainCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class NewDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal NewDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public string[] Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string[])(this.results[0])); + } + } + } +} + +#pragma warning restore 1591 \ No newline at end of file Added: trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.map =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.map (rev 0) +++ trunk/plugins/MyLyrics/LyricsEngine/Web References/lrcfinder/Reference.map 2009-05-28 13:10:24 UTC (rev 2872) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Results> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://lrcfinder.profiler.nl/LrcFinder.asmx?disco" filename="LrcFinder.disco" /> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://lrcfinder.profiler.nl/LrcFinder.asmx?wsdl" filename="LrcFinder.wsdl" /> + </Results> +</DiscoveryClientResultsFile> \ No newline at end of file Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-05-28 04:26:06 UTC (rev 2871) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-05-28 13:10:24 UTC (rev 2872) @@ -350,7 +350,7 @@ this.btCancel.Name = "btCancel"; this.btCancel.Size = new System.Drawing.Size(78, 23); this.btCancel.TabIndex = 33; - this.btCancel.Text = "Cancel"; + this.btCancel.Text = "Stop"; this.btCancel.UseVisualStyleBackColor = true; this.btCancel.Click += new System.EventHandler(this.btCancel_Click); // @@ -362,7 +362,7 @@ this.mpLabel3.Size = new System.Drawing.Size(304, 26); this.mpLabel3.TabIndex = 12; this.mpLabel3.Text = "Press \'Start\' to fetch lyrics matching content of music database.\r\nPress \'Stop\' t" + - "o stop a running batch search."; + "o end a running batch search."; // // gbMessages // Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-05-28 04:26:06 UTC (rev 2871) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-05-28 13:10:24 UTC (rev 2872) @@ -154,82 +154,32 @@ GetSettingsFromConfigurationXml(); #region Serialzie/deserialize lyricsdatabases - string lyricsXMLpath = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Base, MyLyricsSettings.LyricsXMLName); - FileInfo lyricsXMLfileInfo = new FileInfo(lyricsXMLpath); + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); + FileInfo fileInfo = new FileInfo(path); - // If lyrics.xml present, then convert database to new format... - if (lyricsXMLfileInfo.Exists) + // .. but only if the databases hasn't been created + if (fileInfo.Exists == false) { + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); - string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, MyLyricsSettings.LyricsDBName); - FileInfo fileInfo = new FileInfo(path); + // Serialize empty LyricsDatabase if no lyrics.xml present + FileStream fs = new FileStream(path, FileMode.Create); + BinaryFormatter bf = new BinaryFormatter(); + MyLyricsSettings.LyricsDB = new LyricsDatabase(); + bf.Serialize(fs, MyLyricsSettings.LyricsDB); + fs.Close(); - // .. but only if it hasn't already been converted - if (fileInfo.Exists == false) - { - if (MessageBox.Show(this, "Your database will have to be upgraded to work with this version\r\nUpgrade now?", "Upgrade lyricsdatabase", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) - { - ConvertFromXMLtoLyricsDatabase convertFromXMLtoLyricsDatabase = new ConvertFromXMLtoLyricsDatabase(); - MyLyricsSettings.LyricsDB = convertFromXMLtoLyricsDatabase.Convert(lyricsXMLpath); - - // Create file to save the database to - FileStream fs = new FileStream(path, FileMode.Create); - - // Create a BinaryFormatter object to perform the serialization - BinaryFormatter bf = new BinaryFormatter(); - - // Use the BinaryFormatter object to serialize the database to the file - bf.Serialize(fs, MyLyricsSettings.LyricsDB); - fs.Close(); - - // Create likewise a database for the remainingLyrics - 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); - - // Close the file - fs.Close(); - } - } - - // ... else deserialize the databases and save reference in LyricsDB and LyricsMarkedDB - else - { - DeserializeBothDB(); - } + // Serialize empty LyricsMarkedDatabase + 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); + fs.Close(); } - - // If no Lyrics.xml present in base, then create new serialized databases else { - 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.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); - BinaryFormatter bf = new BinaryFormatter(); - MyLyricsSettings.LyricsDB = new LyricsDatabase(); - bf.Serialize(fs, MyLyricsSettings.LyricsDB); - fs.Close(); - - // Serialize empty LyricsMarkedDatabase - 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); - fs.Close(); - } - else - { - DeserializeBothDB(); - } + DeserializeBothDB(); } LyricsLibrary.CurrentDB = MyLyricsSettings.LyricsDB; @@ -939,14 +889,14 @@ if (lc != null) { - lc.FinishThread(m_artist, m_track, "The search has been cancelled by the user.", "none"); + lc.FinishThread(m_artist, m_track, "The search has been stopped by the user.", "none"); lc.Dispose(); lc = null; } else { m_EventStopThread.Set(); - ThreadFinishedMethod(m_artist, m_track, "The search has been cancelled by the user.", "none"); + ThreadFinishedMethod(m_artist, m_track, "The search has been stopped by the user.", "none"); } bgWorkerSearch.CancelAsync(); Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-05-28 04:26:06 UTC (rev 2871) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-05-28 13:10:24 UTC (rev 2872) @@ -123,12 +123,6 @@ <metadata name="Replace.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="Find.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="Replace.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="bgWorkerSearch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>6, 4</value> </metadata> Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2009-05-28 04:26:06 UTC (rev 2871) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2009-05-28 13:10:24 UTC (rev 2872) @@ -23,7 +23,6 @@ internal static LyricsDatabase LyricsMarkedDB = null; internal static string LyricsDBName = "LyricsDatabaseV2.db"; internal static string LyricsMarkedDBName = "LyricsMarkedDatabaseV2.db"; - internal static string LyricsXMLName = "Lyrics.xml"; // log information internal static string LogName = "MyLyrics.log"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |