diff --git a/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.sdf b/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.sdf index 2a62309..03538d3 100644 Binary files a/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.sdf and b/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.sdf differ diff --git a/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.v11.suo b/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.v11.suo index 618e54d..a5ecad5 100644 Binary files a/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.v11.suo and b/Hyphen/Virtuoso.Hyphen/Virtuoso.Hyphen.v11.suo differ diff --git a/Out/Plugins/IL/Speak.il b/Out/Plugins/IL/Speak.il index f977e6e..74a778c 100644 --- a/Out/Plugins/IL/Speak.il +++ b/Out/Plugins/IL/Speak.il @@ -64,7 +64,7 @@ .custom instance void [mscorlib]System.Reflection.AssemblyCompanyAttribute::.ctor(string) = ( 01 00 00 00 00 ) .custom instance void [mscorlib]System.Reflection.AssemblyProductAttribute::.ctor(string) = ( 01 00 05 53 70 65 61 6B 00 00 ) // ...Speak.. .custom instance void [mscorlib]System.Reflection.AssemblyDescriptionAttribute::.ctor(string) = ( 01 00 00 00 00 ) - .custom instance void [mscorlib]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 31 2E 30 2E 30 2E 30 00 00 ) // ...1.0.0.0.. + .custom instance void [mscorlib]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 31 2E 30 2E 31 2E 31 00 00 ) // ...1.0.1.1.. .custom instance void [mscorlib]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 05 53 70 65 61 6B 00 00 ) // ...Speak.. .custom instance void [mscorlib]System.Reflection.AssemblyTrademarkAttribute::.ctor(string) = ( 01 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.InteropServices.ComVisibleAttribute::.ctor(bool) = ( 01 00 00 00 00 ) @@ -83,7 +83,7 @@ .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows. .hash algorithm 0x00008004 - .ver 1:0:0:0 + .ver 1:0:1:1 } .mresource public Speak.Properties.Resources.resources { @@ -96,13 +96,13 @@ // WARNUNG: Die verwaltete Ressourcendatei "Speak.UI.PreviewForm.resources" wurde erstellt. } .module Speak.master.dll -// MVID: {751FC4A5-9566-42A3-81E1-DB9A97B9709E} +// MVID: {A6F86CF9-E663-41A8-BD56-D46ABB543032} .imagebase 0x10000000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000003 // ILONLY 32BITREQUIRED -// Image base: 0x00000000003A0000 +// Image base: 0x00000000008D0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -1230,7 +1230,7 @@ .line 53,53 : 13,123 '' IL_000e: ldloca.s hIcon IL_0010: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0015: ldsfld string Speak.Structs.API::MS_SKIN2_GETICON + IL_0015: ldstr "Skin2/Icons/GetIcon" IL_001a: ldsfld native uint [mscorlib]System.UIntPtr::Zero IL_001f: ldloca.s str IL_0021: call instance native int [Hyphen]Virtuoso.Miranda.Plugins.Native.UnmanagedStringHandle::get_IntPtr() @@ -1306,7 +1306,7 @@ .line 71,71 : 13,115 '' IL_00c9: ldarg.1 IL_00ca: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_00cf: ldsfld string Speak.Structs.API::MS_SKIN2_ADDICON + IL_00cf: ldstr "Skin2/Icons/AddIcon" IL_00d4: ldsfld native uint [mscorlib]System.UIntPtr::Zero IL_00d9: ldloc.1 IL_00da: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -1381,7 +1381,7 @@ bool) .line 89,89 : 13,91 '' IL_007b: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0080: ldsfld string Speak.Structs.API::MS_BB_SETBUTTONSTATE + IL_0080: ldstr "TabSRMM/ButtonsBar/SetButtonState" IL_0085: ldarg.1 IL_0086: ldloc.1 IL_0087: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -1553,7 +1553,7 @@ bool) .line 125,125 : 17,93 '' IL_0107: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_010c: ldsfld string Speak.Structs.API::MS_BB_ADDBUTTON + IL_010c: ldstr "TabSRMM/ButtonsBar/AddButton" IL_0111: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0116: ldloc.s bbPtr IL_0118: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -1703,7 +1703,7 @@ IL_0094: stfld native int Speak.Structs.CSSData::hContact .line 162,162 : 21,58 '' IL_0099: ldloca.s css - IL_009b: ldsfld string Speak.Structs.API::PSS_MESSAGE + IL_009b: ldstr "/SendMsg" IL_00a0: stfld string Speak.Structs.CSSData::szProtoService .line 163,163 : 21,46 '' IL_00a5: ldloca.s css @@ -1736,7 +1736,7 @@ bool) .line 168,168 : 21,110 '' IL_00ed: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_00f2: ldsfld string Speak.Structs.API::MS_PROTO_CALLCONTACTSERVICE + IL_00f2: ldstr "Proto/CallContactService" IL_00f7: ldsfld native int [mscorlib]System.IntPtr::Zero IL_00fc: ldloc.s cmdPtr IL_00fe: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -1850,7 +1850,7 @@ bool) .line 198,198 : 17,96 '' IL_008a: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_008f: ldsfld string Speak.Structs.API::MS_BB_REMOVEBUTTON + IL_008f: ldstr "TabSRMM/ButtonsBar/RemoveButton" IL_0094: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0099: ldloc.3 IL_009a: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4061,11 +4061,11 @@ IL_0023: newobj instance void Speak.Fork.ContactManager/SettingOwner::.ctor(string) IL_0028: stsfld class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ISettingOwner Speak.Core.LogWindow::ownerHistoryPP .line 39,39 : 13,80 '' - IL_002d: ldsfld string Speak.Structs.API::MS_IEVIEW_WINDOW + IL_002d: ldstr "IEVIEW/NewWindow" IL_0032: call bool [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ServiceManager::ServiceExists(string) IL_0037: stsfld bool Speak.Core.LogWindow::isIEInstalled .line 40,40 : 13,81 '' - IL_003c: ldsfld string Speak.Structs.API::MS_HPP_EG_WINDOW + IL_003c: ldstr "History++/ExtGrid/NewWindow" IL_0041: call bool [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ServiceManager::ServiceExists(string) IL_0046: stsfld bool Speak.Core.LogWindow::isHPPInstalled .line 42,42 : 13,41 '' @@ -4515,7 +4515,7 @@ .try { IL_0019: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_001e: ldsfld string Speak.Structs.API::MS_DB_EVENT_GETBLOBSIZE + IL_001e: ldstr "DB/Event/GetBlobSize" IL_0023: ldarg.0 IL_0024: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0029: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4559,7 +4559,7 @@ bool) .line 42,42 : 17,96 '' IL_006d: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0072: ldsfld string Speak.Structs.API::MS_DB_EVENT_GET + IL_0072: ldstr "DB/Event/Get" IL_0077: ldarg.0 IL_0078: ldloc.0 IL_0079: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4668,7 +4668,7 @@ IL_004e: stloc.s hist .line 68,68 : 17,115 '' IL_0050: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0055: ldsfld string Speak.Structs.API::MS_DB_EVENT_GETBLOBSIZE + IL_0055: ldstr "DB/Event/GetBlobSize" IL_005a: ldloc.s hist IL_005c: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0061: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4712,7 +4712,7 @@ bool) .line 80,80 : 17,88 '' IL_00a9: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_00ae: ldsfld string Speak.Structs.API::MS_DB_EVENT_GET + IL_00ae: ldstr "DB/Event/Get" IL_00b3: ldloc.s hist IL_00b5: ldloc.0 IL_00b6: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4774,7 +4774,7 @@ bool) .line 99,99 : 17,93 '' IL_0129: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_012e: ldsfld string Speak.Structs.API::MS_DB_EVENT_ADD + IL_012e: ldstr "DB/Event/Add" IL_0133: ldarg.1 IL_0134: ldloc.0 IL_0135: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4845,7 +4845,7 @@ .maxstack 8 .line 113,113 : 13,94 '' IL_0000: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0005: ldsfld string Speak.Structs.API::MS_DB_EVENT_DELETE + IL_0005: ldstr "DB/Event/Delete" IL_000a: ldarg.0 IL_000b: ldarg.1 IL_000c: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -4930,7 +4930,7 @@ bool) .line 133,133 : 17,93 '' IL_0074: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0079: ldsfld string Speak.Structs.API::MS_DB_EVENT_ADD + IL_0079: ldstr "DB/Event/Add" IL_007e: ldarg.0 IL_007f: ldloc.0 IL_0080: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -8928,7 +8928,7 @@ .maxstack 8 .line 555,555 : 13,95 '' IL_0000: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0005: ldsfld string Speak.Structs.API::MS_PROTO_ADDTOCONTACT + IL_0005: ldstr "Proto/AddToContact" IL_000a: ldarg.1 IL_000b: ldarg.0 IL_000c: ldfld native int Speak.Fork.ContactManager::rootName @@ -8947,7 +8947,7 @@ .maxstack 8 .line 560,560 : 13,125 '' IL_0000: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0005: ldsfld string Speak.Structs.API::MS_PROTO_ISPROTOONCONTACT + IL_0005: ldstr "Proto/IsProtoOnContact" IL_000a: ldarg.1 IL_000b: ldarg.0 IL_000c: ldfld native int Speak.Fork.ContactManager::rootName @@ -9088,7 +9088,7 @@ valuetype [Hyphen]Virtuoso.Miranda.Plugins.Native.StringEncoding) .line 592,592 : 17,98 '' IL_0027: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_002c: ldsfld string Speak.Structs.API::MS_MSG_SENDMESSAGE + IL_002c: ldstr "SRMsg/SendCommand" IL_0031: ldloc.0 IL_0032: ldloca.s str IL_0034: call instance native int [Hyphen]Virtuoso.Miranda.Plugins.Native.UnmanagedStringHandle::get_IntPtr() @@ -9146,7 +9146,7 @@ IL_009e: stfld native int Speak.Structs.CSSData::hContact .line 609,609 : 21,58 '' IL_00a3: ldloca.s css - IL_00a5: ldsfld string Speak.Structs.API::PSS_MESSAGE + IL_00a5: ldstr "/SendMsg" IL_00aa: stfld string Speak.Structs.CSSData::szProtoService .line 610,610 : 21,46 '' IL_00af: ldloca.s css @@ -9179,7 +9179,7 @@ bool) .line 615,615 : 21,110 '' IL_00f5: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_00fa: ldsfld string Speak.Structs.API::MS_PROTO_CALLCONTACTSERVICE + IL_00fa: ldstr "Proto/CallContactService" IL_00ff: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0104: ldloc.3 IL_0105: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -9372,7 +9372,7 @@ IL_0008: stfld class Speak.Sites.ISite Speak.HPP.HistoryppHandler::site .line 45,45 : 13,116 '' IL_000d: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0012: ldsfld string Speak.Structs.API::MS_HPP_GETVERSION + IL_0012: ldstr "History++/GetVersion" IL_0017: ldsfld native int [mscorlib]System.IntPtr::Zero IL_001c: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0021: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -23092,55 +23092,65 @@ .class public auto ansi beforefieldinit Speak.MainClass extends [Hyphen]Virtuoso.Hyphen.Mini.StandalonePlugin { + .field public static literal string VERSION = "1.0.1.1" .field private class Speak.Opt.Options option - .field private static class [mscorlib]System.Version VERSION + .field private valuetype [mscorlib]System.DateTime status_pause + .field private class [mscorlib]System.Collections.Generic.Dictionary`2 statusmodes .field private static initonly valuetype [mscorlib]System.Guid uuid .method private hidebysig specialname rtspecialname instance void .ctor() cil managed { - // Code size 41 (0x29) + // Code size 63 (0x3f) .maxstack 8 - .line 27,27 : 9,28 'd:\\Visual Studio 2012\\Projects\\miranda\\Speak\\Speak\\MainClass.cs' + .line 31,31 : 9,54 'd:\\Visual Studio 2012\\Projects\\miranda\\Speak\\Speak\\MainClass.cs' IL_0000: ldarg.0 - IL_0001: call instance void [Hyphen]Virtuoso.Hyphen.Mini.StandalonePlugin::.ctor() - .line 29,29 : 13,41 '' - IL_0006: ldarg.0 - IL_0007: newobj instance void Speak.Opt.Options::.ctor() - IL_000c: stfld class Speak.Opt.Options Speak.MainClass::option - .line 30,30 : 13,87 '' - IL_0011: ldarg.0 - IL_0012: ldfld class Speak.Opt.Options Speak.MainClass::option - IL_0017: ldarg.0 - IL_0018: ldftn instance void Speak.MainClass::option_hasUpdated(valuetype Speak.Opt.Options/EventChanged) - IL_001e: newobj instance void Speak.Opt.Options/ChangedEventHandler::.ctor(object, + IL_0001: call valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::get_Now() + IL_0006: stfld valuetype [mscorlib]System.DateTime Speak.MainClass::status_pause + .line 32,32 : 9,99 '' + IL_000b: ldarg.0 + IL_000c: newobj instance void class [mscorlib]System.Collections.Generic.Dictionary`2::.ctor() + IL_0011: stfld class [mscorlib]System.Collections.Generic.Dictionary`2 Speak.MainClass::statusmodes + .line 34,34 : 9,28 '' + IL_0016: ldarg.0 + IL_0017: call instance void [Hyphen]Virtuoso.Hyphen.Mini.StandalonePlugin::.ctor() + .line 36,36 : 13,41 '' + IL_001c: ldarg.0 + IL_001d: newobj instance void Speak.Opt.Options::.ctor() + IL_0022: stfld class Speak.Opt.Options Speak.MainClass::option + .line 37,37 : 13,87 '' + IL_0027: ldarg.0 + IL_0028: ldfld class Speak.Opt.Options Speak.MainClass::option + IL_002d: ldarg.0 + IL_002e: ldftn instance void Speak.MainClass::option_hasUpdated(valuetype Speak.Opt.Options/EventChanged) + IL_0034: newobj instance void Speak.Opt.Options/ChangedEventHandler::.ctor(object, native int) - IL_0023: callvirt instance void Speak.Opt.Options::add_Changed(class Speak.Opt.Options/ChangedEventHandler) - .line 31,31 : 9,10 '' - IL_0028: ret + IL_0039: callvirt instance void Speak.Opt.Options::add_Changed(class Speak.Opt.Options/ChangedEventHandler) + .line 38,38 : 9,10 '' + IL_003e: ret } // end of method MainClass::.ctor .method family hidebysig virtual instance void AfterPluginInitialization() cil managed { - // Code size 108 (0x6c) + // Code size 125 (0x7d) .maxstack 3 - .line 38,38 : 13,60 '' + .line 45,45 : 13,60 '' IL_0000: ldarg.0 IL_0001: ldc.i4.0 IL_0002: call instance void Speak.MainClass::option_hasUpdated(valuetype Speak.Opt.Options/EventChanged) - .line 39,39 : 13,62 '' + .line 46,46 : 13,62 '' IL_0007: ldarg.0 IL_0008: ldc.i4.1 IL_0009: call instance void Speak.MainClass::option_hasUpdated(valuetype Speak.Opt.Options/EventChanged) - .line 40,40 : 13,60 '' + .line 47,47 : 13,60 '' IL_000e: ldarg.0 IL_000f: ldc.i4.2 IL_0010: call instance void Speak.MainClass::option_hasUpdated(valuetype Speak.Opt.Options/EventChanged) - .line 41,41 : 13,30 '' + .line 48,48 : 13,30 '' IL_0015: ldarg.0 IL_0016: call instance void Speak.MainClass::RegisterUpdate() - .line 42,42 : 13,89 '' - IL_001b: ldsfld string Speak.Structs.API::ME_OPT_INITIALISE + .line 49,49 : 13,89 '' + IL_001b: ldstr "Opt/Initialise" IL_0020: ldarg.0 IL_0021: ldfld class Speak.Opt.Options Speak.MainClass::option IL_0026: ldftn instance int32 Speak.Opt.Options::Opts(native uint, @@ -23151,8 +23161,8 @@ IL_0032: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.EventManager::CreateEventHook(string, class [Hyphen]Virtuoso.Miranda.Plugins.Callback, class [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin) - .line 43,43 : 13,80 '' - IL_0037: ldsfld string Speak.Structs.API::ME_DB_EVENT_ADDED + .line 50,50 : 13,80 '' + IL_0037: ldstr "DB/Event/Added" IL_003c: ldarg.0 IL_003d: ldftn instance int32 Speak.MainClass::Message(native uint, native int) @@ -23162,8 +23172,8 @@ IL_0049: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.EventManager::CreateEventHook(string, class [Hyphen]Virtuoso.Miranda.Plugins.Callback, class [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin) - .line 44,44 : 13,96 '' - IL_004e: ldsfld string Speak.Structs.API::ME_DB_CONTACT_SETTINGCHANGED + .line 51,51 : 13,96 '' + IL_004e: ldstr "DB/Contact/SettingChanged" IL_0053: ldarg.0 IL_0054: ldftn instance int32 Speak.MainClass::StatusChange(native uint, native int) @@ -23173,133 +23183,263 @@ IL_0060: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.EventManager::CreateEventHook(string, class [Hyphen]Virtuoso.Miranda.Plugins.Callback, class [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin) - .line 45,45 : 13,28 '' + .line 52,52 : 13,56 '' IL_0065: ldarg.0 - IL_0066: call instance void Speak.MainClass::SpeakWelcome() - .line 46,46 : 9,10 '' - IL_006b: ret + IL_0066: ldftn instance bool Speak.MainClass::StatusModeChange(object, + class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs) + IL_006c: newobj instance void class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaEventHandler`1::.ctor(object, + native int) + IL_0071: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol::add_StatusChanged(class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaEventHandler`1) + .line 53,53 : 13,28 '' + IL_0076: ldarg.0 + IL_0077: call instance void Speak.MainClass::SpeakWelcome() + .line 54,54 : 9,10 '' + IL_007c: ret } // end of method MainClass::AfterPluginInitialization + .method private hidebysig instance bool + StatusModeChange(object sender, + class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs e) cil managed + { + // Code size 222 (0xde) + .maxstack 3 + .locals init ([0] valuetype [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.StatusMode old, + [1] valuetype [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.StatusMode neu, + [2] valuetype [mscorlib]System.DateTime CS$0$0000, + [3] valuetype [mscorlib]System.DateTime CS$0$0001) + .line 58,58 : 13,49 '' + IL_0000: ldc.i4 0x9c87 + IL_0005: stloc.0 + .line 59,59 : 13,42 '' + IL_0006: ldarg.2 + IL_0007: callvirt instance valuetype [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.StatusMode [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs::get_NewStatus() + IL_000c: stloc.1 + .line 60,60 : 13,58 '' + IL_000d: ldarg.0 + IL_000e: ldfld class [mscorlib]System.Collections.Generic.Dictionary`2 Speak.MainClass::statusmodes + IL_0013: ldarg.2 + IL_0014: callvirt instance class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs::get_Protocol() + IL_0019: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol::get_Name() + IL_001e: callvirt instance bool class [mscorlib]System.Collections.Generic.Dictionary`2::ContainsKey(!0) + IL_0023: brfalse.s IL_0055 + + .line 62,62 : 17,52 '' + IL_0025: ldarg.0 + IL_0026: ldfld class [mscorlib]System.Collections.Generic.Dictionary`2 Speak.MainClass::statusmodes + IL_002b: ldarg.2 + IL_002c: callvirt instance class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs::get_Protocol() + IL_0031: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol::get_Name() + IL_0036: callvirt instance !1 class [mscorlib]System.Collections.Generic.Dictionary`2::get_Item(!0) + IL_003b: stloc.0 + .line 63,63 : 17,52 '' + IL_003c: ldarg.0 + IL_003d: ldfld class [mscorlib]System.Collections.Generic.Dictionary`2 Speak.MainClass::statusmodes + IL_0042: ldarg.2 + IL_0043: callvirt instance class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs::get_Protocol() + IL_0048: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol::get_Name() + IL_004d: ldloc.1 + IL_004e: callvirt instance void class [mscorlib]System.Collections.Generic.Dictionary`2::set_Item(!0, + !1) + IL_0053: br.s IL_006c + + .line 67,67 : 17,55 '' + IL_0055: ldarg.0 + IL_0056: ldfld class [mscorlib]System.Collections.Generic.Dictionary`2 Speak.MainClass::statusmodes + IL_005b: ldarg.2 + IL_005c: callvirt instance class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ProtocolStatusChangeEventArgs::get_Protocol() + IL_0061: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol::get_Name() + IL_0066: ldloc.1 + IL_0067: callvirt instance void class [mscorlib]System.Collections.Generic.Dictionary`2::Add(!0, + !1) + .line 69,69 : 13,60 '' + IL_006c: call class Speak.Storage.Settings Speak.Storage.Settings::getInstance() + IL_0071: callvirt instance bool Speak.Storage.Settings::getActiveConnect() + IL_0076: brtrue.s IL_00a4 + + .line 71,71 : 17,76 '' + IL_0078: ldloc.0 + IL_0079: ldc.i4 0x9c87 + IL_007e: bne.un.s IL_00a4 + + IL_0080: ldloc.1 + IL_0081: ldc.i4 0x9c87 + IL_0086: beq.s IL_00a4 + + .line 73,73 : 21,68 '' + IL_0088: ldarg.0 + IL_0089: call valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::get_Now() + IL_008e: stloc.2 + IL_008f: ldloca.s CS$0$0000 + IL_0091: ldc.r8 5. + IL_009a: call instance valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::AddSeconds(float64) + IL_009f: stfld valuetype [mscorlib]System.DateTime Speak.MainClass::status_pause + .line 76,76 : 13,63 '' + IL_00a4: call class Speak.Storage.Settings Speak.Storage.Settings::getInstance() + IL_00a9: callvirt instance bool Speak.Storage.Settings::getActiveDisconnect() + IL_00ae: brtrue.s IL_00dc + + .line 78,78 : 17,76 '' + IL_00b0: ldloc.0 + IL_00b1: ldc.i4 0x9c87 + IL_00b6: beq.s IL_00dc + + IL_00b8: ldloc.1 + IL_00b9: ldc.i4 0x9c87 + IL_00be: bne.un.s IL_00dc + + .line 80,80 : 21,68 '' + IL_00c0: ldarg.0 + IL_00c1: call valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::get_Now() + IL_00c6: stloc.3 + IL_00c7: ldloca.s CS$0$0001 + IL_00c9: ldc.r8 5. + IL_00d2: call instance valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::AddSeconds(float64) + IL_00d7: stfld valuetype [mscorlib]System.DateTime Speak.MainClass::status_pause + .line 83,83 : 13,25 '' + IL_00dc: ldc.i4.1 + IL_00dd: ret + } // end of method MainClass::StatusModeChange + .method family hidebysig virtual instance void BeforePluginDisable() cil managed { - // Code size 44 (0x2c) + // Code size 50 (0x32) .maxstack 8 - .line 50,50 : 13,71 '' - IL_0000: ldsfld string Speak.Structs.API::ME_OPT_INITIALISE + .line 88,88 : 13,71 '' + IL_0000: ldstr "Opt/Initialise" IL_0005: ldarg.0 IL_0006: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.EventManager::RemoveEventHook(string, class [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin) - .line 51,51 : 13,71 '' - IL_000b: ldsfld string Speak.Structs.API::ME_DB_EVENT_ADDED + .line 89,89 : 13,71 '' + IL_000b: ldstr "DB/Event/Added" IL_0010: ldarg.0 IL_0011: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.EventManager::RemoveEventHook(string, class [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin) - .line 52,52 : 13,82 '' - IL_0016: ldsfld string Speak.Structs.API::ME_DB_CONTACT_SETTINGCHANGED + .line 90,90 : 13,82 '' + IL_0016: ldstr "DB/Contact/SettingChanged" IL_001b: ldarg.0 IL_001c: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.EventManager::RemoveEventHook(string, class [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin) - .line 53,53 : 13,46 '' - IL_0021: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() - IL_0026: callvirt instance void Speak.TTS.TextToSpeak::Stop() - .line 54,54 : 9,10 '' - IL_002b: ret + .line 91,91 : 13,44 '' + IL_0021: ldnull + IL_0022: call void [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.Protocol::remove_StatusChanged(class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaEventHandler`1) + .line 92,92 : 13,46 '' + IL_0027: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() + IL_002c: callvirt instance void Speak.TTS.TextToSpeak::Stop() + .line 93,93 : 9,10 '' + IL_0031: ret } // end of method MainClass::BeforePluginDisable .method private hidebysig instance int32 Message(native uint wParam, native int lParam) cil managed { - // Code size 38 (0x26) + // Code size 127 (0x7f) .maxstack 3 - .locals init ([0] class [mscorlib]System.Exception e) - .line 60,60 : 17,54 '' - .try - { - IL_0000: ldarg.0 - IL_0001: ldarg.1 - IL_0002: ldarg.2 - IL_0003: call instance void Speak.MainClass::exceptionmacher(native uint, - native int) - IL_0008: leave.s IL_0024 + .locals init ([0] class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo d, + [1] class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo c, + [2] class Speak.Storage.Settings s, + [3] class Speak.TTS.TextToSpeak tts, + [4] string text, + [5] string sig) + .line 97,97 : 13,72 '' + IL_0000: ldarg.2 + IL_0001: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo::FromHandle(native int) + IL_0006: stloc.0 + .line 98,98 : 13,132 '' + IL_0007: ldloc.0 + IL_0008: callvirt instance valuetype [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventType [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo::get_Type() + IL_000d: brtrue.s IL_007d - .line 76,76 : 13,32 '' - } // end .try - catch [mscorlib]System.Exception - { - IL_000a: stloc.0 - .line 78,78 : 17,68 '' - IL_000b: ldloc.0 - IL_000c: callvirt instance class [mscorlib]System.Reflection.MethodBase [mscorlib]System.Exception::get_TargetSite() - IL_0011: callvirt instance string [mscorlib]System.Object::ToString() - IL_0016: ldloc.0 - IL_0017: callvirt instance string [mscorlib]System.Exception::get_Source() - IL_001c: call valuetype [System.Windows.Forms]System.Windows.Forms.DialogResult [System.Windows.Forms]System.Windows.Forms.MessageBox::Show(string, - string) - IL_0021: pop - IL_0022: leave.s IL_0024 + IL_000f: ldloc.0 + IL_0010: callvirt instance valuetype [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventProperties [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo::get_Flags() + IL_0015: ldc.i4.2 + IL_0016: and + IL_0017: ldc.i4.2 + IL_0018: beq.s IL_007d - .line 80,80 : 13,22 '' - } // end handler - IL_0024: ldc.i4.0 - IL_0025: ret + .line 100,100 : 17,64 '' + IL_001a: ldarg.1 + IL_001b: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::FromHandle(native uint) + IL_0020: stloc.1 + .line 101,101 : 17,53 '' + IL_0021: call class Speak.Storage.Settings Speak.Storage.Settings::getInstance() + IL_0026: stloc.2 + .line 102,102 : 17,69 '' + IL_0027: ldloc.2 + IL_0028: ldloc.0 + IL_0029: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo::get_Data() + IL_002e: ldloc.1 + IL_002f: callvirt instance object [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_UniqueID() + IL_0034: callvirt instance string [mscorlib]System.Object::ToString() + IL_0039: callvirt instance bool Speak.Storage.Settings::canMessageRead(string, + string) + IL_003e: brfalse.s IL_007d + + .line 104,104 : 21,65 '' + IL_0040: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() + IL_0045: stloc.3 + .line 105,105 : 21,92 '' + IL_0046: ldloc.2 + IL_0047: callvirt instance string Speak.Storage.Settings::getSpeakString() + IL_004c: ldloc.1 + IL_004d: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_DisplayName() + IL_0052: ldloc.0 + IL_0053: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo::get_Data() + IL_0058: call string [mscorlib]System.String::Format(string, + object, + object) + IL_005d: stloc.s text + .line 106,106 : 21,53 '' + IL_005f: ldloc.s text + IL_0061: ldloc.0 + IL_0062: callvirt instance valuetype [mscorlib]System.DateTime [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.DatabaseEventInfo::get_Timestamp() + IL_0067: box [mscorlib]System.DateTime + IL_006c: call string [mscorlib]System.String::Concat(object, + object) + IL_0071: stloc.s sig + .line 108,108 : 21,42 '' + IL_0073: ldloc.3 + IL_0074: ldloc.s text + IL_0076: ldloc.s sig + IL_0078: callvirt instance void Speak.TTS.TextToSpeak::speak(string, + string) + .line 111,111 : 13,22 '' + IL_007d: ldc.i4.0 + IL_007e: ret } // end of method MainClass::Message - .method private hidebysig instance void - exceptionmacher(native uint wParam, - native int lParam) cil managed - { - // Code size 48 (0x30) - .maxstack 8 - .line 85,85 : 13,86 '' - IL_0000: ldstr "wp: " - IL_0005: ldarga.s wParam - IL_0007: constrained. [mscorlib]System.UIntPtr - IL_000d: callvirt instance string [mscorlib]System.Object::ToString() - IL_0012: ldstr "lp: " - IL_0017: ldarga.s lParam - IL_0019: constrained. [mscorlib]System.IntPtr - IL_001f: callvirt instance string [mscorlib]System.Object::ToString() - IL_0024: call string [mscorlib]System.String::Concat(string, - string, - string, - string) - IL_0029: call valuetype [System.Windows.Forms]System.Windows.Forms.DialogResult [System.Windows.Forms]System.Windows.Forms.MessageBox::Show(string) - IL_002e: pop - .line 86,86 : 9,10 '' - IL_002f: ret - } // end of method MainClass::exceptionmacher - .method private hidebysig instance int32 StatusChange(native uint wParam, native int lParam) cil managed { - // Code size 147 (0x93) - .maxstack 3 + // Code size 189 (0xbd) + .maxstack 4 .locals init ([0] class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo c, [1] class Speak.Storage.Settings s, [2] class Speak.TTS.TextToSpeak tts, [3] string text, [4] valuetype [mscorlib]System.Nullable`1 CS$0$0000, - [5] valuetype [mscorlib]System.Nullable`1 CS$0$0001) - .line 90,90 : 13,60 '' + [5] valuetype [mscorlib]System.Nullable`1 CS$0$0001, + [6] valuetype [mscorlib]System.DateTime CS$0$0002, + [7] int64 CS$0$0003) + .line 116,116 : 13,60 '' IL_0000: ldarg.1 IL_0001: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::FromHandle(native uint) IL_0006: stloc.0 - .line 91,91 : 13,36 '' + .line 117,117 : 13,36 '' IL_0007: ldloc.0 IL_0008: callvirt instance object [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_UniqueID() IL_000d: brtrue.s IL_0011 - .line 93,93 : 17,26 '' + .line 119,119 : 17,26 '' IL_000f: ldc.i4.0 IL_0010: ret - .line 95,95 : 13,49 '' + .line 121,121 : 13,49 '' IL_0011: call class Speak.Storage.Settings Speak.Storage.Settings::getInstance() IL_0016: stloc.1 - .line 96,96 : 13,80 '' + .line 122,122 : 13,80 '' IL_0017: ldloc.1 IL_0018: ldloc.0 IL_0019: callvirt instance object [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_UniqueID() @@ -23312,45 +23452,62 @@ IL_0033: callvirt instance string [mscorlib]System.Object::ToString() IL_0038: callvirt instance bool Speak.Storage.Settings::hasChangedStatus(string, string) - IL_003d: brfalse.s IL_0091 + IL_003d: brfalse.s IL_00bb - .line 98,98 : 17,60 '' + .line 124,124 : 17,60 '' IL_003f: ldloc.1 IL_0040: ldloc.0 IL_0041: callvirt instance object [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_UniqueID() IL_0046: callvirt instance string [mscorlib]System.Object::ToString() IL_004b: callvirt instance bool Speak.Storage.Settings::canStatusRead(string) - IL_0050: brfalse.s IL_0091 + IL_0050: brfalse.s IL_00bb - .line 100,100 : 21,65 '' - IL_0052: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() - IL_0057: stloc.2 - .line 101,101 : 21,114 '' - IL_0058: ldloc.1 - IL_0059: ldloc.0 - IL_005a: callvirt instance valuetype [mscorlib]System.Nullable`1 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_Status() - IL_005f: callvirt instance string Speak.Storage.Settings::getStatusString(valuetype [mscorlib]System.Nullable`1) - IL_0064: ldloc.0 - IL_0065: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_DisplayName() - IL_006a: ldloc.0 - IL_006b: callvirt instance valuetype [mscorlib]System.Nullable`1 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_Status() - IL_0070: stloc.s CS$0$0001 - IL_0072: ldloca.s CS$0$0001 - IL_0074: constrained. valuetype [mscorlib]System.Nullable`1 - IL_007a: callvirt instance string [mscorlib]System.Object::ToString() - IL_007f: call string [mscorlib]System.String::Format(string, + .line 126,126 : 21,54 '' + IL_0052: ldarg.0 + IL_0053: ldfld valuetype [mscorlib]System.DateTime Speak.MainClass::status_pause + IL_0058: call valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::get_Now() + IL_005d: call bool [mscorlib]System.DateTime::op_LessThanOrEqual(valuetype [mscorlib]System.DateTime, + valuetype [mscorlib]System.DateTime) + IL_0062: brfalse.s IL_00bb + + .line 128,128 : 25,69 '' + IL_0064: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() + IL_0069: stloc.2 + .line 129,129 : 25,118 '' + IL_006a: ldloc.1 + IL_006b: ldloc.0 + IL_006c: callvirt instance valuetype [mscorlib]System.Nullable`1 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_Status() + IL_0071: callvirt instance string Speak.Storage.Settings::getStatusString(valuetype [mscorlib]System.Nullable`1) + IL_0076: ldloc.0 + IL_0077: callvirt instance string [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_DisplayName() + IL_007c: ldloc.0 + IL_007d: callvirt instance valuetype [mscorlib]System.Nullable`1 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.ContactInfo::get_Status() + IL_0082: stloc.s CS$0$0001 + IL_0084: ldloca.s CS$0$0001 + IL_0086: constrained. valuetype [mscorlib]System.Nullable`1 + IL_008c: callvirt instance string [mscorlib]System.Object::ToString() + IL_0091: call string [mscorlib]System.String::Format(string, object, object) - IL_0084: stloc.3 - .line 102,102 : 21,40 '' - IL_0085: ldloc.2 - IL_0086: ldloc.3 - IL_0087: ldstr "" - IL_008c: callvirt instance void Speak.TTS.TextToSpeak::speak(string, + IL_0096: stloc.3 + .line 130,130 : 25,79 '' + IL_0097: ldloc.2 + IL_0098: ldloc.3 + IL_0099: ldloc.3 + IL_009a: call valuetype [mscorlib]System.DateTime [mscorlib]System.DateTime::get_Now() + IL_009f: stloc.s CS$0$0002 + IL_00a1: ldloca.s CS$0$0002 + IL_00a3: call instance int64 [mscorlib]System.DateTime::get_Ticks() + IL_00a8: stloc.s CS$0$0003 + IL_00aa: ldloca.s CS$0$0003 + IL_00ac: call instance string [mscorlib]System.Int64::ToString() + IL_00b1: call string [mscorlib]System.String::Concat(string, + string) + IL_00b6: callvirt instance void Speak.TTS.TextToSpeak::speak(string, string) - .line 105,105 : 13,22 '' - IL_0091: ldc.i4.0 - IL_0092: ret + .line 134,134 : 13,22 '' + IL_00bb: ldc.i4.0 + IL_00bc: ret } // end of method MainClass::StatusChange .method private hidebysig instance void @@ -23364,15 +23521,15 @@ [3] int64 CS$0$0000, [4] int64 CS$0$0001, [5] int64 CS$0$0002) - .line 110,110 : 13,50 '' + .line 139,139 : 13,50 '' IL_0000: ldarg.1 IL_0001: ldc.i4.2 IL_0002: bne.un IL_008e - .line 112,112 : 17,61 '' + .line 141,141 : 17,61 '' IL_0007: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() IL_000c: stloc.0 - .line 113,113 : 17,78 '' + .line 142,142 : 17,78 '' IL_000d: ldloc.0 IL_000e: ldstr "engine" IL_0013: ldstr "speak_config" @@ -23380,7 +23537,7 @@ string) IL_001d: callvirt instance bool Speak.TTS.TextToSpeak::setVoice(string) IL_0022: pop - .line 114,114 : 17,99 '' + .line 143,143 : 17,99 '' IL_0023: ldloc.0 IL_0024: ldstr "volume" IL_0029: ldstr "speak_config" @@ -23392,7 +23549,7 @@ IL_003b: call int32 [mscorlib]System.Int32::Parse(string) IL_0040: callvirt instance bool Speak.TTS.TextToSpeak::setVolume(int32) IL_0045: pop - .line 115,115 : 17,95 '' + .line 144,144 : 17,95 '' IL_0046: ldloc.0 IL_0047: ldstr "rate" IL_004c: ldstr "speak_config" @@ -23404,7 +23561,7 @@ IL_005f: call int32 [mscorlib]System.Int32::Parse(string) IL_0064: callvirt instance bool Speak.TTS.TextToSpeak::setRate(int32) IL_0069: pop - .line 116,116 : 17,97 '' + .line 145,145 : 17,97 '' IL_006a: ldloc.0 IL_006b: ldstr "pitch" IL_0070: ldstr "speak_config" @@ -23416,28 +23573,28 @@ IL_0083: call int32 [mscorlib]System.Int32::Parse(string) IL_0088: callvirt instance bool Speak.TTS.TextToSpeak::setPitch(int32) IL_008d: pop - .line 118,118 : 13,50 '' + .line 147,147 : 13,50 '' IL_008e: ldarg.1 IL_008f: brtrue.s IL_009d - .line 120,120 : 17,53 '' + .line 149,149 : 17,53 '' IL_0091: call class Speak.Storage.Settings Speak.Storage.Settings::getInstance() IL_0096: stloc.1 - .line 121,121 : 17,37 '' + .line 150,150 : 17,37 '' IL_0097: ldloc.1 IL_0098: callvirt instance void Speak.Storage.Settings::ReadContactList() - .line 123,123 : 13,52 '' + .line 152,152 : 13,52 '' IL_009d: ldarg.1 IL_009e: ldc.i4.1 IL_009f: bne.un.s IL_00ad - .line 125,125 : 17,53 '' + .line 154,154 : 17,53 '' IL_00a1: call class Speak.Storage.Settings Speak.Storage.Settings::getInstance() IL_00a6: stloc.2 - .line 126,126 : 17,39 '' + .line 155,155 : 17,39 '' IL_00a7: ldloc.2 IL_00a8: callvirt instance void Speak.Storage.Settings::SetGlobalSettings() - .line 128,128 : 9,10 '' + .line 157,157 : 9,10 '' IL_00ad: ret } // end of method MainClass::option_hasUpdated @@ -23447,10 +23604,10 @@ // Code size 48 (0x30) .maxstack 4 .locals init ([0] class Speak.TTS.TextToSpeak tts) - .line 132,132 : 13,57 '' + .line 161,161 : 13,57 '' IL_0000: call class Speak.TTS.TextToSpeak Speak.TTS.TextToSpeak::getInstance() IL_0005: stloc.0 - .line 133,133 : 13,102 '' + .line 162,162 : 13,102 '' IL_0006: ldloc.0 IL_0007: ldstr "welcome_msg" IL_000c: ldstr "speak_config" @@ -23463,7 +23620,7 @@ object) IL_002a: callvirt instance void Speak.TTS.TextToSpeak::speak(string, string) - .line 134,134 : 9,10 '' + .line 163,163 : 9,10 '' IL_002f: ret } // end of method MainClass::SpeakWelcome @@ -23473,21 +23630,21 @@ // Code size 76 (0x4c) .maxstack 4 .locals init ([0] class [Hyphen]Virtuoso.Miranda.Plugins.ThirdParty.Updater.Update update) - .line 140,140 : 17,202 '' + .line 169,169 : 17,186 '' .try { IL_0000: ldarg.0 IL_0001: ldarg.0 IL_0002: callvirt instance class [System]System.Uri [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin::get_HomePage() IL_0007: callvirt instance string [mscorlib]System.Object::ToString() - IL_000c: ldstr "files/miranda/speak_last.zip" + IL_000c: ldstr "files/speak_last.zip" IL_0011: call string [mscorlib]System.String::Concat(string, string) IL_0016: newobj instance void [System]System.Uri::.ctor(string) IL_001b: ldarg.0 IL_001c: callvirt instance class [System]System.Uri [Hyphen]Virtuoso.Miranda.Plugins.MirandaPlugin::get_HomePage() IL_0021: callvirt instance string [mscorlib]System.Object::ToString() - IL_0026: ldstr "files/miranda/speak_updater_version.txt" + IL_0026: ldstr "files/speak_updater_version.txt" IL_002b: call string [mscorlib]System.String::Concat(string, string) IL_0030: newobj instance void [System]System.Uri::.ctor(string) @@ -23497,19 +23654,19 @@ class [System]System.Uri, string) IL_003f: stloc.0 - .line 141,141 : 17,57 '' + .line 170,170 : 17,57 '' IL_0040: ldloc.0 IL_0041: call void [Hyphen]Virtuoso.Miranda.Plugins.ThirdParty.Updater.UpdaterPlugin::RegisterForUpdate(class [Hyphen]Virtuoso.Miranda.Plugins.ThirdParty.Updater.Update) IL_0046: leave.s IL_004b - .line 143,143 : 13,42 '' + .line 172,172 : 13,42 '' } // end .try catch [mscorlib]System.NotSupportedException { IL_0048: pop IL_0049: leave.s IL_004b - .line 144,144 : 9,10 '' + .line 173,173 : 9,10 '' } // end handler IL_004b: ret } // end of method MainClass::RegisterUpdate @@ -23519,7 +23676,7 @@ { // Code size 6 (0x6) .maxstack 8 - .line 157,157 : 19,38 '' + .line 181,181 : 19,38 '' IL_0000: ldstr "BlubbFish" IL_0005: ret } // end of method MainClass::get_Author @@ -23529,7 +23686,7 @@ { // Code size 6 (0x6) .maxstack 8 - .line 165,165 : 19,48 '' + .line 189,189 : 19,48 '' IL_0000: ldstr ".NET Speak Provider" IL_0005: ret } // end of method MainClass::get_Description @@ -23539,7 +23696,7 @@ { // Code size 2 (0x2) .maxstack 8 - .line 173,173 : 19,32 '' + .line 197,197 : 19,32 '' IL_0000: ldc.i4.0 IL_0001: ret } // end of method MainClass::get_HasOptions @@ -23550,8 +23707,8 @@ { // Code size 11 (0xb) .maxstack 8 - .line 181,181 : 19,62 '' - IL_0000: ldstr "http://dev.blubbfish.net" + .line 205,205 : 19,66 '' + IL_0000: ldstr "http://miranda.blubbfish.net" IL_0005: newobj instance void [System]System.Uri::.ctor(string) IL_000a: ret } // end of method MainClass::get_HomePage @@ -23561,7 +23718,7 @@ { // Code size 6 (0x6) .maxstack 8 - .line 189,189 : 19,34 '' + .line 213,213 : 19,34 '' IL_0000: ldstr "Speak" IL_0005: ret } // end of method MainClass::get_Name @@ -23570,11 +23727,12 @@ instance class [mscorlib]System.Version get_Version() cil managed { - // Code size 6 (0x6) + // Code size 11 (0xb) .maxstack 8 - .line 197,197 : 19,34 '' - IL_0000: ldsfld class [mscorlib]System.Version Speak.MainClass::VERSION - IL_0005: ret + .line 221,221 : 19,47 '' + IL_0000: ldstr "1.0.1.1" + IL_0005: newobj instance void [mscorlib]System.Version::.ctor(string) + IL_000a: ret } // end of method MainClass::get_Version .method public hidebysig specialname virtual @@ -23582,7 +23740,7 @@ { // Code size 6 (0x6) .maxstack 8 - .line 205,205 : 19,46 '' + .line 229,229 : 19,46 '' IL_0000: ldstr "dev@blubbfish.net" IL_0005: ret } // end of method MainClass::get_AuthorEmail @@ -23592,7 +23750,7 @@ { // Code size 6 (0x6) .maxstack 8 - .line 213,213 : 19,45 '' + .line 237,237 : 19,45 '' IL_0000: ldstr bytearray (32 00 30 00 31 00 33 00 20 00 A9 00 20 00 42 00 // 2.0.1.3. ... .B. 6C 00 75 00 62 00 62 00 46 00 69 00 73 00 68 00 ) // l.u.b.b.F.i.s.h. IL_0005: ret @@ -23605,7 +23763,7 @@ // Code size 26 (0x1a) .maxstack 2 .locals init ([0] valuetype [mscorlib]System.Guid[] CS$0$0000) - .line 221,221 : 19,46 '' + .line 245,245 : 19,46 '' IL_0000: ldc.i4.1 IL_0001: newarr [mscorlib]System.Guid IL_0006: stloc.0 @@ -23623,7 +23781,7 @@ { // Code size 2 (0x2) .maxstack 8 - .line 229,229 : 19,28 '' + .line 253,253 : 19,28 '' IL_0000: ldc.i4.0 IL_0001: ret } // end of method MainClass::get_ReplacesDefaultModule @@ -23634,7 +23792,7 @@ { // Code size 6 (0x6) .maxstack 8 - .line 237,237 : 19,31 '' + .line 261,261 : 19,31 '' IL_0000: ldsfld valuetype [mscorlib]System.Guid Speak.MainClass::uuid IL_0005: ret } // end of method MainClass::get_UUID @@ -23642,23 +23800,13 @@ .method private hidebysig specialname rtspecialname static void .cctor() cil managed { - // Code size 30 (0x1e) + // Code size 16 (0x10) .maxstack 8 - .line 150,150 : 9,66 '' - IL_0000: ldc.i4.0 - IL_0001: ldc.i4.8 - IL_0002: ldc.i4.0 - IL_0003: ldc.i4.0 - IL_0004: newobj instance void [mscorlib]System.Version::.ctor(int32, - int32, - int32, - int32) - IL_0009: stsfld class [mscorlib]System.Version Speak.MainClass::VERSION - .line 240,240 : 9,94 '' - IL_000e: ldstr "65BC8980-1028-40A4-A52F-440C48035E02" - IL_0013: newobj instance void [mscorlib]System.Guid::.ctor(string) - IL_0018: stsfld valuetype [mscorlib]System.Guid Speak.MainClass::uuid - IL_001d: ret + .line 264,264 : 9,94 '' + IL_0000: ldstr "65BC8980-1028-40A4-A52F-440C48035E02" + IL_0005: newobj instance void [mscorlib]System.Guid::.ctor(string) + IL_000a: stsfld valuetype [mscorlib]System.Guid Speak.MainClass::uuid + IL_000f: ret } // end of method MainClass::.cctor .property instance string Author() @@ -24078,7 +24226,7 @@ bool) .line 163,163 : 13,89 '' IL_00e6: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_00eb: ldsfld string Speak.Structs.API::MS_OPT_ADDPAGE + IL_00eb: ldstr "Opt/AddPage" IL_00f0: ldarg.1 IL_00f1: ldloc.1 IL_00f2: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -24166,7 +24314,7 @@ bool) .line 181,181 : 13,92 '' IL_01c5: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_01ca: ldsfld string Speak.Structs.API::MS_OPT_ADDPAGE + IL_01ca: ldstr "Opt/AddPage" IL_01cf: ldarg.1 IL_01d0: ldloc.3 IL_01d1: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -24254,7 +24402,7 @@ bool) .line 199,199 : 13,90 '' IL_02a9: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_02ae: ldsfld string Speak.Structs.API::MS_OPT_ADDPAGE + IL_02ae: ldstr "Opt/AddPage" IL_02b3: ldarg.1 IL_02b4: ldloc.s cmdPtrEngine IL_02b6: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -26118,7 +26266,7 @@ .line 575,575 : 33,138 '' IL_0298: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_029d: ldsfld string Speak.Structs.API::MS_DB_CONTACT_FINDFIRST + IL_029d: ldstr "DB/Contact/FindFirst" IL_02a2: ldsfld native int [mscorlib]System.IntPtr::Zero IL_02a7: ldsfld native int [mscorlib]System.IntPtr::Zero IL_02ac: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -26244,7 +26392,7 @@ .line 608,608 : 35,155 '' IL_0394: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0399: ldsfld string Speak.Structs.API::MS_DB_CONTACT_FINDNEXT + IL_0399: ldstr "DB/Contact/FindNext" IL_039e: ldloc.s hContact IL_03a0: call native int [mscorlib]System.IntPtr::op_Explicit(int32) IL_03a5: ldsfld native int [mscorlib]System.IntPtr::Zero @@ -26972,7 +27120,7 @@ IL_000d: pop .line 760,760 : 13,118 '' IL_000e: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0013: ldsfld string Speak.Structs.API::MS_DB_CONTACT_FINDFIRST + IL_0013: ldstr "DB/Contact/FindFirst" IL_0018: ldsfld native int [mscorlib]System.IntPtr::Zero IL_001d: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0022: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -27011,7 +27159,7 @@ .line 772,772 : 25,136 '' IL_0052: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0057: ldsfld string Speak.Structs.API::MS_PROTO_GETCONTACTBASEPROTO + IL_0057: ldstr "Proto/GetContactBaseProto" IL_005c: ldloc.1 IL_005d: call native int [mscorlib]System.IntPtr::op_Explicit(int32) IL_0062: ldsfld native int [mscorlib]System.IntPtr::Zero @@ -27125,7 +27273,7 @@ IL_0131: pop .line 796,796 : 15,134 '' IL_0132: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0137: ldsfld string Speak.Structs.API::MS_DB_CONTACT_FINDNEXT + IL_0137: ldstr "DB/Contact/FindNext" IL_013c: ldloc.0 IL_013d: call native int [mscorlib]System.IntPtr::op_Explicit(int32) IL_0142: ldsfld native int [mscorlib]System.IntPtr::Zero @@ -35491,223 +35639,93 @@ IL_0073: ret } // end of method Settings::getStatusString + .method public hidebysig instance bool + getActiveConnect() cil managed + { + // Code size 17 (0x11) + .maxstack 8 + .line 162,162 : 13,80 '' + IL_0000: ldstr "active_connect" + IL_0005: ldstr "speak_config" + IL_000a: ldc.i4.0 + IL_000b: call bool Speak.Opt.Options::readDBBool(string, + string, + bool) + IL_0010: ret + } // end of method Settings::getActiveConnect + + .method public hidebysig instance bool + getActiveDisconnect() cil managed + { + // Code size 17 (0x11) + .maxstack 8 + .line 169,169 : 13,83 '' + IL_0000: ldstr "active_disconnect" + IL_0005: ldstr "speak_config" + IL_000a: ldc.i4.0 + IL_000b: call bool Speak.Opt.Options::readDBBool(string, + string, + bool) + IL_0010: ret + } // end of method Settings::getActiveDisconnect + } // end of class Speak.Storage.Settings .class private abstract auto ansi sealed beforefieldinit Speak.Structs.API extends [mscorlib]System.Object { - .field public static string MS_SYSTEM_GETVERSION - .field public static string MS_DB_EVENT_ADD - .field public static string MS_DB_EVENT_GET - .field public static string MS_DB_EVENT_DELETE - .field public static string MS_DB_EVENT_GETBLOBSIZE - .field public static string MS_DB_TIME_TIMESTAMPTOLOCAL - .field public static string MS_PROTO_ADDTOCONTACT - .field public static string MS_PROTO_ISPROTOONCONTACT - .field public static string MS_PROTO_REGISTERMODULE - .field public static string MS_PROTO_CHAINSEND - .field public static string MS_PROTO_CHAINRECV - .field public static string MS_PROTO_CALLCONTACTSERVICE - .field public static string MS_PROTO_GETCONTACTBASEPROTO - .field public static string PS_SETSTATUS - .field public static string PS_GETSTATUS - .field public static string PSR_MESSAGE - .field public static string PSR_MESSAGEW - .field public static string PSS_MESSAGE - .field public static string PSS_MESSAGEW - .field public static string MS_MSG_SENDMESSAGE - .field public static string ME_MSG_WINDOWEVENT - .field public static string MS_SKIN2_ADDICON - .field public static string MS_SKIN2_GETICON - .field public static string MS_SKIN2_GETICONBYHANDLE - .field public static string ME_SKIN2_ICONSCHANGED - .field public static string MS_BB_ADDBUTTON - .field public static string MS_BB_REMOVEBUTTON - .field public static string MS_BB_GETBUTTONSTATE - .field public static string MS_BB_SETBUTTONSTATE - .field public static string ME_MSG_TOOLBARLOADED - .field public static string ME_MSG_BUTTONPRESSED - .field public static string ME_IEVIEW_OPTIONSCHANGED - .field public static string ME_DB_CONTACT_SETTINGCHANGED - .field public static string ME_DB_EVENT_ADDED - .field public static string MS_UTILS_OPENURL - .field public static string ME_OPT_INITIALISE - .field public static string MS_OPT_ADDPAGE - .field public static string MS_GC_NEWSESSION - .field public static string MS_MSG_GETWINDOWCLASS - .field public static string MS_PROTO_ENUMPROTOS - .field public static string MS_PROTO_ENUMPROTOCOLS - .field public static string MS_PROTO_ENUMACCOUNTS - .field public static string MS_IEVIEW_WINDOW - .field public static string ME_HPP_RICHEDIT_ITEMPROCESS - .field public static string MS_HPP_EG_WINDOW - .field public static string MS_HPP_GETVERSION - .field public static string MS_DB_GETPROFILEPATH - .field public static string MS_DB_GETPROFILENAME - .field public static int32 CALLSERVICE_NOTFOUND - .field public static string MS_DB_CONTACT_FINDFIRST - .field public static string MS_DB_CONTACT_FINDNEXT - .method private hidebysig specialname rtspecialname static - void .cctor() cil managed - { - // Code size 511 (0x1ff) - .maxstack 1 - .line 7,7 : 9,81 'd:\\Visual Studio 2012\\Projects\\miranda\\Speak\\Speak\\Structs\\API.cs' - IL_0000: ldstr "Miranda/System/GetVersion" - IL_0005: stsfld string Speak.Structs.API::MS_SYSTEM_GETVERSION - .line 9,9 : 9,63 '' - IL_000a: ldstr "DB/Event/Add" - IL_000f: stsfld string Speak.Structs.API::MS_DB_EVENT_ADD - .line 10,10 : 9,63 '' - IL_0014: ldstr "DB/Event/Get" - IL_0019: stsfld string Speak.Structs.API::MS_DB_EVENT_GET - .line 11,11 : 9,69 '' - IL_001e: ldstr "DB/Event/Delete" - IL_0023: stsfld string Speak.Structs.API::MS_DB_EVENT_DELETE - .line 12,12 : 9,79 '' - IL_0028: ldstr "DB/Event/GetBlobSize" - IL_002d: stsfld string Speak.Structs.API::MS_DB_EVENT_GETBLOBSIZE - .line 13,13 : 9,87 '' - IL_0032: ldstr "DB/Time/TimestampToLocal" - IL_0037: stsfld string Speak.Structs.API::MS_DB_TIME_TIMESTAMPTOLOCAL - .line 16,16 : 9,75 '' - IL_003c: ldstr "Proto/AddToContact" - IL_0041: stsfld string Speak.Structs.API::MS_PROTO_ADDTOCONTACT - .line 17,17 : 9,83 '' - IL_0046: ldstr "Proto/IsProtoOnContact" - IL_004b: stsfld string Speak.Structs.API::MS_PROTO_ISPROTOONCONTACT - .line 18,18 : 9,79 '' - IL_0050: ldstr "Proto/RegisterModule" - IL_0055: stsfld string Speak.Structs.API::MS_PROTO_REGISTERMODULE - .line 19,19 : 9,69 '' - IL_005a: ldstr "Proto/ChainSend" - IL_005f: stsfld string Speak.Structs.API::MS_PROTO_CHAINSEND - .line 20,20 : 9,69 '' - IL_0064: ldstr "Proto/ChainRecv" - IL_0069: stsfld string Speak.Structs.API::MS_PROTO_CHAINRECV - .line 21,21 : 9,87 '' - IL_006e: ldstr "Proto/CallContactService" - IL_0073: stsfld string Speak.Structs.API::MS_PROTO_CALLCONTACTSERVICE - .line 22,22 : 9,89 '' - IL_0078: ldstr "Proto/GetContactBaseProto" - IL_007d: stsfld string Speak.Structs.API::MS_PROTO_GETCONTACTBASEPROTO - .line 24,24 : 9,58 '' - IL_0082: ldstr "/SetStatus" - IL_0087: stsfld string Speak.Structs.API::PS_SETSTATUS - .line 25,25 : 9,58 '' - IL_008c: ldstr "/GetStatus" - IL_0091: stsfld string Speak.Structs.API::PS_GETSTATUS - .line 27,27 : 9,60 '' - IL_0096: ldstr "/RecvMessage" - IL_009b: stsfld string Speak.Structs.API::PSR_MESSAGE - .line 28,28 : 9,61 '' - IL_00a0: ldstr "/RecvMessageW" - IL_00a5: stsfld string Speak.Structs.API::PSR_MESSAGEW - .line 29,29 : 9,56 '' - IL_00aa: ldstr "/SendMsg" - IL_00af: stsfld string Speak.Structs.API::PSS_MESSAGE - .line 30,30 : 9,57 '' - IL_00b4: ldstr "/SendMsgW" - IL_00b9: stsfld string Speak.Structs.API::PSS_MESSAGEW - .line 32,32 : 9,71 '' - IL_00be: ldstr "SRMsg/SendCommand" - IL_00c3: stsfld string Speak.Structs.API::MS_MSG_SENDMESSAGE - .line 33,33 : 9,76 '' - IL_00c8: ldstr "MessageAPI/WindowEvent" - IL_00cd: stsfld string Speak.Structs.API::ME_MSG_WINDOWEVENT - .line 35,35 : 9,71 '' - IL_00d2: ldstr "Skin2/Icons/AddIcon" - IL_00d7: stsfld string Speak.Structs.API::MS_SKIN2_ADDICON - .line 36,36 : 9,71 '' - IL_00dc: ldstr "Skin2/Icons/GetIcon" - IL_00e1: stsfld string Speak.Structs.API::MS_SKIN2_GETICON - .line 37,37 : 9,87 '' - IL_00e6: ldstr "Skin2/Icons/GetIconByHandle" - IL_00eb: stsfld string Speak.Structs.API::MS_SKIN2_GETICONBYHANDLE - .line 38,38 : 9,75 '' - IL_00f0: ldstr "Skin2/IconsChanged" - IL_00f5: stsfld string Speak.Structs.API::ME_SKIN2_ICONSCHANGED - .line 40,40 : 9,80 '' - IL_00fa: ldstr "TabSRMM/ButtonsBar/AddButton" - IL_00ff: stsfld string Speak.Structs.API::MS_BB_ADDBUTTON - .line 41,41 : 9,85 '' - IL_0104: ldstr "TabSRMM/ButtonsBar/RemoveButton" - IL_0109: stsfld string Speak.Structs.API::MS_BB_REMOVEBUTTON - .line 42,42 : 9,89 '' - IL_010e: ldstr "TabSRMM/ButtonsBar/GetButtonState" - IL_0113: stsfld string Speak.Structs.API::MS_BB_GETBUTTONSTATE - .line 43,43 : 9,89 '' - IL_0118: ldstr "TabSRMM/ButtonsBar/SetButtonState" - IL_011d: stsfld string Speak.Structs.API::MS_BB_SETBUTTONSTATE - .line 44,44 : 9,87 '' - IL_0122: ldstr "TabSRMM/ButtonsBar/ModuleLoaded" - IL_0127: stsfld string Speak.Structs.API::ME_MSG_TOOLBARLOADED - .line 45,45 : 9,88 '' - IL_012c: ldstr "TabSRMM/ButtonsBar/ButtonPressed" - IL_0131: stsfld string Speak.Structs.API::ME_MSG_BUTTONPRESSED - .line 47,47 : 9,81 '' - IL_0136: ldstr "IEVIEW/OptionsChanged" - IL_013b: stsfld string Speak.Structs.API::ME_IEVIEW_OPTIONSCHANGED - .line 48,48 : 9,89 '' - IL_0140: ldstr "DB/Contact/SettingChanged" - IL_0145: stsfld string Speak.Structs.API::ME_DB_CONTACT_SETTINGCHANGED - .line 50,50 : 9,67 '' - IL_014a: ldstr "DB/Event/Added" - IL_014f: stsfld string Speak.Structs.API::ME_DB_EVENT_ADDED - .line 52,52 : 9,65 '' - IL_0154: ldstr "Utils/OpenURL" - IL_0159: stsfld string Speak.Structs.API::MS_UTILS_OPENURL - .line 54,54 : 9,67 '' - IL_015e: ldstr "Opt/Initialise" - IL_0163: stsfld string Speak.Structs.API::ME_OPT_INITIALISE - .line 55,55 : 9,61 '' - IL_0168: ldstr "Opt/AddPage" - IL_016d: stsfld string Speak.Structs.API::MS_OPT_ADDPAGE - .line 57,57 : 9,65 '' - IL_0172: ldstr "GChat/NewChat" - IL_0177: stsfld string Speak.Structs.API::MS_GC_NEWSESSION - .line 59,59 : 9,79 '' - IL_017c: ldstr "MessageAPI/WindowClass" - IL_0181: stsfld string Speak.Structs.API::MS_MSG_GETWINDOWCLASS - .line 61,61 : 9,71 '' - IL_0186: ldstr "Proto/EnumProtos" - IL_018b: stsfld string Speak.Structs.API::MS_PROTO_ENUMPROTOS - .line 62,62 : 9,77 '' - IL_0190: ldstr "Proto/EnumProtocols" - IL_0195: stsfld string Speak.Structs.API::MS_PROTO_ENUMPROTOCOLS - .line 63,63 : 9,75 '' - IL_019a: ldstr "Proto/EnumAccounts" - IL_019f: stsfld string Speak.Structs.API::MS_PROTO_ENUMACCOUNTS - .line 65,65 : 9,68 '' - IL_01a4: ldstr "IEVIEW/NewWindow" - IL_01a9: stsfld string Speak.Structs.API::MS_IEVIEW_WINDOW - .line 67,67 : 9,98 '' - IL_01ae: ldstr "History++/RichEdit/ItemProcessEvent" - IL_01b3: stsfld string Speak.Structs.API::ME_HPP_RICHEDIT_ITEMPROCESS - .line 68,68 : 9,79 '' - IL_01b8: ldstr "History++/ExtGrid/NewWindow" - IL_01bd: stsfld string Speak.Structs.API::MS_HPP_EG_WINDOW - .line 69,69 : 9,73 '' - IL_01c2: ldstr "History++/GetVersion" - IL_01c7: stsfld string Speak.Structs.API::MS_HPP_GETVERSION - .line 71,71 : 9,73 '' - IL_01cc: ldstr "DB/GetProfilePath" - IL_01d1: stsfld string Speak.Structs.API::MS_DB_GETPROFILEPATH - .line 72,72 : 9,73 '' - IL_01d6: ldstr "DB/GetProfileName" - IL_01db: stsfld string Speak.Structs.API::MS_DB_GETPROFILENAME - .line 74,74 : 9,80 '' - IL_01e0: ldc.i4 0x80000000 - IL_01e5: stsfld int32 Speak.Structs.API::CALLSERVICE_NOTFOUND - .line 75,75 : 9,79 '' - IL_01ea: ldstr "DB/Contact/FindFirst" - IL_01ef: stsfld string Speak.Structs.API::MS_DB_CONTACT_FINDFIRST - .line 76,76 : 9,77 '' - IL_01f4: ldstr "DB/Contact/FindNext" - IL_01f9: stsfld string Speak.Structs.API::MS_DB_CONTACT_FINDNEXT - IL_01fe: ret - } // end of method API::.cctor - + .field public static literal string MS_SYSTEM_GETVERSION = "Miranda/System/GetVersion" + .field public static literal string MS_DB_EVENT_ADD = "DB/Event/Add" + .field public static literal string MS_DB_EVENT_GET = "DB/Event/Get" + .field public static literal string MS_DB_EVENT_DELETE = "DB/Event/Delete" + .field public static literal string MS_DB_EVENT_GETBLOBSIZE = "DB/Event/GetBlobSize" + .field public static literal string MS_DB_TIME_TIMESTAMPTOLOCAL = "DB/Time/TimestampToLocal" + .field public static literal string MS_PROTO_ADDTOCONTACT = "Proto/AddToContact" + .field public static literal string MS_PROTO_ISPROTOONCONTACT = "Proto/IsProtoOnContact" + .field public static literal string MS_PROTO_REGISTERMODULE = "Proto/RegisterModule" + .field public static literal string MS_PROTO_CHAINSEND = "Proto/ChainSend" + .field public static literal string MS_PROTO_CHAINRECV = "Proto/ChainRecv" + .field public static literal string MS_PROTO_CALLCONTACTSERVICE = "Proto/CallContactService" + .field public static literal string MS_PROTO_GETCONTACTBASEPROTO = "Proto/GetContactBaseProto" + .field public static literal string PS_SETSTATUS = "/SetStatus" + .field public static literal string PS_GETSTATUS = "/GetStatus" + .field public static literal string PSR_MESSAGE = "/RecvMessage" + .field public static literal string PSR_MESSAGEW = "/RecvMessageW" + .field public static literal string PSS_MESSAGE = "/SendMsg" + .field public static literal string PSS_MESSAGEW = "/SendMsgW" + .field public static literal string MS_MSG_SENDMESSAGE = "SRMsg/SendCommand" + .field public static literal string ME_MSG_WINDOWEVENT = "MessageAPI/WindowEvent" + .field public static literal string MS_SKIN2_ADDICON = "Skin2/Icons/AddIcon" + .field public static literal string MS_SKIN2_GETICON = "Skin2/Icons/GetIcon" + .field public static literal string MS_SKIN2_GETICONBYHANDLE = "Skin2/Icons/GetIconByHandle" + .field public static literal string ME_SKIN2_ICONSCHANGED = "Skin2/IconsChanged" + .field public static literal string MS_BB_ADDBUTTON = "TabSRMM/ButtonsBar/AddButton" + .field public static literal string MS_BB_REMOVEBUTTON = "TabSRMM/ButtonsBar/RemoveButton" + .field public static literal string MS_BB_GETBUTTONSTATE = "TabSRMM/ButtonsBar/GetButtonState" + .field public static literal string MS_BB_SETBUTTONSTATE = "TabSRMM/ButtonsBar/SetButtonState" + .field public static literal string ME_MSG_TOOLBARLOADED = "TabSRMM/ButtonsBar/ModuleLoaded" + .field public static literal string ME_MSG_BUTTONPRESSED = "TabSRMM/ButtonsBar/ButtonPressed" + .field public static literal string ME_IEVIEW_OPTIONSCHANGED = "IEVIEW/OptionsChanged" + .field public static literal string ME_DB_CONTACT_SETTINGCHANGED = "DB/Contact/SettingChanged" + .field public static literal string ME_DB_EVENT_ADDED = "DB/Event/Added" + .field public static literal string MS_UTILS_OPENURL = "Utils/OpenURL" + .field public static literal string ME_OPT_INITIALISE = "Opt/Initialise" + .field public static literal string MS_OPT_ADDPAGE = "Opt/AddPage" + .field public static literal string MS_GC_NEWSESSION = "GChat/NewChat" + .field public static literal string MS_MSG_GETWINDOWCLASS = "MessageAPI/WindowClass" + .field public static literal string MS_PROTO_ENUMPROTOS = "Proto/EnumProtos" + .field public static literal string MS_PROTO_ENUMPROTOCOLS = "Proto/EnumProtocols" + .field public static literal string MS_PROTO_ENUMACCOUNTS = "Proto/EnumAccounts" + .field public static literal string MS_IEVIEW_WINDOW = "IEVIEW/NewWindow" + .field public static literal string ME_HPP_RICHEDIT_ITEMPROCESS = "History++/RichEdit/ItemProcessEvent" + .field public static literal string MS_HPP_EG_WINDOW = "History++/ExtGrid/NewWindow" + .field public static literal string MS_HPP_GETVERSION = "History++/GetVersion" + .field public static literal string MS_DB_GETPROFILEPATH = "DB/GetProfilePath" + .field public static literal string MS_DB_GETPROFILENAME = "DB/GetProfileName" + .field public static literal int32 CALLSERVICE_NOTFOUND = int32(0x80000000) + .field public static literal string MS_DB_CONTACT_FINDFIRST = "DB/Contact/FindFirst" + .field public static literal string MS_DB_CONTACT_FINDNEXT = "DB/Contact/FindNext" + .field public static literal string ME_CLIST_STATUSMODECHANGE = "CList/StatusModeChange" } // end of class Speak.Structs.API .class public auto ansi sealed Speak.Structs.StatusModes @@ -36645,78 +36663,135 @@ .method private hidebysig instance void Speaker() cil managed { - // Code size 95 (0x5f) + // Code size 218 (0xda) .maxstack 4 .locals init ([0] string text, - [1] class [mscorlib]System.Exception e) - IL_0000: br.s IL_0056 + [1] string voice, + [2] int32 vol, + [3] int32 rate, + [4] class [mscorlib]System.Exception e) + IL_0000: br IL_00ce .line 49,49 : 17,34 '' - IL_0002: ldstr "" - IL_0007: stloc.0 + IL_0005: ldstr "" + IL_000a: stloc.0 .line 52,52 : 21,44 '' .try { - IL_0008: ldarg.0 - IL_0009: ldfld class [System]System.Collections.Generic.Queue`1 Speak.TTS.TextToSpeak::quene - IL_000e: callvirt instance !0 class [System]System.Collections.Generic.Queue`1::Dequeue() - IL_0013: stloc.0 - IL_0014: leave.s IL_0019 + IL_000b: ldarg.0 + IL_000c: ldfld class [System]System.Collections.Generic.Queue`1 Speak.TTS.TextToSpeak::quene + IL_0011: callvirt instance !0 class [System]System.Collections.Generic.Queue`1::Dequeue() + IL_0016: stloc.0 + IL_0017: leave.s IL_001c .line 54,54 : 17,50 '' } // end .try catch [mscorlib]System.InvalidOperationException { - IL_0016: pop - IL_0017: leave.s IL_0019 + IL_0019: pop + IL_001a: leave.s IL_001c .line 55,55 : 17,32 '' } // end handler - IL_0019: ldloc.0 - IL_001a: ldstr "" - IL_001f: call bool [mscorlib]System.String::op_Inequality(string, + IL_001c: ldloc.0 + IL_001d: ldstr "" + IL_0022: call bool [mscorlib]System.String::op_Inequality(string, string) - IL_0024: brfalse.s IL_004c + IL_0027: brfalse IL_00c4 - .line 59,59 : 25,41 '' + .line 59,59 : 25,46 '' .try { - IL_0026: ldarg.0 - IL_0027: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn - IL_002c: ldloc.0 - IL_002d: callvirt instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::Speak(string) - IL_0032: leave.s IL_0056 + IL_002c: ldarg.0 + IL_002d: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn + IL_0032: ldloc.0 + IL_0033: callvirt instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::Speak(string) + IL_0038: leave IL_00ce - .line 61,61 : 21,40 '' + .line 61,61 : 21,49 '' } // end .try + catch [mscorlib]System.OutOfMemoryException + { + IL_003d: pop + .line 63,63 : 25,60 '' + IL_003e: ldarg.0 + IL_003f: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn + IL_0044: callvirt instance class [System.Speech]System.Speech.Synthesis.VoiceInfo [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::get_Voice() + IL_0049: callvirt instance string [System.Speech]System.Speech.Synthesis.VoiceInfo::get_Name() + IL_004e: stloc.1 + .line 64,64 : 25,51 '' + IL_004f: ldarg.0 + IL_0050: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn + IL_0055: callvirt instance int32 [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::get_Volume() + IL_005a: stloc.2 + .line 65,65 : 25,50 '' + IL_005b: ldarg.0 + IL_005c: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn + IL_0061: callvirt instance int32 [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::get_Rate() + IL_0066: stloc.3 + .line 66,66 : 25,41 '' + IL_0067: ldarg.0 + IL_0068: ldnull + IL_0069: stfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn + .line 67,67 : 25,60 '' + IL_006e: ldarg.0 + IL_006f: newobj instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::.ctor() + IL_0074: stfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn + .line 68,68 : 25,46 '' + IL_0079: ldarg.0 + IL_007a: ldloc.1 + IL_007b: call instance bool Speak.TTS.TextToSpeak::setVoice(string) + IL_0080: pop + .line 69,69 : 25,45 '' + IL_0081: ldarg.0 + IL_0082: ldloc.2 + IL_0083: call instance bool Speak.TTS.TextToSpeak::setVolume(int32) + IL_0088: pop + .line 70,70 : 25,44 '' + IL_0089: ldarg.0 + IL_008a: ldloc.3 + IL_008b: call instance bool Speak.TTS.TextToSpeak::setRate(int32) + IL_0090: pop + .line 71,71 : 25,45 '' + IL_0091: ldarg.0 + IL_0092: ldfld class [System]System.Collections.Generic.Queue`1 Speak.TTS.TextToSpeak::quene + IL_0097: ldloc.0 + IL_0098: callvirt instance void class [System]System.Collections.Generic.Queue`1::Enqueue(!0) + IL_009d: leave.s IL_00ce + + .line 73,73 : 21,40 '' + } // end handler catch [mscorlib]System.Exception { - IL_0034: stloc.1 - .line 63,63 : 25,169 '' - IL_0035: ldloc.1 - IL_0036: callvirt instance string [mscorlib]System.Exception::get_Message() - IL_003b: ldloc.1 - IL_003c: callvirt instance string [mscorlib]System.Exception::get_Source() - IL_0041: ldc.i4.0 - IL_0042: ldc.i4.s 16 - IL_0044: call valuetype [System.Windows.Forms]System.Windows.Forms.DialogResult [System.Windows.Forms]System.Windows.Forms.MessageBox::Show(string, + IL_009f: stloc.s e + .line 75,75 : 25,188 '' + IL_00a1: ldloc.s e + IL_00a3: callvirt instance string [mscorlib]System.Object::ToString() + IL_00a8: ldstr "Fehler in: " + IL_00ad: ldloc.s e + IL_00af: callvirt instance string [mscorlib]System.Exception::get_Source() + IL_00b4: call string [mscorlib]System.String::Concat(string, + string) + IL_00b9: ldc.i4.0 + IL_00ba: ldc.i4.s 16 + IL_00bc: call valuetype [System.Windows.Forms]System.Windows.Forms.DialogResult [System.Windows.Forms]System.Windows.Forms.MessageBox::Show(string, string, valuetype [System.Windows.Forms]System.Windows.Forms.MessageBoxButtons, valuetype [System.Windows.Forms]System.Windows.Forms.MessageBoxIcon) - IL_0049: pop - IL_004a: leave.s IL_0056 + IL_00c1: pop + IL_00c2: leave.s IL_00ce - .line 68,68 : 21,39 '' + .line 80,80 : 21,39 '' } // end handler - IL_004c: ldc.i4 0x12c - IL_0051: call void [mscorlib]System.Threading.Thread::Sleep(int32) + IL_00c4: ldc.i4 0x12c + IL_00c9: call void [mscorlib]System.Threading.Thread::Sleep(int32) .line 47,47 : 13,27 '' - IL_0056: ldarg.0 - IL_0057: ldfld bool Speak.TTS.TextToSpeak::runner - IL_005c: brtrue.s IL_0002 + IL_00ce: ldarg.0 + IL_00cf: ldfld bool Speak.TTS.TextToSpeak::runner + IL_00d4: brtrue IL_0005 - .line 71,71 : 9,10 '' - IL_005e: ret + .line 83,83 : 9,10 '' + IL_00d9: ret } // end of method TextToSpeak::Speaker .method public hidebysig instance void @@ -36725,36 +36800,36 @@ { // Code size 66 (0x42) .maxstack 2 - .line 80,80 : 13,43 '' + .line 92,92 : 13,43 '' IL_0000: ldarg.0 IL_0001: ldfld class [mscorlib]System.Collections.Generic.List`1 Speak.TTS.TextToSpeak::last IL_0006: ldarg.2 IL_0007: callvirt instance bool class [mscorlib]System.Collections.Generic.List`1::Contains(!0) IL_000c: brtrue.s IL_0026 - .line 82,82 : 17,37 '' + .line 94,94 : 17,37 '' IL_000e: ldarg.0 IL_000f: ldfld class [mscorlib]System.Collections.Generic.List`1 Speak.TTS.TextToSpeak::last IL_0014: ldarg.2 IL_0015: callvirt instance void class [mscorlib]System.Collections.Generic.List`1::Add(!0) - .line 83,83 : 17,37 '' + .line 95,95 : 17,37 '' IL_001a: ldarg.0 IL_001b: ldfld class [System]System.Collections.Generic.Queue`1 Speak.TTS.TextToSpeak::quene IL_0020: ldarg.1 IL_0021: callvirt instance void class [System]System.Collections.Generic.Queue`1::Enqueue(!0) - .line 85,85 : 13,33 '' + .line 97,97 : 13,33 '' IL_0026: ldarg.0 IL_0027: ldfld class [mscorlib]System.Collections.Generic.List`1 Speak.TTS.TextToSpeak::last IL_002c: callvirt instance int32 class [mscorlib]System.Collections.Generic.List`1::get_Count() IL_0031: ldc.i4.s 10 IL_0033: ble.s IL_0041 - .line 87,87 : 17,34 '' + .line 99,99 : 17,34 '' IL_0035: ldarg.0 IL_0036: ldfld class [mscorlib]System.Collections.Generic.List`1 Speak.TTS.TextToSpeak::last IL_003b: ldc.i4.0 IL_003c: callvirt instance void class [mscorlib]System.Collections.Generic.List`1::RemoveAt(int32) - .line 89,89 : 9,10 '' + .line 101,101 : 9,10 '' IL_0041: ret } // end of method TextToSpeak::speak @@ -36767,14 +36842,14 @@ [1] class [mscorlib]System.Collections.ObjectModel.ReadOnlyCollection`1 voices, [2] class [System.Speech]System.Speech.Synthesis.InstalledVoice item, [3] class [mscorlib]System.Collections.Generic.IEnumerator`1 CS$5$0000) - .line 97,97 : 13,51 '' + .line 109,109 : 13,51 '' IL_0000: newobj instance void class [mscorlib]System.Collections.Generic.List`1::.ctor() IL_0005: stloc.0 - .line 98,98 : 13,102 '' + .line 110,110 : 13,102 '' IL_0006: newobj instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::.ctor() IL_000b: call instance class [mscorlib]System.Collections.ObjectModel.ReadOnlyCollection`1 [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::GetInstalledVoices() IL_0010: stloc.1 - .line 99,99 : 45,51 '' + .line 111,111 : 45,51 '' IL_0011: ldloc.1 IL_0012: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.ObjectModel.ReadOnlyCollection`1::GetEnumerator() IL_0017: stloc.3 @@ -36782,17 +36857,17 @@ { IL_0018: br.s IL_0032 - .line 99,99 : 22,41 '' + .line 111,111 : 22,41 '' IL_001a: ldloc.3 IL_001b: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0020: stloc.2 - .line 101,101 : 17,46 '' + .line 113,113 : 17,46 '' IL_0021: ldloc.0 IL_0022: ldloc.2 IL_0023: callvirt instance class [System.Speech]System.Speech.Synthesis.VoiceInfo [System.Speech]System.Speech.Synthesis.InstalledVoice::get_VoiceInfo() IL_0028: callvirt instance string [System.Speech]System.Speech.Synthesis.VoiceInfo::get_Name() IL_002d: callvirt instance void class [mscorlib]System.Collections.Generic.List`1::Add(!0) - .line 99,99 : 42,44 '' + .line 111,111 : 42,44 '' IL_0032: ldloc.3 IL_0033: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0038: brtrue.s IL_001a @@ -36808,7 +36883,7 @@ IL_003f: ldloc.3 IL_0040: callvirt instance void [mscorlib]System.IDisposable::Dispose() IL_0045: endfinally - .line 103,103 : 13,24 '' + .line 115,115 : 13,24 '' } // end handler IL_0046: ldloc.0 IL_0047: ret @@ -36820,18 +36895,18 @@ // Code size 59 (0x3b) .maxstack 2 .locals init ([0] bool CS$1$0000) - .line 113,113 : 13,29 '' + .line 125,125 : 13,29 '' IL_0000: ldarg.1 IL_0001: ldstr "" IL_0006: call bool [mscorlib]System.String::op_Equality(string, string) IL_000b: brfalse.s IL_000f - .line 114,114 : 17,30 '' + .line 126,126 : 17,30 '' IL_000d: ldc.i4.0 IL_000e: ret - .line 117,117 : 17,45 '' + .line 129,129 : 17,45 '' .try { IL_000f: ldarg.0 @@ -36840,17 +36915,17 @@ IL_0016: callvirt instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::SelectVoice(string) IL_001b: leave.s IL_0022 - .line 119,119 : 13,30 '' + .line 131,131 : 13,30 '' } // end .try catch [mscorlib]System.Exception { IL_001d: pop - .line 121,121 : 17,30 '' + .line 133,133 : 17,30 '' IL_001e: ldc.i4.0 IL_001f: stloc.0 IL_0020: leave.s IL_0039 - .line 123,123 : 13,49 '' + .line 135,135 : 13,49 '' } // end handler IL_0022: ldarg.0 IL_0023: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn @@ -36861,7 +36936,7 @@ string) IL_0038: ret - .line 124,124 : 9,10 '' + .line 136,136 : 9,10 '' IL_0039: ldloc.0 IL_003a: ret } // end of method TextToSpeak::setVoice @@ -36871,7 +36946,7 @@ { // Code size 38 (0x26) .maxstack 8 - .line 133,133 : 13,44 '' + .line 145,145 : 13,44 '' IL_0000: ldarg.1 IL_0001: ldc.i4.s 100 IL_0003: bgt.s IL_0009 @@ -36880,16 +36955,16 @@ IL_0006: ldc.i4.0 IL_0007: bge.s IL_000b - .line 134,134 : 17,30 '' + .line 146,146 : 17,30 '' IL_0009: ldc.i4.0 IL_000a: ret - .line 135,135 : 13,38 '' + .line 147,147 : 13,38 '' IL_000b: ldarg.0 IL_000c: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn IL_0011: ldarg.1 IL_0012: callvirt instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::set_Volume(int32) - .line 136,136 : 13,46 '' + .line 148,148 : 13,46 '' IL_0017: ldarg.0 IL_0018: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn IL_001d: callvirt instance int32 [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::get_Volume() @@ -36903,7 +36978,7 @@ { // Code size 49 (0x31) .maxstack 8 - .line 146,146 : 13,40 '' + .line 158,158 : 13,40 '' IL_0000: ldarg.1 IL_0001: ldc.i4.s 100 IL_0003: bgt.s IL_0009 @@ -36912,26 +36987,26 @@ IL_0006: ldc.i4.0 IL_0007: bge.s IL_000b - .line 147,147 : 17,30 '' + .line 159,159 : 17,30 '' IL_0009: ldc.i4.0 IL_000a: ret - .line 148,148 : 13,29 '' + .line 160,160 : 13,29 '' IL_000b: ldarg.1 IL_000c: ldc.i4.5 IL_000d: div IL_000e: starg.s rate - .line 149,149 : 13,30 '' + .line 161,161 : 13,30 '' IL_0010: ldarg.1 IL_0011: ldc.i4.s 10 IL_0013: sub IL_0014: starg.s rate - .line 150,150 : 13,34 '' + .line 162,162 : 13,34 '' IL_0016: ldarg.0 IL_0017: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn IL_001c: ldarg.1 IL_001d: callvirt instance void [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::set_Rate(int32) - .line 151,151 : 13,42 '' + .line 163,163 : 13,42 '' IL_0022: ldarg.0 IL_0023: ldfld class [System.Speech]System.Speech.Synthesis.SpeechSynthesizer Speak.TTS.TextToSpeak::syn IL_0028: callvirt instance int32 [System.Speech]System.Speech.Synthesis.SpeechSynthesizer::get_Rate() @@ -36945,7 +37020,7 @@ { // Code size 2 (0x2) .maxstack 8 - .line 162,162 : 13,25 '' + .line 174,174 : 13,25 '' IL_0000: ldc.i4.1 IL_0001: ret } // end of method TextToSpeak::setPitch @@ -36955,15 +37030,15 @@ { // Code size 19 (0x13) .maxstack 8 - .line 167,167 : 13,39 '' + .line 179,179 : 13,39 '' IL_0000: ldarg.0 IL_0001: ldfld class [mscorlib]System.Threading.Thread Speak.TTS.TextToSpeak::workerThread IL_0006: callvirt instance void [mscorlib]System.Threading.Thread::Abort() - .line 168,168 : 13,33 '' + .line 180,180 : 13,33 '' IL_000b: ldarg.0 IL_000c: ldc.i4.0 IL_000d: stfld bool Speak.TTS.TextToSpeak::runner - .line 169,169 : 9,10 '' + .line 181,181 : 9,10 '' IL_0012: ret } // end of method TextToSpeak::Stop @@ -38530,7 +38605,7 @@ valuetype [Hyphen]Virtuoso.Miranda.Plugins.Native.StringEncoding) .line 55,55 : 13,90 '' IL_0009: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_000e: ldsfld string Speak.Structs.API::MS_UTILS_OPENURL + IL_000e: ldstr "Utils/OpenURL" IL_0013: ldc.i4.1 IL_0014: newobj instance void [mscorlib]System.IntPtr::.ctor(int32) IL_0019: ldloc.0 @@ -38554,7 +38629,7 @@ .locals init ([0] int32 ts) .line 61,61 : 13,127 '' IL_0000: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0005: ldsfld string Speak.Structs.API::MS_DB_TIME_TIMESTAMPTOLOCAL + IL_0005: ldstr "DB/Time/TimestampToLocal" IL_000a: ldarg.0 IL_000b: newobj instance void [mscorlib]System.UIntPtr::.ctor(uint32) IL_0010: ldsfld native int [mscorlib]System.IntPtr::Zero @@ -38598,7 +38673,7 @@ IL_0013: stloc.2 .line 71,71 : 13,96 '' IL_0014: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_0019: ldsfld string Speak.Structs.API::MS_PROTO_ENUMPROTOCOLS + IL_0019: ldstr "Proto/EnumProtocols" IL_001e: ldloc.1 IL_001f: ldloc.2 IL_0020: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, @@ -38720,7 +38795,7 @@ IL_0000: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() IL_0005: ldstr "{0}{1}" IL_000a: ldarg.0 - IL_000b: ldsfld string Speak.Structs.API::PS_GETSTATUS + IL_000b: ldstr "/GetStatus" IL_0010: call string [mscorlib]System.String::Format(string, object, object) @@ -38754,7 +38829,7 @@ IL_0009: stloc.1 .line 111,111 : 13,106 '' IL_000a: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_000f: ldsfld string Speak.Structs.API::MS_MSG_GETWINDOWCLASS + IL_000f: ldstr "MessageAPI/WindowClass" IL_0014: ldloc.1 IL_0015: ldloc.0 IL_0016: newobj instance void [mscorlib]System.IntPtr::.ctor(int32) @@ -38923,7 +38998,7 @@ .line 152,152 : 21,140 '' IL_0035: call class [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::get_Current() - IL_003a: ldsfld string Speak.Structs.API::MS_SYSTEM_GETVERSION + IL_003a: ldstr "Miranda/System/GetVersion" IL_003f: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0044: ldsfld native int [mscorlib]System.IntPtr::Zero IL_0049: callvirt instance int32 [Hyphen]Virtuoso.Miranda.Plugins.Infrastructure.MirandaContext::CallService(string, diff --git a/Out/Plugins/Speak.master.XML b/Out/Plugins/Speak.master.XML index 441df3d..3d0b502 100644 --- a/Out/Plugins/Speak.master.XML +++ b/Out/Plugins/Speak.master.XML @@ -965,16 +965,16 @@ MainClass of Speak - - - Run after the Plugin Initialisation - - Get Version + + + Run after the Plugin Initialisation + + Get Author diff --git a/Out/Plugins/Speak.master.dll b/Out/Plugins/Speak.master.dll index f07c210..f066fc8 100644 Binary files a/Out/Plugins/Speak.master.dll and b/Out/Plugins/Speak.master.dll differ diff --git a/Out/Plugins/Speak.master.pdb b/Out/Plugins/Speak.master.pdb index 52abf28..5298aa9 100644 Binary files a/Out/Plugins/Speak.master.pdb and b/Out/Plugins/Speak.master.pdb differ diff --git a/Out/Plugins/XML/Speak.master.XML b/Out/Plugins/XML/Speak.master.XML index 441df3d..3d0b502 100644 --- a/Out/Plugins/XML/Speak.master.XML +++ b/Out/Plugins/XML/Speak.master.XML @@ -965,16 +965,16 @@ MainClass of Speak - - - Run after the Plugin Initialisation - - Get Version + + + Run after the Plugin Initialisation + + Get Author diff --git a/Speak/Speak/MainClass.cs b/Speak/Speak/MainClass.cs index 64fff38..efdb68a 100644 --- a/Speak/Speak/MainClass.cs +++ b/Speak/Speak/MainClass.cs @@ -22,7 +22,14 @@ namespace Speak /// public class MainClass : StandalonePlugin { + /// + /// Get Version + /// + public const String VERSION = "1.0.1.1"; + private Options option; + private DateTime status_pause = DateTime.Now; + private Dictionary statusmodes = new Dictionary(); private MainClass() { @@ -42,14 +49,46 @@ namespace Speak EventManager.CreateEventHook(API.ME_OPT_INITIALISE, this.option.Opts, this); EventManager.CreateEventHook(API.ME_DB_EVENT_ADDED, Message, this); EventManager.CreateEventHook(API.ME_DB_CONTACT_SETTINGCHANGED, StatusChange, this); + Protocol.StatusChanged += StatusModeChange; SpeakWelcome(); } + private bool StatusModeChange(object sender, ProtocolStatusChangeEventArgs e) + { + StatusMode old = StatusMode.Offline; + StatusMode neu = e.NewStatus; + if (statusmodes.ContainsKey(e.Protocol.Name)) + { + old = statusmodes[e.Protocol.Name]; + statusmodes[e.Protocol.Name] = neu; + } + else + { + statusmodes.Add(e.Protocol.Name, neu); + } + if (!Settings.getInstance().getActiveConnect()) + { + if (old == StatusMode.Offline && neu != StatusMode.Offline) + { + this.status_pause = DateTime.Now.AddSeconds(5); + } + } + if (!Settings.getInstance().getActiveDisconnect()) + { + if (old != StatusMode.Offline && neu == StatusMode.Offline) + { + this.status_pause = DateTime.Now.AddSeconds(5); + } + } + return true; + } + protected override void BeforePluginDisable() { EventManager.RemoveEventHook(API.ME_OPT_INITIALISE, this); EventManager.RemoveEventHook(API.ME_DB_EVENT_ADDED, this); EventManager.RemoveEventHook(API.ME_DB_CONTACT_SETTINGCHANGED, this); + Protocol.StatusChanged -= null; TextToSpeak.getInstance().Stop(); } @@ -84,9 +123,12 @@ namespace Speak { if (s.canStatusRead(c.UniqueID.ToString())) { - TextToSpeak tts = TextToSpeak.getInstance(); - string text = String.Format(s.getStatusString(c.Status), c.DisplayName, c.Status.ToString()); - tts.speak(text, text + DateTime.Now.Ticks.ToString()); + if (status_pause <= DateTime.Now) + { + TextToSpeak tts = TextToSpeak.getInstance(); + string text = String.Format(s.getStatusString(c.Status), c.DisplayName, c.Status.ToString()); + tts.speak(text, text + DateTime.Now.Ticks.ToString()); + } } } return 0; @@ -124,18 +166,13 @@ namespace Speak { try { - Update update = new Update(this, new Uri(this.HomePage.ToString() + "files/miranda/speak_last.zip"), new Uri(this.HomePage.ToString() + "files/miranda/speak_updater_version.txt"), " "); + Update update = new Update(this, new Uri(this.HomePage.ToString() + "files/speak_last.zip"), new Uri(this.HomePage.ToString() + "files/speak_updater_version.txt"), " "); UpdaterPlugin.RegisterForUpdate(update); } catch (NotSupportedException) { } } #region Constants - /// - /// Get Version - /// - private static Version VERSION = new Version(0, 8, 0, 0); - /// /// Get Author /// @@ -165,7 +202,7 @@ namespace Speak /// public override Uri HomePage { - get { return new Uri("http://dev.blubbfish.net"); } + get { return new Uri("http://miranda.blubbfish.net"); } } /// @@ -181,7 +218,7 @@ namespace Speak /// public override Version Version { - get { return VERSION; } + get { return new Version(VERSION); } } /// diff --git a/Speak/Speak/Properties/AssemblyInfo.cs b/Speak/Speak/Properties/AssemblyInfo.cs index cb4680c..789dd2a 100644 --- a/Speak/Speak/Properties/AssemblyInfo.cs +++ b/Speak/Speak/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion(Speak.MainClass.VERSION)] +[assembly: AssemblyFileVersion(Speak.MainClass.VERSION)] diff --git a/Speak/Speak/Speak.csproj b/Speak/Speak/Speak.csproj index 07c48c8..99334e5 100644 --- a/Speak/Speak/Speak.csproj +++ b/Speak/Speak/Speak.csproj @@ -28,7 +28,7 @@ pdbonly true - E:\Programme\Miranda\Plugins\ + ..\..\Out\Plugins\ TRACE prompt 4 diff --git a/Speak/Speak/Storage/Settings.cs b/Speak/Speak/Storage/Settings.cs index 0dd7a39..9099110 100644 --- a/Speak/Speak/Storage/Settings.cs +++ b/Speak/Speak/Storage/Settings.cs @@ -156,5 +156,17 @@ namespace Speak.Storage } return "{0} ist {1}"; } + + public bool getActiveConnect() + { + return Options.readDBBool("active_connect", "speak_config", false); + /*SetCheckState(hWnd, IDI_ANNOUNCE_DISCONNECT, ); + SetCheckState(hWnd, IDI_ANNOUNCE_SHUTDOWN, readDBBool("active_shutdown", "speak_config"));*/ + } + + public bool getActiveDisconnect() + { + return Options.readDBBool("active_disconnect", "speak_config", false); + } } } diff --git a/Speak/Speak/Structs/API.cs b/Speak/Speak/Structs/API.cs index 7d999a5..21ce114 100644 --- a/Speak/Speak/Structs/API.cs +++ b/Speak/Speak/Structs/API.cs @@ -4,76 +4,77 @@ namespace Speak.Structs { internal static class API { - public static string MS_SYSTEM_GETVERSION = "Miranda/System/GetVersion"; + public const string MS_SYSTEM_GETVERSION = "Miranda/System/GetVersion"; - public static string MS_DB_EVENT_ADD = "DB/Event/Add"; - public static string MS_DB_EVENT_GET = "DB/Event/Get"; - public static string MS_DB_EVENT_DELETE = "DB/Event/Delete"; - public static string MS_DB_EVENT_GETBLOBSIZE = "DB/Event/GetBlobSize"; - public static string MS_DB_TIME_TIMESTAMPTOLOCAL = "DB/Time/TimestampToLocal"; + public const string MS_DB_EVENT_ADD = "DB/Event/Add"; + public const string MS_DB_EVENT_GET = "DB/Event/Get"; + public const string MS_DB_EVENT_DELETE = "DB/Event/Delete"; + public const string MS_DB_EVENT_GETBLOBSIZE = "DB/Event/GetBlobSize"; + public const string MS_DB_TIME_TIMESTAMPTOLOCAL = "DB/Time/TimestampToLocal"; - public static string MS_PROTO_ADDTOCONTACT = "Proto/AddToContact"; - public static string MS_PROTO_ISPROTOONCONTACT = "Proto/IsProtoOnContact"; - public static string MS_PROTO_REGISTERMODULE = "Proto/RegisterModule"; - public static string MS_PROTO_CHAINSEND = "Proto/ChainSend"; - public static string MS_PROTO_CHAINRECV = "Proto/ChainRecv"; - public static string MS_PROTO_CALLCONTACTSERVICE = "Proto/CallContactService"; - public static string MS_PROTO_GETCONTACTBASEPROTO = "Proto/GetContactBaseProto"; + public const string MS_PROTO_ADDTOCONTACT = "Proto/AddToContact"; + public const string MS_PROTO_ISPROTOONCONTACT = "Proto/IsProtoOnContact"; + public const string MS_PROTO_REGISTERMODULE = "Proto/RegisterModule"; + public const string MS_PROTO_CHAINSEND = "Proto/ChainSend"; + public const string MS_PROTO_CHAINRECV = "Proto/ChainRecv"; + public const string MS_PROTO_CALLCONTACTSERVICE = "Proto/CallContactService"; + public const string MS_PROTO_GETCONTACTBASEPROTO = "Proto/GetContactBaseProto"; - public static string PS_SETSTATUS = "/SetStatus"; - public static string PS_GETSTATUS = "/GetStatus"; + public const string PS_SETSTATUS = "/SetStatus"; + public const string PS_GETSTATUS = "/GetStatus"; - public static string PSR_MESSAGE = "/RecvMessage"; - public static string PSR_MESSAGEW = "/RecvMessageW"; - public static string PSS_MESSAGE = "/SendMsg"; - public static string PSS_MESSAGEW = "/SendMsgW"; // instant send msg + public const string PSR_MESSAGE = "/RecvMessage"; + public const string PSR_MESSAGEW = "/RecvMessageW"; + public const string PSS_MESSAGE = "/SendMsg"; + public const string PSS_MESSAGEW = "/SendMsgW"; // instant send msg - public static string MS_MSG_SENDMESSAGE = "SRMsg/SendCommand"; // type msg - public static string ME_MSG_WINDOWEVENT = "MessageAPI/WindowEvent"; + public const string MS_MSG_SENDMESSAGE = "SRMsg/SendCommand"; // type msg + public const string ME_MSG_WINDOWEVENT = "MessageAPI/WindowEvent"; - public static string MS_SKIN2_ADDICON = "Skin2/Icons/AddIcon"; - public static string MS_SKIN2_GETICON = "Skin2/Icons/GetIcon"; - public static string MS_SKIN2_GETICONBYHANDLE = "Skin2/Icons/GetIconByHandle"; - public static string ME_SKIN2_ICONSCHANGED = "Skin2/IconsChanged"; + public const string MS_SKIN2_ADDICON = "Skin2/Icons/AddIcon"; + public const string MS_SKIN2_GETICON = "Skin2/Icons/GetIcon"; + public const string MS_SKIN2_GETICONBYHANDLE = "Skin2/Icons/GetIconByHandle"; + public const string ME_SKIN2_ICONSCHANGED = "Skin2/IconsChanged"; - public static string MS_BB_ADDBUTTON = "TabSRMM/ButtonsBar/AddButton"; - public static string MS_BB_REMOVEBUTTON = "TabSRMM/ButtonsBar/RemoveButton"; - public static string MS_BB_GETBUTTONSTATE = "TabSRMM/ButtonsBar/GetButtonState"; - public static string MS_BB_SETBUTTONSTATE = "TabSRMM/ButtonsBar/SetButtonState"; - public static string ME_MSG_TOOLBARLOADED = "TabSRMM/ButtonsBar/ModuleLoaded"; - public static string ME_MSG_BUTTONPRESSED = "TabSRMM/ButtonsBar/ButtonPressed"; + public const string MS_BB_ADDBUTTON = "TabSRMM/ButtonsBar/AddButton"; + public const string MS_BB_REMOVEBUTTON = "TabSRMM/ButtonsBar/RemoveButton"; + public const string MS_BB_GETBUTTONSTATE = "TabSRMM/ButtonsBar/GetButtonState"; + public const string MS_BB_SETBUTTONSTATE = "TabSRMM/ButtonsBar/SetButtonState"; + public const string ME_MSG_TOOLBARLOADED = "TabSRMM/ButtonsBar/ModuleLoaded"; + public const string ME_MSG_BUTTONPRESSED = "TabSRMM/ButtonsBar/ButtonPressed"; - public static string ME_IEVIEW_OPTIONSCHANGED = "IEVIEW/OptionsChanged"; - public static string ME_DB_CONTACT_SETTINGCHANGED = "DB/Contact/SettingChanged"; + public const string ME_IEVIEW_OPTIONSCHANGED = "IEVIEW/OptionsChanged"; + public const string ME_DB_CONTACT_SETTINGCHANGED = "DB/Contact/SettingChanged"; - public static string ME_DB_EVENT_ADDED = "DB/Event/Added"; + public const string ME_DB_EVENT_ADDED = "DB/Event/Added"; - public static string MS_UTILS_OPENURL = "Utils/OpenURL"; + public const string MS_UTILS_OPENURL = "Utils/OpenURL"; - public static string ME_OPT_INITIALISE = "Opt/Initialise"; - public static string MS_OPT_ADDPAGE = "Opt/AddPage"; + public const string ME_OPT_INITIALISE = "Opt/Initialise"; + public const string MS_OPT_ADDPAGE = "Opt/AddPage"; - public static string MS_GC_NEWSESSION = "GChat/NewChat"; + public const string MS_GC_NEWSESSION = "GChat/NewChat"; - public static string MS_MSG_GETWINDOWCLASS = "MessageAPI/WindowClass"; + public const string MS_MSG_GETWINDOWCLASS = "MessageAPI/WindowClass"; - public static string MS_PROTO_ENUMPROTOS = "Proto/EnumProtos"; - public static string MS_PROTO_ENUMPROTOCOLS = "Proto/EnumProtocols"; - public static string MS_PROTO_ENUMACCOUNTS = "Proto/EnumAccounts"; + public const string MS_PROTO_ENUMPROTOS = "Proto/EnumProtos"; + public const string MS_PROTO_ENUMPROTOCOLS = "Proto/EnumProtocols"; + public const string MS_PROTO_ENUMACCOUNTS = "Proto/EnumAccounts"; - public static string MS_IEVIEW_WINDOW = "IEVIEW/NewWindow"; + public const string MS_IEVIEW_WINDOW = "IEVIEW/NewWindow"; - public static string ME_HPP_RICHEDIT_ITEMPROCESS = "History++/RichEdit/ItemProcessEvent"; - public static string MS_HPP_EG_WINDOW = "History++/ExtGrid/NewWindow"; - public static string MS_HPP_GETVERSION = "History++/GetVersion"; + public const string ME_HPP_RICHEDIT_ITEMPROCESS = "History++/RichEdit/ItemProcessEvent"; + public const string MS_HPP_EG_WINDOW = "History++/ExtGrid/NewWindow"; + public const string MS_HPP_GETVERSION = "History++/GetVersion"; - public static string MS_DB_GETPROFILEPATH = "DB/GetProfilePath"; - public static string MS_DB_GETPROFILENAME = "DB/GetProfileName"; + public const string MS_DB_GETPROFILEPATH = "DB/GetProfilePath"; + public const string MS_DB_GETPROFILENAME = "DB/GetProfileName"; - public static Int32 CALLSERVICE_NOTFOUND = unchecked((int) 0x80000000); - public static string MS_DB_CONTACT_FINDFIRST = "DB/Contact/FindFirst"; - public static string MS_DB_CONTACT_FINDNEXT = "DB/Contact/FindNext"; + public const Int32 CALLSERVICE_NOTFOUND = unchecked((int)0x80000000); + public const string MS_DB_CONTACT_FINDFIRST = "DB/Contact/FindFirst"; + public const string MS_DB_CONTACT_FINDNEXT = "DB/Contact/FindNext"; + public const string ME_CLIST_STATUSMODECHANGE = "CList/StatusModeChange"; } diff --git a/Speak/Speak/TTS/TextToSpeak.cs b/Speak/Speak/TTS/TextToSpeak.cs index 5d5196a..8ba39cd 100644 --- a/Speak/Speak/TTS/TextToSpeak.cs +++ b/Speak/Speak/TTS/TextToSpeak.cs @@ -56,11 +56,23 @@ namespace Speak.TTS { try { - syn.Speak(text); + this.syn.Speak(text); + } + catch (OutOfMemoryException) + { + string voice = this.syn.Voice.Name; + int vol = this.syn.Volume; + int rate = this.syn.Rate; + this.syn = null; + this.syn = new SpeechSynthesizer(); + this.setVoice(voice); + this.setVolume(vol); + this.setRate(rate); + quene.Enqueue(text); } catch (Exception e) { - System.Windows.Forms.MessageBox.Show(e.Message, e.Source, System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error); + System.Windows.Forms.MessageBox.Show(e.ToString(), "Fehler in: " + e.Source, System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error); } } else diff --git a/library/Managed/AutoConnect.dll b/library/Managed/AutoConnect.dll new file mode 100644 index 0000000..fdb40b5 Binary files /dev/null and b/library/Managed/AutoConnect.dll differ