February 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7676 - in freeswitch/trunk: . w32/Setup
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: mikej Date: Mon Feb 18 15:06:32 2008 New Revision: 7676 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/w32/Setup/Setup.vdproj Log: remove mod_l16 Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Mon Feb 18 15:06:32 2008 @@ -420,11 +420,6 @@ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.2008.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" - ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.2008.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} @@ -902,12 +897,6 @@ {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32 {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32 {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.ActiveCfg = Release|Win32 - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.ActiveCfg = Debug|Win32 - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.Build.0 = Debug|Win32 - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|x64.ActiveCfg = Debug|Win32 - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.ActiveCfg = Release|Win32 - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.Build.0 = Release|Win32 - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|x64.ActiveCfg = Release|Win32 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.ActiveCfg = Debug|Win32 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.Build.0 = Debug|Win32 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1438,7 +1427,6 @@ EndGlobalSection GlobalSection(NestedProjects) = preSolution {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {5580D60E-0F77-4716-9CD4-B8E5986FA375} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Mon Feb 18 15:06:32 2008 @@ -39,12 +39,6 @@ } "Entry" { - "MsmKey" = "8:_1273F63008CF585CA0E063E436B4646F" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -315,12 +309,6 @@ } "Entry" { - "MsmKey" = "8:_6A4CAD73F43678BF7C05E8FB41042F74" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6AA8D6AF639F4E6B92D28A7E0D13FD5E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -351,6 +339,12 @@ } "Entry" { + "MsmKey" = "8:_6F8DFC8A13F8FBD652D79C0AC6E60740" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_71028B90842B4A0C8AF05F2C2519A7D8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -393,608 +387,596 @@ } "Entry" { - "MsmKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7CFCCDD9C6694A0498D7CD6CDD285042" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7E46520FEA2B4DA7A90171E3467C29CA" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7F2A5D1B25FD4B109F5E17402117543A" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7FEA1E60C11343F1A98DC33C512051FA" + "MsmKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_80D44DD7FA3C4E3F8D6BB8B4F949F6AF" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7BBFE2768ACD3A62F3874EF99D16C0B8" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_82158C38354740E99D416F1DB58C7E18" + "MsmKey" = "8:_7CFCCDD9C6694A0498D7CD6CDD285042" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_821771D6A597416391F899CD9147F75B" + "MsmKey" = "8:_7E46520FEA2B4DA7A90171E3467C29CA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_83131C9ADB7C4E6C88388D820F720BB5" + "MsmKey" = "8:_7F2A5D1B25FD4B109F5E17402117543A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8471500508034D338D599ED5C35F938F" + "MsmKey" = "8:_7FEA1E60C11343F1A98DC33C512051FA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_860B731FDCC848F79AB8DFD4D03E2A47" + "MsmKey" = "8:_80D44DD7FA3C4E3F8D6BB8B4F949F6AF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_86D8DF7599FF472096D6826044347537" + "MsmKey" = "8:_82158C38354740E99D416F1DB58C7E18" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" + "MsmKey" = "8:_821771D6A597416391F899CD9147F75B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8B53F026686B44189676CBC200E641C1" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8E023477B9DC4126921A556B285B29E5" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_EC4922AEC1064C90B96EBBDD3104D761" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8FB175B8685A47F7BE75E1A025F65693" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_EAF4B051F44745ABA9B58038FB93994C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_90D7F247E8254DE797317F431E3FB010" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_91BA2668F87764F53188E93BC8D363D7" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_E1AA7C5B96DA4A26859D2C7A21E00AB6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92F95219F6434CE3A736526946DA2ABB" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95D01083472B4853AC3F06514558F347" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_970ADC4156DB4B3DBBC2C65E1C41B642" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_98C7D74F78A84DA3B32B460138019AE2" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_991CC352E2204C50ABEDAE5D104B4310" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9B19C40442134D69B533E16D0851D99B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9B429CDF56AE431D975C90AC00A348CD" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_C1036825E1364537B537E542E71F9C0E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9B4D63B995014A0C8AF19FF42616D292" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9ECA16E530634A7582AC80138BDA016B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_B5542B260CD5493395871EFDE833E438" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9FCEC602DF6540E5BC437B8F3CF0F2BC" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A164EF86C4B57E41C8CE77B48F39DAC7" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A3936A2727E73289F5804D5DA006FD0A" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_95D01083472B4853AC3F06514558F347" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AC40F24B3F5140FCAA48FAC397D8BEB0" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_8E023477B9DC4126921A556B285B29E5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_8B53F026686B44189676CBC200E641C1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_5EDFD5418DD243D1A03D882B83BBBCF1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B33F513CD3524D3BB7BD11E035C3B562" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_3DB5A5EF1E624F999BCEA20250508EEA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B34D0605157A4FE2A81F4639019E31BD" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B5542B260CD5493395871EFDE833E438" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_2D9E612823084E3F9E10376A7AC0C476" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B5ADB663C7CE49A1A11E895E4EBB4933" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_2B80DCCD934745B1BB4F0B31099094D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B700A9A1FCA94E5D8C8B08C4FD856669" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_297D0BADB993435092DDB8CDF9F2A3C6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B9EAE14D8B704EFAB8A848C6EF94630A" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BB108A4FE89F4F58BA592B3BD4B89058" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BB649A2C1ABE4895859025B09A240323" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_1777CB4B737E4B8481E25A10950B2B5A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BEADBF5396084C0093E53DF1605856B8" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" + "OwnerKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BF3BA59EA18342C891BD04B0DB279B13" + "MsmKey" = "8:_83131C9ADB7C4E6C88388D820F720BB5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C1036825E1364537B537E542E71F9C0E" + "MsmKey" = "8:_8471500508034D338D599ED5C35F938F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7" + "MsmKey" = "8:_860B731FDCC848F79AB8DFD4D03E2A47" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" + "MsmKey" = "8:_86D8DF7599FF472096D6826044347537" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmKey" = "8:_8B53F026686B44189676CBC200E641C1" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" + "MsmKey" = "8:_8E023477B9DC4126921A556B285B29E5" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_EC4922AEC1064C90B96EBBDD3104D761" + "MsmKey" = "8:_8FB175B8685A47F7BE75E1A025F65693" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_EAF4B051F44745ABA9B58038FB93994C" + "MsmKey" = "8:_90D7F247E8254DE797317F431E3FB010" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" + "MsmKey" = "8:_92F95219F6434CE3A736526946DA2ABB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_E1AA7C5B96DA4A26859D2C7A21E00AB6" + "MsmKey" = "8:_95D01083472B4853AC3F06514558F347" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" + "MsmKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" + "MsmKey" = "8:_970ADC4156DB4B3DBBC2C65E1C41B642" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" + "MsmKey" = "8:_98C7D74F78A84DA3B32B460138019AE2" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" + "MsmKey" = "8:_991CC352E2204C50ABEDAE5D104B4310" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" + "MsmKey" = "8:_9B19C40442134D69B533E16D0851D99B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" + "MsmKey" = "8:_9B429CDF56AE431D975C90AC00A348CD" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_C1036825E1364537B537E542E71F9C0E" + "MsmKey" = "8:_9B4D63B995014A0C8AF19FF42616D292" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" + "MsmKey" = "8:_9ECA16E530634A7582AC80138BDA016B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_B5542B260CD5493395871EFDE833E438" + "MsmKey" = "8:_9FCEC602DF6540E5BC437B8F3CF0F2BC" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" + "MsmKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" + "MsmKey" = "8:_A3936A2727E73289F5804D5DA006FD0A" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" + "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" + "MsmKey" = "8:_AC40F24B3F5140FCAA48FAC397D8BEB0" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_95D01083472B4853AC3F06514558F347" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_8E023477B9DC4126921A556B285B29E5" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_8B53F026686B44189676CBC200E641C1" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" + "MsmKey" = "8:_ADA22D44BCDEBA509E09A5D4C155AA41" + "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_5EDFD5418DD243D1A03D882B83BBBCF1" + "MsmKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmKey" = "8:_B33F513CD3524D3BB7BD11E035C3B562" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" + "MsmKey" = "8:_B34D0605157A4FE2A81F4639019E31BD" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" + "MsmKey" = "8:_B540FA32E4F6382CF1426D13A0A4E6B7" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" + "MsmKey" = "8:_B5542B260CD5493395871EFDE833E438" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_3DB5A5EF1E624F999BCEA20250508EEA" + "MsmKey" = "8:_B5ADB663C7CE49A1A11E895E4EBB4933" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" + "MsmKey" = "8:_B700A9A1FCA94E5D8C8B08C4FD856669" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" + "MsmKey" = "8:_B9EAE14D8B704EFAB8A848C6EF94630A" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_2D9E612823084E3F9E10376A7AC0C476" + "MsmKey" = "8:_BB108A4FE89F4F58BA592B3BD4B89058" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_2B80DCCD934745B1BB4F0B31099094D9" + "MsmKey" = "8:_BB649A2C1ABE4895859025B09A240323" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_297D0BADB993435092DDB8CDF9F2A3C6" + "MsmKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmKey" = "8:_BEADBF5396084C0093E53DF1605856B8" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" + "MsmKey" = "8:_BF3BA59EA18342C891BD04B0DB279B13" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" + "MsmKey" = "8:_BFD1EC957C5DBC08B54E6594C7CC5F91" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_1777CB4B737E4B8481E25A10950B2B5A" + "MsmKey" = "8:_C1036825E1364537B537E542E71F9C0E" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" - "OwnerKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" + "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1065,12 +1047,6 @@ } "Entry" { - "MsmKey" = "8:_D7E82DD20D5B47395F635480C8E3A1D3" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1161,8 +1137,8 @@ } "Entry" { - "MsmKey" = "8:_EF8AEAED91BC475C8B67BC0EBBF87258" - "OwnerKey" = "8:_C4908CD1D76D499A8A801FB03E9D3813" + "MsmKey" = "8:_EF984FFB52F04D54AD4E867B46FAF92B" + "OwnerKey" = "8:_821856BEB53D46F2B72E73E39296C4F5" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2036,26 +2012,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A4CAD73F43678BF7C05E8FB41042F74" - { - "SourcePath" = "8:libteletone.dll" - "TargetName" = "8:libteletone.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6AA8D6AF639F4E6B92D28A7E0D13FD5E" { "SourcePath" = "8:..\\..\\conf\\dialplan\\extensions\\sipphone.com.noload" @@ -2136,6 +2092,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6F8DFC8A13F8FBD652D79C0AC6E60740" + { + "SourcePath" = "8:libapriconv.dll" + "TargetName" = "8:libapriconv.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_71028B90842B4A0C8AF05F2C2519A7D8" { "SourcePath" = "8:..\\..\\conf\\lang\\en\\vm\\tts.xml" @@ -2276,6 +2252,46 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + { + "SourcePath" = "8:libapr.dll" + "TargetName" = "8:libapr.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7BBFE2768ACD3A62F3874EF99D16C0B8" + { + "SourcePath" = "8:FreeSwitch.dll" + "TargetName" = "8:FreeSwitch.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7CFCCDD9C6694A0498D7CD6CDD285042" { "SourcePath" = "8:..\\..\\conf\\lang\\de\\de.xml" @@ -2496,26 +2512,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_879085EF680EFDF6242DCB77439EC825" - { - "SourcePath" = "8:libapr.dll" - "TargetName" = "8:libapr.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8FB175B8685A47F7BE75E1A025F65693" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\limit.conf.xml" @@ -2556,26 +2552,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_91BA2668F87764F53188E93BC8D363D7" - { - "SourcePath" = "8:libapriconv.dll" - "TargetName" = "8:libapriconv.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_92F95219F6434CE3A736526946DA2ABB" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\event_socket.conf.xml" @@ -2736,26 +2712,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A164EF86C4B57E41C8CE77B48F39DAC7" - { - "SourcePath" = "8:libaprutil.dll" - "TargetName" = "8:libaprutil.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3936A2727E73289F5804D5DA006FD0A" { "SourcePath" = "8:RPCRT4.dll" @@ -2856,6 +2812,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B540FA32E4F6382CF1426D13A0A4E6B7" + { + "SourcePath" = "8:libteletone.dll" + "TargetName" = "8:libteletone.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B5ADB663C7CE49A1A11E895E4EBB4933" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\zeroconf.conf.xml" @@ -2976,6 +2952,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BFD1EC957C5DBC08B54E6594C7CC5F91" + { + "SourcePath" = "8:libaprutil.dll" + "TargetName" = "8:libaprutil.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C7E9135AE3874E19809A03F02CCC15C9" { "SourcePath" = "8:..\\..\\conf\\jingle_profiles\\server.noload" @@ -3096,26 +3092,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D7E82DD20D5B47395F635480C8E3A1D3" - { - "SourcePath" = "8:FreeSwitch.dll" - "TargetName" = "8:FreeSwitch.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD54C8F25D0546E199ADB3C4B40EA20B" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\conference.conf.xml" @@ -4305,11 +4281,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C4908CD1D76D499A8A801FB03E9D3813" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_821856BEB53D46F2B72E73E39296C4F5" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" "Properties" { } @@ -4319,11 +4295,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EF8AEAED91BC475C8B67BC0EBBF87258" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EF984FFB52F04D54AD4E867B46FAF92B" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" "Properties" { } @@ -4338,7 +4314,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0772289C2CC6435396616D7A2C407EA2" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_voicemail.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_voicemail.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4366,7 +4342,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_166BDBE308F54EE4881DA68F2A8189F5" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_enum.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_enum.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4394,7 +4370,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1777CB4B737E4B8481E25A10950B2B5A" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_native_file.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_native_file.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4422,7 +4398,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1CFB1AB04E024FC993E0EB4859DF8408" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dingaling.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dingaling.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4450,7 +4426,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2814E641538B42EFA83525986A9D5AC1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_ilbc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_ilbc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4478,7 +4454,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_28FBC5A60B44423B8A2CC378347483CE" { - "SourcePath" = "8:..\\..\\Debug\\libapr.dll" + "SourcePath" = "8:..\\..\\Release\\libapr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4506,7 +4482,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_297D0BADB993435092DDB8CDF9F2A3C6" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_cdr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_cdr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4534,7 +4510,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2B80DCCD934745B1BB4F0B31099094D9" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_say_en.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_say_en.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4562,7 +4538,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2D9E612823084E3F9E10376A7AC0C476" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g723_1.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_g723_1.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4590,7 +4566,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2F2FEC549F02436EB87961BD1B9E5783" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_iax.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_iax.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4618,7 +4594,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_318FCC99E8D143D6B4F9F534E63009B3" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_sndfile.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_sndfile.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4646,7 +4622,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3DB5A5EF1E624F999BCEA20250508EEA" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_fifo.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_fifo.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4674,7 +4650,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E37631016BC45B2B672FE23257D542B" { - "SourcePath" = "8:..\\..\\Debug\\pthreadVC2.dll" + "SourcePath" = "8:..\\..\\Release\\pthreadVC2.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4702,7 +4678,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3FBEFE0119944C6781F81104ECEF37CA" { - "SourcePath" = "8:..\\..\\Debug\\libapriconv.dll" + "SourcePath" = "8:..\\..\\Release\\libapriconv.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4730,7 +4706,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4A285D260C3748A4BEFA6E5A9004D128" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4758,7 +4734,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_59CFED0C4EC0492C945E4EBC04FE965F" { - "SourcePath" = "8:..\\..\\Debug\\libaprutil.dll" + "SourcePath" = "8:..\\..\\Release\\libaprutil.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4786,7 +4762,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5EDFD5418DD243D1A03D882B83BBBCF1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_esf.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_esf.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4814,7 +4790,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6E5C001E7A314DCEA0A4BF52BF74BCAD" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_speex.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_speex.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4842,7 +4818,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7B1050643E1E48A3B67B281B4AD43904" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g729.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_g729.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4870,7 +4846,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8B53F026686B44189676CBC200E641C1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_amr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_amr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4898,7 +4874,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E023477B9DC4126921A556B285B29E5" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_socket.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_socket.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4926,7 +4902,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_95D01083472B4853AC3F06514558F347" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_teletone.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_teletone.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4954,7 +4930,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_96F8F7DE89C74DC399E8AE55C22B4F15" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_curl.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_curl.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4982,7 +4958,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9B19C40442134D69B533E16D0851D99B" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_odbc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_odbc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5010,7 +4986,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A0D5F714A0F94250A1C39603B699AB82" { - "SourcePath" = "8:..\\..\\Debug\\libteletone.dll" + "SourcePath" = "8:..\\..\\Release\\libteletone.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5038,7 +5014,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A944ADCEDF884574A23F7BA5420A6BA1" { - "SourcePath" = "8:..\\..\\libs\\win32\\sqlite\\Debug\\libsqlite.lib" + "SourcePath" = "8:..\\..\\libs\\win32\\sqlite\\Release\\sqlite.lib" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5064,37 +5040,9 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" - { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_l16.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_conference.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_conference.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5122,7 +5070,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B5542B260CD5493395871EFDE833E438" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_openmrcp.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_openmrcp.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5150,7 +5098,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BB649A2C1ABE4895859025B09A240323" { - "SourcePath" = "8:..\\..\\libs\\win32\\pcre\\Debug\\libpcre.lib" + "SourcePath" = "8:..\\..\\libs\\win32\\pcre\\Release\\libpcre.lib" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5178,7 +5126,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BB99CEDF341D40F3976B6D5486D9366D" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_limit.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_limit.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5206,7 +5154,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1036825E1364537B537E542E71F9C0E" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_event_socket.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_event_socket.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5234,7 +5182,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C105055EE271471A999CE7022E617EB7" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_commands.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_commands.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5262,7 +5210,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C81AC700C1BC4A55B98DF12C0CBAFD6F" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dialplan_xml.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dialplan_xml.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5290,7 +5238,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D0BB09AFB8D94B76918F0EE85BCCAD0A" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dptools.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dptools.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5318,7 +5266,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D1269F1E49D442CF8EAC96C23E60325D" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_rpc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_rpc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5346,7 +5294,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D2EF447106B24E67907DAED3D39CFBB1" { - "SourcePath" = "8:..\\..\\Debug\\FreeSwitch.dll" + "SourcePath" = "8:..\\..\\Release\\FreeSwitch.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5374,7 +5322,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D6F0F5845FAD4707975CE012A33CD607" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_rss.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_rss.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5402,7 +5350,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D7EC5795A9C645AC8E129C2EE6D461ED" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_event_multicast.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_event_multicast.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5430,7 +5378,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E1AA7C5B96DA4A26859D2C7A21E00AB6" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_core_db.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_core_db.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5458,7 +5406,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E763C699DF0948B6984DDEB96A2DFD06" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_PortAudio.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_PortAudio.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5486,7 +5434,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EAF4B051F44745ABA9B58038FB93994C" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_expr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_expr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5514,7 +5462,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EC4922AEC1064C90B96EBBDD3104D761" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_local_stream.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_local_stream.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5542,7 +5490,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EF14CB99F3414BB689D0CB0E6D6B8AB8" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_console.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_console.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5570,7 +5518,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F0B800E719294692A02518CFD8CBAEFF" { - "SourcePath" = "8:..\\..\\Debug\\FreeSwitch.exe" + "SourcePath" = "8:..\\..\\Release\\FreeSwitch.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5598,7 +5546,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB1B9FBDC3294F1C96DAC4246C013C22" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_woomera.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_woomera.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5626,7 +5574,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBB0E565B1DE49CE9C827ACAC337AC5B" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_sofia.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_sofia.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521"

1 0

[commit] r7675 - freeswitch/trunk/debian
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: cypromis Date: Mon Feb 18 15:04:48 2008 New Revision: 7675 Modified: freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Log: preparing for voipcodecs libvrary Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Feb 18 15:04:48 2008 @@ -5,13 +5,11 @@ opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_expr.so* opt/freeswitch/mod/mod_rss.so* -opt/freeswitch/mod/mod_gsm.so* opt/freeswitch/mod/mod_h26x.so* opt/freeswitch/mod/mod_voicemail.so* opt/freeswitch/mod/mod_limit.so* opt/freeswitch/mod/mod_ilbc.so* opt/freeswitch/mod/mod_speex.so* -opt/freeswitch/mod/mod_l16.so* opt/freeswitch/mod/mod_esf.so* opt/freeswitch/mod/mod_logfile.so* opt/freeswitch/mod/mod_syslog.so* @@ -21,9 +19,7 @@ opt/freeswitch/mod/mod_enum.so* opt/freeswitch/mod/mod_fifo.so* opt/freeswitch/mod/mod_openmrcp.so* -opt/freeswitch/mod/mod_g711.so* -opt/freeswitch/mod/mod_g722.so* -opt/freeswitch/mod/mod_g726.so* +opt/freeswitch/mod/mod_voipcodecs.so* opt/freeswutch/mod/mod_speex.so* opt/freeswitch/mod/mod_dialplan*.so* opt/freeswitch/mod/mod_dingaling.so* Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Mon Feb 18 15:04:48 2008 @@ -11,7 +11,7 @@ export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail export ASR_TTS_MODULES=asr_tts/mod_openmrcp -export CODECS_MODULES=codecs/mod_g711 codecs/mod_g722 codecs/mod_g726 codecs/mod_gsm codecs/mod_ilbc codecs/mod_h26x codecs/mod_l16 codecs/mod_speex +export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex mod_voipcodecs export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml export DIRECTORIES_MODULES= export DOTNET_MODULES= @@ -22,7 +22,7 @@ export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr export TIMERS_MODULES= -export DISABLED_MODULES=applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl +export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl export XML_INT_MODULES=xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES) export MODULES=$(MYMODULES)

1 0

[commit] r7673 - freeswitch/trunk/src/mod
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: anthm Date: Mon Feb 18 14:58:29 2008 New Revision: 7673 Modified: freeswitch/trunk/src/mod/Makefile.am Log: update Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Mon Feb 18 14:58:29 2008 @@ -15,7 +15,8 @@ fi ; \ fi ; \ if test -z "$$target" ; then target="all" ; fi ; \ - if ! test -d "$$moddir" ; then echo ; echo "WARNING $$moddir does not exist, skipping" ; else \ + if ! test -f $$moddir/$$modname.c && ! test -f $$moddir/$$modname.cpp ; \ + then echo ; echo "WARNING $$modname is not a valid FreeSWITCH module dir, skipping it....." ; else \ echo ;\ echo making $$target $$modname ;\ (if test -f "$$moddir/Makefile" ; then \

1 0

[commit] r7672 - freeswitch/trunk
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: mikej Date: Mon Feb 18 14:55:55 2008 New Revision: 7672 Modified: freeswitch/trunk/Freeswitch.2008.sln Log: fix msvc 2008 openmrcp build. Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Mon Feb 18 14:55:55 2008 @@ -771,6 +771,7 @@ {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject @@ -855,6 +856,8 @@ {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {CF70F278-3364-4395-A2E1-23501C9B8AD2} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\openmrcp\aprtoolkit\aprtoolkit.2008.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1423,6 +1426,12 @@ {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Release|Win32.ActiveCfg = Release|Win32 {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Release|Win32.Build.0 = Release|Win32 {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Release|x64.ActiveCfg = Release|Win32 + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32 + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32 + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.ActiveCfg = Debug|Win32 + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32 + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32 + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1539,6 +1548,7 @@ {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} {57199684-EC63-4A60-9DC6-11815AF6B413} = {09455AA9-C243-4F16-A1A1-A016881A2765} {2DED4BA2-D6B0-4064-BB2A-76DE3AA49E7C} = {09455AA9-C243-4F16-A1A1-A016881A2765} {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5} = {09455AA9-C243-4F16-A1A1-A016881A2765}

1 0

[commit] r7671 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: anthm Date: Mon Feb 18 14:46:37 2008 New Revision: 7671 Added: freeswitch/trunk/src/switch_pcm.c Log: move L16 and g711 into the core Added: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/switch_pcm.c Mon Feb 18 14:46:37 2008 @@ -0,0 +1,307 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * switch_pcm.c -- Raw and Encoded PCM 16 bit Signed Linear + * + */ + +#include <switch.h> +#include <g711.h> + +SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load); +SWITCH_MODULE_DEFINITION(mod_l16, mod_l16_load, NULL, NULL); + +static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + int encoding, decoding; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { + return SWITCH_STATUS_FALSE; + } else { + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_raw_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + /* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */ + if (codec && other_codec && codec->implementation && other_codec->implementation && + codec->implementation->actual_samples_per_second != other_codec->implementation->actual_samples_per_second) { + memcpy(encoded_data, decoded_data, decoded_data_len); + *encoded_data_len = decoded_data_len; + return SWITCH_STATUS_RESAMPLE; + } + return SWITCH_STATUS_NOOP; +} + +static switch_status_t switch_raw_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + if (codec && other_codec && codec->implementation && other_codec->implementation && + codec->implementation->actual_samples_per_second != other_codec->implementation->actual_samples_per_second) { + memcpy(decoded_data, encoded_data, encoded_data_len); + *decoded_data_len = encoded_data_len; + return SWITCH_STATUS_RESAMPLE; + } + return SWITCH_STATUS_NOOP; +} + +static switch_status_t switch_raw_destroy(switch_codec_t *codec) +{ + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + int encoding, decoding; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { + return SWITCH_STATUS_FALSE; + } else { + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_g711u_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + for (i = 0; i < decoded_data_len / sizeof(short); i++) { + ebuf[i] = linear_to_ulaw(dbuf[i]); + } + + *encoded_data_len = i; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711u_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { + memset(dbuf, 0, codec->implementation->bytes_per_frame); + *decoded_data_len = codec->implementation->bytes_per_frame; + } else { + for (i = 0; i < encoded_data_len; i++) { + dbuf[i] = ulaw_to_linear(ebuf[i]); + } + + *decoded_data_len = i * 2; + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711u_destroy(switch_codec_t *codec) +{ + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t switch_g711a_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + int encoding, decoding; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { + return SWITCH_STATUS_FALSE; + } else { + return SWITCH_STATUS_SUCCESS; + } +} + +static switch_status_t switch_g711a_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + for (i = 0; i < decoded_data_len / sizeof(short); i++) { + ebuf[i] = linear_to_alaw(dbuf[i]); + } + + *encoded_data_len = i; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711a_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, + unsigned int *flag) +{ + short *dbuf; + unsigned char *ebuf; + uint32_t i; + + dbuf = decoded_data; + ebuf = encoded_data; + + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { + memset(dbuf, 0, codec->implementation->bytes_per_frame); + *decoded_data_len = codec->implementation->bytes_per_frame; + } else { + for (i = 0; i < encoded_data_len; i++) { + dbuf[i] = alaw_to_linear(ebuf[i]); + } + + *decoded_data_len = i * 2; + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_g711a_destroy(switch_codec_t *codec) +{ + return SWITCH_STATUS_SUCCESS; +} + + +static void mod_g711_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) +{ + switch_codec_interface_t *codec_interface; + int mpf = 10000, spf = 80, bpf = 160, ebpf = 80, count; + + SWITCH_ADD_CODEC(codec_interface, "G.711 ulaw"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 0, "PCMU", NULL, 8000, 8000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g711u_init, switch_g711u_encode, switch_g711u_decode, switch_g711u_destroy); + } + + SWITCH_ADD_CODEC(codec_interface, "G.711 alaw"); + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 8, "PCMA", NULL, 8000, 8000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g711a_init, switch_g711a_encode, switch_g711a_decode, switch_g711a_destroy); + } + +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load) +{ + switch_codec_interface_t *codec_interface; + int mpf = 10000, spf = 80, bpf = 160, ebpf = 160, bps = 128000, rate = 8000, counta, countb; + switch_payload_t ianacode[4] = { 0, 10, 117, 119 }; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, "PCM"); + SWITCH_ADD_CODEC(codec_interface, "RAW Signed Linear (16 bit)"); + for (counta = 1; counta <= 3; counta++) { + for (countb = 12; countb > 0; countb--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, ianacode[counta], "L16", NULL, rate, rate, bps, + mpf * countb, spf * countb, bpf * countb, ebpf * countb, 1, 1, 12, + switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); + } + rate = rate * 2; + bps = bps * 2; + spf = spf * 2; + bpf = bpf * 2; + ebpf = ebpf * 2; + } + /* these formats below are for file playing. */ + + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 118, "L16", NULL, 22050, 22050, 352800, + 20000, 441, 882, 882, 1, 1, 1, + switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); + + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 118, "L16", NULL, 11025, 11025, 176400, + 40000, 441, 882, 882, 1, 1, 1, + switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); + + /* indicate that the module should continue to be loaded */ + + mod_g711_load(module_interface, pool); + + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r7670 - in freeswitch/trunk: . build src src/include src/mod/codecs/mod_g711 src/mod/codecs/mod_l16 src/mod/codecs/mod_voipcodecs
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: anthm Date: Mon Feb 18 14:43:57 2008 New Revision: 7670 Added: freeswitch/trunk/src/g711.c freeswitch/trunk/src/include/g711.h Removed: freeswitch/trunk/src/mod/codecs/mod_g711/ freeswitch/trunk/src/mod/codecs/mod_l16/ Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/build/modules.conf.in freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c freeswitch/trunk/src/switch_loadable_module.c Log: move L16 and g711 into the core Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Feb 18 14:43:57 2008 @@ -78,6 +78,8 @@ src/switch_time.c\ libs/stfu/stfu.c\ src/switch_cpp.cpp\ +src/g711.c\ +src/switch_pcm.c\ libs/libteletone/src/libteletone_detect.c\ libs/libteletone/src/libteletone_generate.c Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Feb 18 14:43:57 2008 @@ -15,14 +15,12 @@ #applications/mod_rss #asr_tts/mod_cepstral #asr_tts/mod_openmrcp -#codecs/mod_g711 codecs/mod_g723_1 codecs/mod_amr codecs/mod_g729 codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_ilbc -codecs/mod_l16 codecs/mod_speex #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml Added: freeswitch/trunk/src/g711.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/g711.c Mon Feb 18 14:43:57 2008 @@ -0,0 +1,92 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * g711.c - A-law and u-law transcoding routines + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2006 Steve Underwood + * + * Despite my general liking of the GPL, I place this code in the + * public domain for the benefit of all mankind - even the slimy + * ones who might try to proprietize my work and use it to my + * detriment. + * + * $Id: g711.c,v 1.1 2006/06/07 15:46:39 steveu Exp $ + */ + +/*! \file */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <assert.h> +#ifndef _MSC_VER +#include <inttypes.h> +#ifdef HAVE_TGMATH_H +#include <tgmath.h> +#endif +#endif + +#include "g711.h" + +/* Copied from the CCITT G.711 specification */ +static const uint8_t ulaw_to_alaw_table[256] = +{ + 42, 43, 40, 41, 46, 47, 44, 45, 34, 35, 32, 33, 38, 39, 36, 37, + 58, 59, 56, 57, 62, 63, 60, 61, 50, 51, 48, 49, 54, 55, 52, 53, + 10, 11, 8, 9, 14, 15, 12, 13, 2, 3, 0, 1, 6, 7, 4, 26, + 27, 24, 25, 30, 31, 28, 29, 18, 19, 16, 17, 22, 23, 20, 21, 106, + 104, 105, 110, 111, 108, 109, 98, 99, 96, 97, 102, 103, 100, 101, 122, 120, + 126, 127, 124, 125, 114, 115, 112, 113, 118, 119, 116, 117, 75, 73, 79, 77, + 66, 67, 64, 65, 70, 71, 68, 69, 90, 91, 88, 89, 94, 95, 92, 93, + 82, 82, 83, 83, 80, 80, 81, 81, 86, 86, 87, 87, 84, 84, 85, 85, + 170, 171, 168, 169, 174, 175, 172, 173, 162, 163, 160, 161, 166, 167, 164, 165, + 186, 187, 184, 185, 190, 191, 188, 189, 178, 179, 176, 177, 182, 183, 180, 181, + 138, 139, 136, 137, 142, 143, 140, 141, 130, 131, 128, 129, 134, 135, 132, 154, + 155, 152, 153, 158, 159, 156, 157, 146, 147, 144, 145, 150, 151, 148, 149, 234, + 232, 233, 238, 239, 236, 237, 226, 227, 224, 225, 230, 231, 228, 229, 250, 248, + 254, 255, 252, 253, 242, 243, 240, 241, 246, 247, 244, 245, 203, 201, 207, 205, + 194, 195, 192, 193, 198, 199, 196, 197, 218, 219, 216, 217, 222, 223, 220, 221, + 210, 210, 211, 211, 208, 208, 209, 209, 214, 214, 215, 215, 212, 212, 213, 213 +}; + +/* These transcoding tables are copied from the CCITT G.711 specification. To achieve + optimal results, do not change them. */ + +static const uint8_t alaw_to_ulaw_table[256] = +{ + 42, 43, 40, 41, 46, 47, 44, 45, 34, 35, 32, 33, 38, 39, 36, 37, + 57, 58, 55, 56, 61, 62, 59, 60, 49, 50, 47, 48, 53, 54, 51, 52, + 10, 11, 8, 9, 14, 15, 12, 13, 2, 3, 0, 1, 6, 7, 4, 5, + 26, 27, 24, 25, 30, 31, 28, 29, 18, 19, 16, 17, 22, 23, 20, 21, + 98, 99, 96, 97, 102, 103, 100, 101, 93, 93, 92, 92, 95, 95, 94, 94, + 116, 118, 112, 114, 124, 126, 120, 122, 106, 107, 104, 105, 110, 111, 108, 109, + 72, 73, 70, 71, 76, 77, 74, 75, 64, 65, 63, 63, 68, 69, 66, 67, + 86, 87, 84, 85, 90, 91, 88, 89, 79, 79, 78, 78, 82, 83, 80, 81, + 170, 171, 168, 169, 174, 175, 172, 173, 162, 163, 160, 161, 166, 167, 164, 165, + 185, 186, 183, 184, 189, 190, 187, 188, 177, 178, 175, 176, 181, 182, 179, 180, + 138, 139, 136, 137, 142, 143, 140, 141, 130, 131, 128, 129, 134, 135, 132, 133, + 154, 155, 152, 153, 158, 159, 156, 157, 146, 147, 144, 145, 150, 151, 148, 149, + 226, 227, 224, 225, 230, 231, 228, 229, 221, 221, 220, 220, 223, 223, 222, 222, + 244, 246, 240, 242, 252, 254, 248, 250, 234, 235, 232, 233, 238, 239, 236, 237, + 200, 201, 198, 199, 204, 205, 202, 203, 192, 193, 191, 191, 196, 197, 194, 195, + 214, 215, 212, 213, 218, 219, 216, 217, 207, 207, 206, 206, 210, 211, 208, 209 +}; + +uint8_t alaw_to_ulaw(uint8_t alaw) +{ + return alaw_to_ulaw_table[alaw]; +} +/*- End of function --------------------------------------------------------*/ + +uint8_t ulaw_to_alaw(uint8_t ulaw) +{ + return ulaw_to_alaw_table[ulaw]; +} +/*- End of function --------------------------------------------------------*/ +/*- End of file ------------------------------------------------------------*/ Added: freeswitch/trunk/src/include/g711.h ============================================================================== --- (empty file) +++ freeswitch/trunk/src/include/g711.h Mon Feb 18 14:43:57 2008 @@ -0,0 +1,382 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * g711.h - In line A-law and u-law conversion routines + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2001 Steve Underwood + * + * Despite my general liking of the GPL, I place this code in the + * public domain for the benefit of all mankind - even the slimy + * ones who might try to proprietize my work and use it to my + * detriment. + * + * $Id: g711.h,v 1.1 2006/06/07 15:46:39 steveu Exp $ + */ + +/*! \file */ + +/*! \page g711_page A-law and mu-law handling +Lookup tables for A-law and u-law look attractive, until you consider the impact +on the CPU cache. If it causes a substantial area of your processor cache to get +hit too often, cache sloshing will severely slow things down. The main reason +these routines are slow in C, is the lack of direct access to the CPU's "find +the first 1" instruction. A little in-line assembler fixes that, and the +conversion routines can be faster than lookup tables, in most real world usage. +A "find the first 1" instruction is available on most modern CPUs, and is a +much underused feature. + +If an assembly language method of bit searching is not available, these routines +revert to a method that can be a little slow, so the cache thrashing might not +seem so bad :( + +Feel free to submit patches to add fast "find the first 1" support for your own +favourite processor. + +Look up tables are used for transcoding between A-law and u-law, since it is +difficult to achieve the precise transcoding procedure laid down in the G.711 +specification by other means. +*/ + +#if !defined(_G711_H_) +#define _G711_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _MSC_VER +#ifndef __inline__ +#define __inline__ __inline +#endif +typedef unsigned __int8 uint8_t; +typedef __int16 int16_t; +typedef __int32 int32_t; +typedef unsigned __int16 uint16_t; +#endif + +#if defined(__i386__) +/*! \brief Find the bit position of the highest set bit in a word + \param bits The word to be searched + \return The bit number of the highest set bit, or -1 if the word is zero. */ +static __inline__ int top_bit(unsigned int bits) +{ + int res; + + __asm__ __volatile__(" movl $-1,%%edx;\n" + " bsrl %%eax,%%edx;\n" + : "=d" (res) + : "a" (bits)); + return res; +} +/*- End of function --------------------------------------------------------*/ + +/*! \brief Find the bit position of the lowest set bit in a word + \param bits The word to be searched + \return The bit number of the lowest set bit, or -1 if the word is zero. */ +static __inline__ int bottom_bit(unsigned int bits) +{ + int res; + + __asm__ __volatile__(" movl $-1,%%edx;\n" + " bsfl %%eax,%%edx;\n" + : "=d" (res) + : "a" (bits)); + return res; +} +/*- End of function --------------------------------------------------------*/ +#elif defined(__x86_64__) +static __inline__ int top_bit(unsigned int bits) +{ + int res; + + __asm__ __volatile__(" movq $-1,%%rdx;\n" + " bsrq %%rax,%%rdx;\n" + : "=d" (res) + : "a" (bits)); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static __inline__ int bottom_bit(unsigned int bits) +{ + int res; + + __asm__ __volatile__(" movq $-1,%%rdx;\n" + " bsfq %%rax,%%rdx;\n" + : "=d" (res) + : "a" (bits)); + return res; +} +/*- End of function --------------------------------------------------------*/ +#else +static __inline__ int top_bit(unsigned int bits) +{ + int i; + + if (bits == 0) + return -1; + i = 0; + if (bits & 0xFFFF0000) + { + bits &= 0xFFFF0000; + i += 16; + } + if (bits & 0xFF00FF00) + { + bits &= 0xFF00FF00; + i += 8; + } + if (bits & 0xF0F0F0F0) + { + bits &= 0xF0F0F0F0; + i += 4; + } + if (bits & 0xCCCCCCCC) + { + bits &= 0xCCCCCCCC; + i += 2; + } + if (bits & 0xAAAAAAAA) + { + bits &= 0xAAAAAAAA; + i += 1; + } + return i; +} +/*- End of function --------------------------------------------------------*/ + +static __inline__ int bottom_bit(unsigned int bits) +{ + int i; + + if (bits == 0) + return -1; + i = 32; + if (bits & 0x0000FFFF) + { + bits &= 0x0000FFFF; + i -= 16; + } + if (bits & 0x00FF00FF) + { + bits &= 0x00FF00FF; + i -= 8; + } + if (bits & 0x0F0F0F0F) + { + bits &= 0x0F0F0F0F; + i -= 4; + } + if (bits & 0x33333333) + { + bits &= 0x33333333; + i -= 2; + } + if (bits & 0x55555555) + { + bits &= 0x55555555; + i -= 1; + } + return i; +} +/*- End of function --------------------------------------------------------*/ +#endif + +/* N.B. It is tempting to use look-up tables for A-law and u-law conversion. + * However, you should consider the cache footprint. + * + * A 64K byte table for linear to x-law and a 512 byte table for x-law to + * linear sound like peanuts these days, and shouldn't an array lookup be + * real fast? No! When the cache sloshes as badly as this one will, a tight + * calculation may be better. The messiest part is normally finding the + * segment, but a little inline assembly can fix that on an i386, x86_64 and + * many other modern processors. + */ + +/* + * Mu-law is basically as follows: + * + * Biased Linear Input Code Compressed Code + * ------------------------ --------------- + * 00000001wxyza 000wxyz + * 0000001wxyzab 001wxyz + * 000001wxyzabc 010wxyz + * 00001wxyzabcd 011wxyz + * 0001wxyzabcde 100wxyz + * 001wxyzabcdef 101wxyz + * 01wxyzabcdefg 110wxyz + * 1wxyzabcdefgh 111wxyz + * + * Each biased linear code has a leading 1 which identifies the segment + * number. The value of the segment number is equal to 7 minus the number + * of leading 0's. The quantization interval is directly available as the + * four bits wxyz. * The trailing bits (a - h) are ignored. + * + * Ordinarily the complement of the resulting code word is used for + * transmission, and so the code word is complemented before it is returned. + * + * For further information see John C. Bellamy's Digital Telephony, 1982, + * John Wiley & Sons, pps 98-111 and 472-476. + */ + +//#define ULAW_ZEROTRAP /* turn on the trap as per the MIL-STD */ +#define ULAW_BIAS 0x84 /* Bias for linear code. */ + +/*! \brief Encode a linear sample to u-law + \param linear The sample to encode. + \return The u-law value. +*/ +static __inline__ uint8_t linear_to_ulaw(int linear) +{ + uint8_t u_val; + int mask; + int seg; + + /* Get the sign and the magnitude of the value. */ + if (linear < 0) + { + linear = ULAW_BIAS - linear; + mask = 0x7F; + } + else + { + linear = ULAW_BIAS + linear; + mask = 0xFF; + } + + seg = top_bit(linear | 0xFF) - 7; + + /* + * Combine the sign, segment, quantization bits, + * and complement the code word. + */ + if (seg >= 8) + u_val = (uint8_t) (0x7F ^ mask); + else + u_val = (uint8_t) (((seg << 4) | ((linear >> (seg + 3)) & 0xF)) ^ mask); +#ifdef ULAW_ZEROTRAP + /* Optional ITU trap */ + if (u_val == 0) + u_val = 0x02; +#endif + return u_val; +} +/*- End of function --------------------------------------------------------*/ + +/*! \brief Decode an u-law sample to a linear value. + \param ulaw The u-law sample to decode. + \return The linear value. +*/ +static __inline__ int16_t ulaw_to_linear(uint8_t ulaw) +{ + int t; + + /* Complement to obtain normal u-law value. */ + ulaw = ~ulaw; + /* + * Extract and bias the quantization bits. Then + * shift up by the segment number and subtract out the bias. + */ + t = (((ulaw & 0x0F) << 3) + ULAW_BIAS) << (((int) ulaw & 0x70) >> 4); + return (int16_t) ((ulaw & 0x80) ? (ULAW_BIAS - t) : (t - ULAW_BIAS)); +} +/*- End of function --------------------------------------------------------*/ + +/* + * A-law is basically as follows: + * + * Linear Input Code Compressed Code + * ----------------- --------------- + * 0000000wxyza 000wxyz + * 0000001wxyza 001wxyz + * 000001wxyzab 010wxyz + * 00001wxyzabc 011wxyz + * 0001wxyzabcd 100wxyz + * 001wxyzabcde 101wxyz + * 01wxyzabcdef 110wxyz + * 1wxyzabcdefg 111wxyz + * + * For further information see John C. Bellamy's Digital Telephony, 1982, + * John Wiley & Sons, pps 98-111 and 472-476. + */ + +#define ALAW_AMI_MASK 0x55 + +/*! \brief Encode a linear sample to A-law + \param linear The sample to encode. + \return The A-law value. +*/ +static __inline__ uint8_t linear_to_alaw(int linear) +{ + int mask; + int seg; + + if (linear >= 0) + { + /* Sign (bit 7) bit = 1 */ + mask = ALAW_AMI_MASK | 0x80; + } + else + { + /* Sign (bit 7) bit = 0 */ + mask = ALAW_AMI_MASK; + linear = -linear - 8; + } + + /* Convert the scaled magnitude to segment number. */ + seg = top_bit(linear | 0xFF) - 7; + if (seg >= 8) + { + if (linear >= 0) + { + /* Out of range. Return maximum value. */ + return (uint8_t) (0x7F ^ mask); + } + /* We must be just a tiny step below zero */ + return (uint8_t) (0x00 ^ mask); + } + /* Combine the sign, segment, and quantization bits. */ + return (uint8_t) (((seg << 4) | ((linear >> ((seg) ? (seg + 3) : 4)) & 0x0F)) ^ mask); +} +/*- End of function --------------------------------------------------------*/ + +/*! \brief Decode an A-law sample to a linear value. + \param alaw The A-law sample to decode. + \return The linear value. +*/ +static __inline__ int16_t alaw_to_linear(uint8_t alaw) +{ + int i; + int seg; + + alaw ^= ALAW_AMI_MASK; + i = ((alaw & 0x0F) << 4); + seg = (((int) alaw & 0x70) >> 4); + if (seg) + i = (i + 0x108) << (seg - 1); + else + i += 8; + return (int16_t) ((alaw & 0x80) ? i : -i); +} +/*- End of function --------------------------------------------------------*/ + +/*! \brief Transcode from A-law to u-law, using the procedure defined in G.711. + \param alaw The A-law sample to transcode. + \return The best matching u-law value. +*/ +uint8_t alaw_to_ulaw(uint8_t alaw); + +/*! \brief Transcode from u-law to A-law, using the procedure defined in G.711. + \param alaw The u-law sample to transcode. + \return The best matching A-law value. +*/ +uint8_t ulaw_to_alaw(uint8_t ulaw); + +#ifdef __cplusplus +} +#endif + +#endif +/*- End of file ------------------------------------------------------------*/ Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Mon Feb 18 14:43:57 2008 @@ -321,7 +321,7 @@ /*! the IANA code number */ switch_payload_t ianacode, /*! the IANA code name */ - char *iananame, + const char *iananame, /*! default fmtp to send (can be overridden by the init function) */ char *fmtp, /*! samples transferred per second */ @@ -357,7 +357,7 @@ switch_codec_implementation_t *impl = (switch_codec_implementation_t *) switch_core_alloc(pool, sizeof(*impl)); impl->codec_type = codec_type; impl->ianacode = ianacode; - impl->iananame = iananame; + impl->iananame = switch_core_strdup(pool, iananame); impl->fmtp = fmtp; impl->samples_per_second = samples_per_second; impl->actual_samples_per_second = actual_samples_per_second; Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Mon Feb 18 14:43:57 2008 @@ -189,6 +189,7 @@ } /* GSM - END */ +#ifdef ENABLE_G711 /* G711 - START */ static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { @@ -332,6 +333,8 @@ } /* G711 - END */ +#endif + /* G722 - START */ @@ -656,6 +659,7 @@ switch_g722_init, switch_g722_encode, switch_g722_decode, switch_g722_destroy); } +#ifdef ENABLE_G711 /* G711 */ mpf = 10000, spf = 80, bpf = 160, ebpf = 80; SWITCH_ADD_CODEC(codec_interface, "G.711 ulaw"); @@ -673,6 +677,7 @@ mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, switch_g711a_init, switch_g711a_encode, switch_g711a_decode, switch_g711a_destroy); } +#endif /* GSM */ mpf = 20000, spf = 160, bpf = 320, ebpf = 33; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Feb 18 14:43:57 2008 @@ -978,6 +978,7 @@ switch_mutex_init(&loadable_modules.mutex, SWITCH_MUTEX_NESTED, loadable_modules.pool); switch_loadable_module_load_module("", "softtimer", SWITCH_FALSE, &err); + switch_loadable_module_load_module("", "PCM", SWITCH_FALSE, &err); if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_xml_t mods, ld;

1 0

[commit] r7669 - freeswitch/trunk/src/mod
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: anthm Date: Mon Feb 18 14:41:08 2008 New Revision: 7669 Modified: freeswitch/trunk/src/mod/Makefile.am Log: up Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Mon Feb 18 14:41:08 2008 @@ -7,7 +7,7 @@ @set fnord $$MAKEFLAGS; amf=$$2; \ target=`echo $@ | sed -e 's|^.*-||'`; \ modname=`echo $@ | sed -e 's|-.*||'`; \ - confmoddir=`cat $(switch_builddir)/modules.conf | sed -e 's| ||' | grep $$modname$$ | sed -e 's|#||' `; \ + confmoddir=`cat $(switch_builddir)/modules.conf | sed -e 's| ||' | grep $$modname$$ | sed -e 's|#||' | head -1`; \ if test -z "$$confmoddir" ; then moddir=$@ ; else \ if test -d "$(switch_srcdir)/src/mod/$$confmoddir" ; then \ moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; else \ @@ -15,14 +15,18 @@ fi ; \ fi ; \ if test -z "$$target" ; then target="all" ; fi ; \ - echo ;\ - echo making $$target $$modname ;\ - (if test -f "$$moddir/Makefile" ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ - fi;)\ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - test -z "$$fail" + if ! test -d "$$moddir" ; then echo ; echo "WARNING $$moddir does not exist, skipping" ; else \ + echo ;\ + echo making $$target $$modname ;\ + (if test -f "$$moddir/Makefile" ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ + fi;) || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + fi; \ + test -z "$$fail" ; .DEFAULT: @if test -z "`echo $@ | grep all`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi + + +

1 0

[commit] r7668 - freeswitch/trunk/src/mod/codecs/mod_g711
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: mikej Date: Mon Feb 18 12:56:00 2008 New Revision: 7668 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Log: fix build Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Mon Feb 18 12:56:00 2008 @@ -1,5 +1,5 @@ BASE=../../../.. -LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include +LOCAL_CFLAGS=-I. include $(BASE)/build/modmake.rules

1 0

[commit] r7667 - freeswitch/trunk/src/mod/codecs/mod_g711
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: mikej Date: Mon Feb 18 12:38:15 2008 New Revision: 7667 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Log: tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Mon Feb 18 12:38:15 2008 @@ -31,7 +31,7 @@ */ #include <switch.h> -#include <g7xx/g711.h> +#include <g711.h> SWITCH_MODULE_LOAD_FUNCTION(mod_g711_load); SWITCH_MODULE_DEFINITION(mod_g711, mod_g711_load, NULL, NULL);

1 0

[commit] r7666 - freeswitch/trunk
by Freeswitch SVN 18 Feb '08

18 Feb '08

Author: anthm Date: Mon Feb 18 12:11:47 2008 New Revision: 7666 Modified: freeswitch/trunk/bootstrap.sh Log: fix mrcp build Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Feb 18 12:11:47 2008 @@ -202,6 +202,10 @@ cd ${LIBDIR}/apr-util ./buildconf +echo "Entering directory ${LIBDIR}/openmrcp" +cd ${LIBDIR}/openmrcp +./bootstrap + for i in ${SUBDIRS} do

1 0