September 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2685 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: mikej Date: Wed Sep 13 12:33:09 2006 New Revision: 2685 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: add default values for woomera in case you don't specify in the config file. Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Wed Sep 13 12:33:09 2006 @@ -1318,6 +1318,9 @@ switch_set_flag(profile, PFLAG_INBOUND | PFLAG_OUTBOUND); profile->name = "main"; strncpy(profile->dialplan, "default", sizeof(profile->dialplan) - 1); + strncpy(profile->audio_ip, "127.0.0.1", sizeof(profile->audio_ip) - 1); + strncpy(profile->woomera_host, "127.0.0.1", sizeof(profile->woomera_host) - 1); + profile->woomera_port = (switch_port_t)42420; if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) {

1 0

[commit] r2684 - freeswitch/trunk/src/dotnet/dotnet
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:36:29 2006 New Revision: 2684 Removed: freeswitch/trunk/src/dotnet/dotnet/ Log: All fixed.

1 0

[commit] r2683 - in freeswitch/trunk/src/dotnet: . Marshaling Modules Properties Switch Types dotnet dotnet/Marshaling dotnet/Modules dotnet/Properties dotnet/Switch dotnet/Types
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:35:24 2006 New Revision: 2683 Added: freeswitch/trunk/src/dotnet/Common.cs - copied unchanged from r2682, /freeswitch/trunk/src/dotnet/dotnet/Common.cs freeswitch/trunk/src/dotnet/FreeSwitch.NET.csproj - copied unchanged from r2682, /freeswitch/trunk/src/dotnet/dotnet/FreeSwitch.NET.csproj freeswitch/trunk/src/dotnet/Makefile - copied unchanged from r2682, /freeswitch/trunk/src/dotnet/dotnet/Makefile freeswitch/trunk/src/dotnet/Marshaling/ - copied from r2682, /freeswitch/trunk/src/dotnet/dotnet/Marshaling/ freeswitch/trunk/src/dotnet/Module.cs - copied unchanged from r2682, /freeswitch/trunk/src/dotnet/dotnet/Module.cs freeswitch/trunk/src/dotnet/Modules/ - copied from r2682, /freeswitch/trunk/src/dotnet/dotnet/Modules/ freeswitch/trunk/src/dotnet/Properties/ - copied from r2682, /freeswitch/trunk/src/dotnet/dotnet/Properties/ freeswitch/trunk/src/dotnet/Switch/ - copied from r2682, /freeswitch/trunk/src/dotnet/dotnet/Switch/ freeswitch/trunk/src/dotnet/Types/ - copied from r2682, /freeswitch/trunk/src/dotnet/dotnet/Types/ freeswitch/trunk/src/dotnet/public.snk - copied unchanged from r2682, /freeswitch/trunk/src/dotnet/dotnet/public.snk Removed: freeswitch/trunk/src/dotnet/dotnet/Common.cs freeswitch/trunk/src/dotnet/dotnet/FreeSwitch.NET.csproj freeswitch/trunk/src/dotnet/dotnet/Makefile freeswitch/trunk/src/dotnet/dotnet/Marshaling/ freeswitch/trunk/src/dotnet/dotnet/Module.cs freeswitch/trunk/src/dotnet/dotnet/Modules/ freeswitch/trunk/src/dotnet/dotnet/Properties/ freeswitch/trunk/src/dotnet/dotnet/Switch/ freeswitch/trunk/src/dotnet/dotnet/Types/ freeswitch/trunk/src/dotnet/dotnet/public.snk Log: It appears I suck at getting things in the right directory.

1 0

[commit] r2682 - freeswitch/trunk/src/dotnet/dotnet
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:31:28 2006 New Revision: 2682 Added: freeswitch/trunk/src/dotnet/dotnet/ - copied from r2681, /freeswitch/branches/james/src/dotnet/ Log: Creating FreeSwitch.NET project, this is by no means complete yet but too many people are interested to keep it under wraps much longer! Feel free to pay me to work on this if it's in your businesses interests, I need a job ;) Documentation, more code and examples will be on its way soon. Email the list if there's any questions, i'd love to help people get started helping development. - james(a)nerdc0re.com

1 0

[commit] r2681 - in freeswitch/branches/james/src/dotnet: . Marshaling Marshaling/Types Modules Switch Types
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:21:53 2006 New Revision: 2681 Modified: freeswitch/branches/james/src/dotnet/Common.cs freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj freeswitch/branches/james/src/dotnet/Marshaling/BufferMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/CallerExtensionMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/CallerProfileMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/ChannelMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/CoreSessionMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/EventMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/FileHandleMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/MemoryPoolMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/StreamHandleMarshaler.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/BufferMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/EventMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/FileHandleMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/FrameMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/TypesMarshal.cs freeswitch/branches/james/src/dotnet/Module.cs freeswitch/branches/james/src/dotnet/Modules/Api.cs freeswitch/branches/james/src/dotnet/Modules/Application.cs freeswitch/branches/james/src/dotnet/Switch/CallerProfile.cs freeswitch/branches/james/src/dotnet/Switch/Channel.cs freeswitch/branches/james/src/dotnet/Switch/Console.cs freeswitch/branches/james/src/dotnet/Switch/CoreSession.cs freeswitch/branches/james/src/dotnet/Switch/Ivr.cs freeswitch/branches/james/src/dotnet/Switch/LoadableModule.cs freeswitch/branches/james/src/dotnet/Switch/StreamHandle.cs freeswitch/branches/james/src/dotnet/Types/ApplicationFunction.cs freeswitch/branches/james/src/dotnet/Types/ApplicationInterface.cs freeswitch/branches/james/src/dotnet/Types/Buffer.cs freeswitch/branches/james/src/dotnet/Types/CallCause.cs freeswitch/branches/james/src/dotnet/Types/CallerExtension.cs freeswitch/branches/james/src/dotnet/Types/CallerProfile.cs freeswitch/branches/james/src/dotnet/Types/Channel.cs freeswitch/branches/james/src/dotnet/Types/ChannelFlag.cs freeswitch/branches/james/src/dotnet/Types/ChannelState.cs freeswitch/branches/james/src/dotnet/Types/ChannelTimetable.cs freeswitch/branches/james/src/dotnet/Types/CoreSession.cs freeswitch/branches/james/src/dotnet/Types/DtmfCallbackFunction.cs freeswitch/branches/james/src/dotnet/Types/Event.cs freeswitch/branches/james/src/dotnet/Types/FileHandle.cs freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs freeswitch/branches/james/src/dotnet/Types/InputType.cs freeswitch/branches/james/src/dotnet/Types/LoadableModule.cs freeswitch/branches/james/src/dotnet/Types/LoadableModuleInterface.cs freeswitch/branches/james/src/dotnet/Types/MemoryPool.cs freeswitch/branches/james/src/dotnet/Types/Module.cs freeswitch/branches/james/src/dotnet/Types/ModuleInterfaces.cs freeswitch/branches/james/src/dotnet/Types/Status.cs freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs freeswitch/branches/james/src/dotnet/Types/TextChannel.cs Log: Changed the namespace. Modified: freeswitch/branches/james/src/dotnet/Common.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Common.cs (original) +++ freeswitch/branches/james/src/dotnet/Common.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Reflection; -namespace Freeswitch +namespace FreeSwitch.NET { public class Common { Modified: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj ============================================================================== --- freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj (original) +++ freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj Wed Sep 13 11:21:53 2006 @@ -7,7 +7,7 @@ <ProjectGuid>{251CAABC-16C3-4593-A491-603B908094E0}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Freeswitch</RootNamespace> + <RootNamespace>FreeSwitch.NET</RootNamespace> <AssemblyName>Freeswitch</AssemblyName> <StartupObject> </StartupObject> Modified: freeswitch/branches/james/src/dotnet/Marshaling/BufferMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/BufferMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/BufferMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling.Types; -using Freeswitch.Types; +using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class BufferMarshaler : ICustomMarshaler { @@ -60,14 +60,14 @@ public IntPtr MarshalManagedToNative(object obj) { - Freeswitch.Types.Buffer buffer = (Freeswitch.Types.Buffer)obj; + FreeSwitch.NET.Types.Buffer buffer = (FreeSwitch.NET.Types.Buffer)obj; return buffer.marshaledObject.Handle; } public object MarshalNativeToManaged(IntPtr bufferPtr) { - Freeswitch.Types.Buffer buffer = new Freeswitch.Types.Buffer(); + FreeSwitch.NET.Types.Buffer buffer = new FreeSwitch.NET.Types.Buffer(); BufferMarshal bufferMarshal = new BufferMarshal(); Marshal.PtrToStructure(bufferPtr, bufferMarshal); Modified: freeswitch/branches/james/src/dotnet/Marshaling/CallerExtensionMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/CallerExtensionMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/CallerExtensionMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class CallerExtensionMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/CallerProfileMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/CallerProfileMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/CallerProfileMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class CallerProfileMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/ChannelMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/ChannelMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/ChannelMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class ChannelMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class ChannelTimetableMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/CoreSessionMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/CoreSessionMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/CoreSessionMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class CoreSessionMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/EventMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/EventMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/EventMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,11 +31,11 @@ */ using System; using System.Collections; -using Freeswitch.Marshaling.Types; -using Freeswitch.Types; +using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.NET.Types; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class EventMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/FileHandleMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/FileHandleMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/FileHandleMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class FileHandleMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/MemoryPoolMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/MemoryPoolMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/MemoryPoolMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class MemoryPoolMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/StreamHandleMarshaler.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/StreamHandleMarshaler.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/StreamHandleMarshaler.cs Wed Sep 13 11:21:53 2006 @@ -31,11 +31,11 @@ */ using System; using System.Collections; -using Freeswitch.Marshaling.Types; -using Freeswitch.Types; +using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.NET.Types; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling +namespace FreeSwitch.NET.Marshaling { class StreamHandleMarshaler : ICustomMarshaler { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class ApiInterfaceMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class ApplicationInterfaceMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/BufferMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/BufferMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/BufferMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class BufferMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class CallerExtensionMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class CallerProfileMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { internal enum ChannelFlagMarshal { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class ChannelMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { internal enum ChannelStateMarshal { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class ChannelTimetableMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs Wed Sep 13 11:21:53 2006 @@ -30,9 +30,9 @@ * */ using System; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { internal class CodecImplementationMarshal { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class CodecInterfaceMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Text; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { internal class CodecMarshal { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { internal enum CodecTypesMarshal { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs Wed Sep 13 11:21:53 2006 @@ -33,7 +33,7 @@ using System.Text; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential, Pack=1)] internal class CoreSessionMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/EventMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/EventMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/EventMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class EventMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/FileHandleMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/FileHandleMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/FileHandleMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class FileHandleMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/FrameMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/FrameMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/FrameMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class FrameMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class IOEventHooksMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class LoadableModuleInterfaceMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class StreamHandleMarshal Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/TypesMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/TypesMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/TypesMarshal.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Marshaling.Types +namespace FreeSwitch.NET.Marshaling.Types { public delegate Status DtmfCallbackFunctionMarshal( Modified: freeswitch/branches/james/src/dotnet/Module.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Module.cs (original) +++ freeswitch/branches/james/src/dotnet/Module.cs Wed Sep 13 11:21:53 2006 @@ -34,12 +34,12 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; -using Freeswitch; -using Freeswitch.Types; -using Freeswitch.Modules; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Modules; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch +namespace FreeSwitch.NET { /// <summary> /// Base class for all Freeswitch.NET modules Modified: freeswitch/branches/james/src/dotnet/Modules/Api.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Modules/Api.cs (original) +++ freeswitch/branches/james/src/dotnet/Modules/Api.cs Wed Sep 13 11:21:53 2006 @@ -33,9 +33,9 @@ using System.Collections; using System.Text; using System.Runtime.InteropServices; -using Freeswitch.Types; +using FreeSwitch.NET.Types; -namespace Freeswitch.Modules +namespace FreeSwitch.NET.Modules { public class Api { Modified: freeswitch/branches/james/src/dotnet/Modules/Application.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Modules/Application.cs (original) +++ freeswitch/branches/james/src/dotnet/Modules/Application.cs Wed Sep 13 11:21:53 2006 @@ -33,11 +33,11 @@ using System.Collections; using System.Text; using System.Runtime.InteropServices; -using Freeswitch.Marshaling; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Modules +namespace FreeSwitch.NET.Modules { public class Application { Modified: freeswitch/branches/james/src/dotnet/Switch/CallerProfile.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/CallerProfile.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/CallerProfile.cs Wed Sep 13 11:21:53 2006 @@ -32,11 +32,11 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch +namespace FreeSwitch.NET { public partial class Switch { Modified: freeswitch/branches/james/src/dotnet/Switch/Channel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Channel.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Channel.cs Wed Sep 13 11:21:53 2006 @@ -32,10 +32,10 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling; -namespace Freeswitch +namespace FreeSwitch.NET { public partial class Switch { Modified: freeswitch/branches/james/src/dotnet/Switch/Console.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Console.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Console.cs Wed Sep 13 11:21:53 2006 @@ -34,7 +34,7 @@ using System.Diagnostics; using System.Text; -namespace Freeswitch +namespace FreeSwitch.NET { public partial class Switch { Modified: freeswitch/branches/james/src/dotnet/Switch/CoreSession.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/CoreSession.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/CoreSession.cs Wed Sep 13 11:21:53 2006 @@ -32,10 +32,10 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling; -namespace Freeswitch +namespace FreeSwitch.NET { public partial class Switch { Modified: freeswitch/branches/james/src/dotnet/Switch/Ivr.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Ivr.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Ivr.cs Wed Sep 13 11:21:53 2006 @@ -32,11 +32,11 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch +namespace FreeSwitch.NET { public partial class Switch { Modified: freeswitch/branches/james/src/dotnet/Switch/LoadableModule.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/LoadableModule.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/LoadableModule.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch +namespace FreeSwitch.NET { /* * SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname) Modified: freeswitch/branches/james/src/dotnet/Switch/StreamHandle.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/StreamHandle.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/StreamHandle.cs Wed Sep 13 11:21:53 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Types; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch +namespace FreeSwitch.NET { /* * SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname) Modified: freeswitch/branches/james/src/dotnet/Types/ApplicationFunction.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/ApplicationFunction.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/ApplicationFunction.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { } Modified: freeswitch/branches/james/src/dotnet/Types/ApplicationInterface.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/ApplicationInterface.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/ApplicationInterface.cs Wed Sep 13 11:21:53 2006 @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Text; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { /* public class ApplicationInterface Modified: freeswitch/branches/james/src/dotnet/Types/Buffer.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Buffer.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Buffer.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class Buffer { Modified: freeswitch/branches/james/src/dotnet/Types/CallCause.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/CallCause.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/CallCause.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum CallCause { Modified: freeswitch/branches/james/src/dotnet/Types/CallerExtension.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/CallerExtension.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/CallerExtension.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class CallerExtension { Modified: freeswitch/branches/james/src/dotnet/Types/CallerProfile.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/CallerProfile.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/CallerProfile.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class CallerProfile { Modified: freeswitch/branches/james/src/dotnet/Types/Channel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Channel.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Channel.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { /* * char *name; Modified: freeswitch/branches/james/src/dotnet/Types/ChannelFlag.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/ChannelFlag.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/ChannelFlag.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum ChannelFlag { Modified: freeswitch/branches/james/src/dotnet/Types/ChannelState.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/ChannelState.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/ChannelState.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum ChannelState { Modified: freeswitch/branches/james/src/dotnet/Types/ChannelTimetable.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/ChannelTimetable.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/ChannelTimetable.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class ChannelTimetable { Modified: freeswitch/branches/james/src/dotnet/Types/CoreSession.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/CoreSession.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/CoreSession.cs Wed Sep 13 11:21:53 2006 @@ -33,9 +33,9 @@ using System.Collections; using System.Runtime.InteropServices; using System.Text; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { /* * uint32_t id; Modified: freeswitch/branches/james/src/dotnet/Types/DtmfCallbackFunction.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/DtmfCallbackFunction.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/DtmfCallbackFunction.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public delegate Status DtmfCallbackFunction(CoreSession session, string dtmf); } Modified: freeswitch/branches/james/src/dotnet/Types/Event.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Event.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Event.cs Wed Sep 13 11:21:53 2006 @@ -34,7 +34,7 @@ using System.Text; using System.Runtime.InteropServices; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum Priority { Modified: freeswitch/branches/james/src/dotnet/Types/FileHandle.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/FileHandle.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/FileHandle.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class FileHandle { Modified: freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling; +using FreeSwitch.NET.Marshaling; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public delegate Status InputCallbackFunction( [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] Modified: freeswitch/branches/james/src/dotnet/Types/InputType.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/InputType.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/InputType.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum InputType { Modified: freeswitch/branches/james/src/dotnet/Types/LoadableModule.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/LoadableModule.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/LoadableModule.cs Wed Sep 13 11:21:53 2006 @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class LoadableModule { Modified: freeswitch/branches/james/src/dotnet/Types/LoadableModuleInterface.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/LoadableModuleInterface.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/LoadableModuleInterface.cs Wed Sep 13 11:21:53 2006 @@ -33,9 +33,9 @@ using System.Collections; using System.Runtime.InteropServices; using System.Text; -using Freeswitch.Marshaling; +using FreeSwitch.NET.Marshaling; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public delegate Status WriteFunction( [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] Modified: freeswitch/branches/james/src/dotnet/Types/MemoryPool.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/MemoryPool.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/MemoryPool.cs Wed Sep 13 11:21:53 2006 @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class MemoryPool { Modified: freeswitch/branches/james/src/dotnet/Types/Module.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Module.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Module.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling; +using FreeSwitch.NET.Marshaling; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public delegate Status ModuleReload(); public delegate bool ModulePause(); Modified: freeswitch/branches/james/src/dotnet/Types/ModuleInterfaces.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/ModuleInterfaces.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/ModuleInterfaces.cs Wed Sep 13 11:21:53 2006 @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Text; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { /* public class ApplicationInterface Modified: freeswitch/branches/james/src/dotnet/Types/Status.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Status.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Status.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum Status { Modified: freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs Wed Sep 13 11:21:53 2006 @@ -31,9 +31,9 @@ */ using System; using System.Runtime.InteropServices; -using Freeswitch.Marshaling.Types; +using FreeSwitch.NET.Marshaling.Types; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public class StreamHandle { Modified: freeswitch/branches/james/src/dotnet/Types/TextChannel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/TextChannel.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/TextChannel.cs Wed Sep 13 11:21:53 2006 @@ -31,7 +31,7 @@ */ using System; -namespace Freeswitch.Types +namespace FreeSwitch.NET.Types { public enum TextChannel {

1 0

[commit] r2680 - freeswitch/branches/james/src/dotnet
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:15:28 2006 New Revision: 2680 Removed: freeswitch/branches/james/src/dotnet/Core.cs freeswitch/branches/james/src/dotnet/Ivr.cs Modified: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj Log: This'll do. Modified: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj ============================================================================== --- freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj (original) +++ freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj Wed Sep 13 11:15:28 2006 @@ -42,8 +42,6 @@ </ItemGroup> <ItemGroup> <Compile Include="Common.cs" /> - <Compile Include="Core.cs" /> - <Compile Include="Ivr.cs" /> <Compile Include="Marshaling\BufferMarshaler.cs" /> <Compile Include="Marshaling\CallerExtensionMarshaler.cs" /> <Compile Include="Marshaling\CallerProfileMarshaler.cs" /> @@ -67,7 +65,7 @@ <Compile Include="Marshaling\Types\CodecInterfaceMarshal.cs" /> <Compile Include="Marshaling\Types\CodecMarshal.cs" /> <Compile Include="Marshaling\Types\CodecTypeMarshal.cs" /> - <Compile Include="Marshaling\Types\IMarshaledObject.cs" /> + <Compile Include="Marshaling\Types\StreamHandleMarshal.cs" /> <Compile Include="Marshaling\Types\TypesMarshal.cs" /> <Compile Include="Marshaling\Types\FileHandleMarshal.cs" /> <Compile Include="Marshaling\Types\LoadableModuleInterfaceMarshal.cs" /> @@ -98,6 +96,8 @@ <Compile Include="Modules\Application.cs" /> <Compile Include="Types\ApplicationFunction.cs" /> <Compile Include="Types\CallCause.cs" /> + <Compile Include="Types\InputCallbackFunction.cs" /> + <Compile Include="Types\InputType.cs" /> <Compile Include="Types\ModuleInterfaces.cs" /> <Compile Include="Types\StreamHandle.cs" /> <Compile Include="Types\Module.cs" />

1 0

[commit] r2679 - in freeswitch/branches/james/src/dotnet: . Marshaling/Types Switch Types
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:02:38 2006 New Revision: 2679 Added: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj - copied unchanged from r2678, /freeswitch/branches/james/src/dotnet/FreeSwitchDotNet.csproj freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs (contents, props changed) freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs (contents, props changed) freeswitch/branches/james/src/dotnet/Types/InputType.cs (contents, props changed) Removed: freeswitch/branches/james/src/dotnet/FreeSwitchDotNet.csproj freeswitch/branches/james/src/dotnet/Freeswitch.csproj Modified: freeswitch/branches/james/src/dotnet/Ivr.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs freeswitch/branches/james/src/dotnet/Module.cs freeswitch/branches/james/src/dotnet/Switch/Channel.cs freeswitch/branches/james/src/dotnet/Switch/Ivr.cs freeswitch/branches/james/src/dotnet/Types/Channel.cs freeswitch/branches/james/src/dotnet/Types/Module.cs freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs freeswitch/branches/james/src/dotnet/Types/TextChannel.cs Log: Few cleanups. Modified: freeswitch/branches/james/src/dotnet/Ivr.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Ivr.cs (original) +++ freeswitch/branches/james/src/dotnet/Ivr.cs Wed Sep 13 11:02:38 2006 @@ -14,28 +14,34 @@ return Switch.switch_ivr_multi_threaded_bridge(session, peerSession, timelimit, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero); } - public static Status RecordFile(CoreSession coreSession, FileHandle fileHandle, string file, DtmfCallbackFunction dtmfCallbackFunction) + public static Status RecordFile(CoreSession coreSession, FileHandle fileHandle, string file, InputCallbackFunction inputCallbackFunction) { Byte[] filename = Encoding.Default.GetBytes(file); Console.WriteLine("File: {0}", file); - dtmfCallbackFunction(coreSession, "1"); - dtmfCallbackFunction(coreSession, "2"); - dtmfCallbackFunction(coreSession, "3"); + inputCallbackFunction(coreSession, "1", InputType.INPUT_TYPE_DTMF, "", 1024); + //inputCallbackFunction(coreSession, "2"); + //inputCallbackFunction(coreSession, "3"); Encoding ansiEncoding = Encoding.GetEncoding(1252); //filename = Encoding.Convert(Encoding.Default, ansiEncoding, filename); Console.WriteLine("Filename: {0}", file); - DtmfCallbackFunctionMarshal dtmfCallbackFunctionMarshal = new DtmfCallbackFunctionMarshal(coreSession.DtmfCallbackFunctionWrapper); + // DtmfCallbackFunctionMarshal dtmfCallbackFunctionMarshal = new DtmfCallbackFunctionMarshal(coreSession.DtmfCallbackFunctionWrapper); IntPtr filePtr = Marshal.StringToHGlobalAnsi(ansiEncoding.GetString(filename)); Console.WriteLine("Bleh: 0x{0:x}", (int)filePtr); - Status status = Switch.switch_ivr_record_file(coreSession, null, filePtr, dtmfCallbackFunctionMarshal, IntPtr.Zero, 0); - Console.WriteLine("Status record: {0}", status.ToString()); - return status; + Status status = Switch.switch_ivr_record_file(coreSession, null, filePtr, inputCallbackFunction, IntPtr.Zero, 0); + //Console.WriteLine("Status record: {0}", status.ToString()); + return Status.Success; //status; + } + + public static Status PlayFile(CoreSession session, FileHandle fh, string file, string timer_name, InputCallbackFunction input_callback) + { + //Switch.switch_ivr_play_file(session + return Status.Success; } } } Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs Wed Sep 13 11:02:38 2006 @@ -49,17 +49,4 @@ internal IntPtr speech_interface; internal IntPtr directory_interface; } - - - [StructLayout(LayoutKind.Sequential)] - internal class StreamHandleMarshal - { - internal IntPtr write_function; - internal IntPtr data; - internal IntPtr end; - internal int data_size; - internal int data_len; - internal IntPtr _event; - } - } Added: freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs Wed Sep 13 11:02:38 2006 @@ -0,0 +1,48 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.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 + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * StreamHandleMarshal.cs -- + * + */ +using System; +using System.Runtime.InteropServices; +using Freeswitch.Types; + +namespace Freeswitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class StreamHandleMarshal + { + internal IntPtr write_function; + internal IntPtr data; + internal IntPtr end; + internal int data_size; + internal int data_len; + internal IntPtr _event; + } +} Modified: freeswitch/branches/james/src/dotnet/Module.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Module.cs (original) +++ freeswitch/branches/james/src/dotnet/Module.cs Wed Sep 13 11:02:38 2006 @@ -41,23 +41,39 @@ namespace Freeswitch { + /// <summary> + /// Base class for all Freeswitch.NET modules + /// </summary> + /// <example> + /// public class Example : Module + /// { + /// public Example() + /// { + /// AddApiInterface(new ExampleApi()); + /// AddApplicationInterface(new ExampleApplication()); + /// + /// Register(); + /// } + /// } + /// </example> public class Module { - - - ModuleLoad load; - private LoadableModuleInterfaceMarshal module_interface = new LoadableModuleInterfaceMarshal(); - private ArrayList apiInterfaces = new ArrayList(); + private LoadableModuleMarshal module = new LoadableModuleMarshal(); + private ArrayList applicationInterfaces = new ArrayList(); - //protected ModuleLoad moduleLoad; - private string name; - private string filename = Assembly.GetCallingAssembly().GetName().Name; - private LoadableModuleMarshal module = new LoadableModuleMarshal(); - + private ArrayList apiInterfaces = new ArrayList(); + + private ModuleLoad load; + private string name; + private string filename = Assembly.GetCallingAssembly().GetName().Name; + + /// <summary> + /// Module constructor + /// </summary> public Module() { - Console.WriteLine("Running module .blehctor"); + Console.WriteLine("*** Creating new module object"); load = new ModuleLoad(Load); } @@ -70,71 +86,110 @@ /// <returns></returns> public Status Load(ref IntPtr module, string name) { + /* Allocate some unmanaged mem for the ModuleInterface */ module = Marshal.AllocHGlobal(Marshal.SizeOf(module_interface)); + /* Set the module_name field of the LoadableModuleInterface */ module_interface.module_name = Marshal.StringToHGlobalAnsi(filename); - /* For each API interface */ - if (apiInterfaces.Count > 0) - { - foreach (Api api in apiInterfaces) - { - ApiInterfaceMarshal apiInterfaceMarshal = new ApiInterfaceMarshal(); - IntPtr apiInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(apiInterfaceMarshal)); - - apiInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(api.Name); - apiInterfaceMarshal.desc = Marshal.StringToHGlobalAnsi(api.Description); - apiInterfaceMarshal.function = new ApiFunction(api.ApiFunction); - - api.handle = new HandleRef(apiInterfaceMarshal, apiInterfacePtr); - - Marshal.StructureToPtr(apiInterfaceMarshal, api.handle.Handle, true); - } - - Api apiIndex = (Api) apiInterfaces[0]; - module_interface.api_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApiInterfaceMarshal))); - Marshal.StructureToPtr(apiIndex.handle.Wrapper, module_interface.api_interface, true); - } + /* Grab the first ApiInterface in our array and add a pointer to this in our ModuleInterface*/ + Api apiIndex = (Api)apiInterfaces[0]; + + module_interface.api_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApiInterfaceMarshal))); + + Marshal.StructureToPtr(apiIndex.handle.Wrapper, module_interface.api_interface, true); + /* For each Application interface */ - if (applicationInterfaces.Count > 0) - { - foreach (Application application in applicationInterfaces) - { - ApplicationInterfaceMarshal applicationInterfaceMarshal = new ApplicationInterfaceMarshal(); - IntPtr applicationInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(applicationInterfaceMarshal)); + Application applicationIndex = (Application)applicationInterfaces[0]; + + module_interface.application_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApplicationInterfaceMarshal))); + + Marshal.StructureToPtr(applicationIndex.handle.Wrapper, module_interface.application_interface, true); - applicationInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(application.Name); - applicationInterfaceMarshal.syntax = Marshal.StringToHGlobalAnsi(application.Syntax); - applicationInterfaceMarshal.long_desc = Marshal.StringToHGlobalAnsi(application.LongDescription); - applicationInterfaceMarshal.short_desc = Marshal.StringToHGlobalAnsi(application.ShortDescription); - - applicationInterfaceMarshal.application_function = new ApplicationFunction(application.ApplicationFunction); - - application.handle = new HandleRef(applicationInterfaceMarshal, applicationInterfacePtr); - - Marshal.StructureToPtr(applicationInterfaceMarshal, application.handle.Handle, true); - } - - Application applicationIndex = (Application)applicationInterfaces[0]; - module_interface.application_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApplicationInterfaceMarshal))); - Marshal.StructureToPtr(applicationIndex.handle.Wrapper, module_interface.application_interface, true); - } - + /* Finally, marshal the moduleinterface class and return */ Marshal.StructureToPtr(module_interface, module, true); return Status.Success; } + /// <summary> + /// AddApiInterface + /// </summary> + /// <param name="apiInterface"></param> public void AddApiInterface(Api apiInterface) { - apiInterfaces.Add(apiInterface); + /* Create a new ApiInterface type and allocate unmanaged mem */ + ApiInterfaceMarshal apiInterfaceMarshal = new ApiInterfaceMarshal(); + IntPtr apiInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(apiInterfaceMarshal)); + + /* Allocate umanaged mem to to interface fields so GC doesn't disturb them */ + apiInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(apiInterface.Name); + apiInterfaceMarshal.desc = Marshal.StringToHGlobalAnsi(apiInterface.Description); + apiInterfaceMarshal.function = new ApiFunction(apiInterface.ApiFunction); + + /* Set the handle of the managed object */ + apiInterface.handle = new HandleRef(apiInterfaceMarshal, apiInterfacePtr); + + Marshal.StructureToPtr(apiInterfaceMarshal, apiInterface.handle.Handle, true); + + /* Check to see whether there is already an interface defined, if there is then + * we want to set the *next pointer of the last element before adding the new + * interface to the array + */ + if (apiInterfaces.Count > 0) + { + Api apiInterfaceElement = (Api)apiInterfaces[apiInterfaces.Count - 1]; + ApiInterfaceMarshal apiInterfacePrev = (ApiInterfaceMarshal)apiInterfaceElement.handle.Wrapper; + + apiInterfacePrev.next = apiInterface.handle.Handle; + } + + /* Finally, add our new interface to the array */ + apiInterfaces.Add(apiInterface); } + /// <summary> + /// AddApplicationInterface + /// </summary> + /// <param name="applicationInterface"></param> public void AddApplicationInterface(Application applicationInterface) { + /* Create a new ApplicationInterface type and allocate unmanaged mem */ + ApplicationInterfaceMarshal applicationInterfaceMarshal = new ApplicationInterfaceMarshal(); + IntPtr applicationInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(applicationInterfaceMarshal)); + + /* Allocate umanaged mem to to interface fields so GC doesn't disturb them */ + applicationInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(applicationInterface.Name); + applicationInterfaceMarshal.syntax = Marshal.StringToHGlobalAnsi(applicationInterface.Syntax); + applicationInterfaceMarshal.long_desc = Marshal.StringToHGlobalAnsi(applicationInterface.LongDescription); + applicationInterfaceMarshal.short_desc = Marshal.StringToHGlobalAnsi(applicationInterface.ShortDescription); + + applicationInterfaceMarshal.application_function = new ApplicationFunction(applicationInterface.ApplicationFunction); + + /* Set the handle of the managed object */ + applicationInterface.handle = new HandleRef(applicationInterfaceMarshal, applicationInterfacePtr); + + Marshal.StructureToPtr(applicationInterfaceMarshal, applicationInterface.handle.Handle, true); + + /* Check to see whether there is already an interface defined, if there is then + * we want to set the *next pointer of the last element before adding the new + * interface to the array + */ + if (applicationInterfaces.Count > 0) + { + Application applicationInterfaceElement = (Application)applicationInterfaces[applicationInterfaces.Count - 1]; + ApplicationInterfaceMarshal applicationInterfacePrev = (ApplicationInterfaceMarshal)applicationInterfaceElement.handle.Wrapper; + + applicationInterfacePrev.next = applicationInterface.handle.Handle; + } + + /* Finally, add our new interface to the array */ applicationInterfaces.Add(applicationInterface); } + /// <summary> + /// Register + /// </summary> public void Register() { module.module_load = new ModuleLoad(Load); Modified: freeswitch/branches/james/src/dotnet/Switch/Channel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Channel.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Channel.cs Wed Sep 13 11:02:38 2006 @@ -60,9 +60,15 @@ [DllImport("freeswitch")] public extern static - Status switch_channel_hangup( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ChannelMarshaler))] - Channel channel); + ChannelState switch_channel_perform_hangup( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ChannelMarshaler))] + Channel channel, + [MarshalAs(UnmanagedType.LPStr)] + string file, + [MarshalAs(UnmanagedType.LPStr)] + string func, + int line, + CallCause hangup_cause); [DllImport("freeswitch")] [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(CallerExtensionMarshaler))] Modified: freeswitch/branches/james/src/dotnet/Switch/Ivr.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Ivr.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Ivr.cs Wed Sep 13 11:02:38 2006 @@ -45,10 +45,13 @@ Status switch_ivr_play_file( [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] CoreSession session, - IntPtr fh, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FileHandleMarshaler))] + FileHandle fh, + [MarshalAs(UnmanagedType.LPStr)] string file, + [MarshalAs(UnmanagedType.LPStr)] string timer_name, - IntPtr dtmf_callback, + InputCallbackFunction input_callback, IntPtr buf, uint buflen); @@ -72,7 +75,7 @@ [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileHandleMarshaler))] FileHandle fh, IntPtr file, - DtmfCallbackFunctionMarshal dtmf_callback, + InputCallbackFunction input_callback, IntPtr buf, uint buflen); } Modified: freeswitch/branches/james/src/dotnet/Types/Channel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Channel.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Channel.cs Wed Sep 13 11:02:38 2006 @@ -210,9 +210,14 @@ } } - public void Hangup() + public void PerformHangup() { - Switch.switch_channel_hangup(this, CallCause.NormalClearing); + Switch.switch_channel_perform_hangup(this, "file", "func", 100, CallCause.OutgoingCallBarred); + } + + public Status Answer() + { + return Switch.switch_channel_answer(this); } } } Added: freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs Wed Sep 13 11:02:38 2006 @@ -0,0 +1,47 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.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 + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * DtmfCallbackFunction.cs -- + * + */ +using System; +using System.Runtime.InteropServices; +using Freeswitch.Marshaling; + +namespace Freeswitch.Types +{ + public delegate Status InputCallbackFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] + CoreSession session, + [MarshalAs(UnmanagedType.LPStr)] + string input, + InputType inputType, + [MarshalAs(UnmanagedType.LPStr)] + string buffer, + int bufferLength); +} Added: freeswitch/branches/james/src/dotnet/Types/InputType.cs ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/dotnet/Types/InputType.cs Wed Sep 13 11:02:38 2006 @@ -0,0 +1,41 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.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 + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * ChannelState.cs -- + * + */ +using System; + +namespace Freeswitch.Types +{ + public enum InputType + { + INPUT_TYPE_DTMF, + INPUT_TYPE_EVENT + } +} Modified: freeswitch/branches/james/src/dotnet/Types/Module.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Module.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Module.cs Wed Sep 13 11:02:38 2006 @@ -36,11 +36,11 @@ namespace Freeswitch.Types { public delegate Status ModuleReload(); - public delegate bool ModulePause(); - public delegate bool ModuleResume(); - public delegate bool ModuleStatus(); + public delegate bool ModulePause(); + public delegate bool ModuleResume(); + public delegate bool ModuleStatus(); public delegate Status ModuleRuntime(); - public delegate bool ModuleShutdown(); + public delegate bool ModuleShutdown(); public delegate Status ModuleLoad(ref IntPtr module, string name); public delegate void Modified: freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs Wed Sep 13 11:02:38 2006 @@ -37,21 +37,13 @@ { public class StreamHandle { - internal HandleRef marshaledObject; + internal HandleRef marshaledObject; internal WriteFunction writeFunction; - //internal WriteFunctions; //switch_stream_handle_write_function_t write_function; - /* - * internal - void *data; - void *end; - switch_size_t data_size; - switch_size_t data_len; - switch_event_t *event; - */ + public void Write(string data) { - StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal) marshaledObject.Wrapper; - WriteFunction writeFunction = (WriteFunction) Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); + StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal)marshaledObject.Wrapper; + WriteFunction writeFunction = (WriteFunction)Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); writeFunction(this, data); } Modified: freeswitch/branches/james/src/dotnet/Types/TextChannel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/TextChannel.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/TextChannel.cs Wed Sep 13 11:02:38 2006 @@ -35,8 +35,8 @@ { public enum TextChannel { - SwitchChannelIdConsole, - SwitchChannelIdConsoleClean, - SwitchChannelIdEvent + ChannelIdConsole, + ChannelIdConsoleClean, + ChannelIdEvent } }

1 0

[commit] r2678 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: mikej Date: Wed Sep 13 10:31:55 2006 New Revision: 2678 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: fix rtp destroy race. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Sep 13 10:31:55 2006 @@ -649,7 +649,6 @@ loops++; } switch_rtp_destroy(&tech_pvt->rtp_session); - tech_pvt->rtp_session = NULL; } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Sep 13 10:31:55 2006 @@ -547,6 +547,7 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { + assert(rtp_session != NULL); switch_mutex_lock(rtp_session->flag_mutex); apr_socket_shutdown(rtp_session->sock, APR_SHUTDOWN_READWRITE); switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO);

1 0

[commit] r2677 - in freeswitch/trunk: conf src/mod/endpoints/mod_woomera
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: anthm Date: Wed Sep 13 09:41:35 2006 New Revision: 2677 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: change woomera defaults Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Sep 13 09:41:35 2006 @@ -186,8 +186,14 @@ <settings> <param name="debug" value="0"/> </settings> + <interface> + <param name="host" value="localhost"/> + <param name="port" value="42420"/> + <param name="audio-ip" value="127.0.0.1"/> + <param name="dialplan" value="XML"/> + </interface> </configuration> - + <configuration name="wanpipe.conf" description="Sangoma Wanpipe Endpoint"> <settings> <param name="debug" value="1"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Wed Sep 13 09:41:35 2006 @@ -1337,7 +1337,7 @@ for (param = switch_xml_child(xmlp, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcmp(var, "audio_ip")) { + if (!strcmp(var, "audio-ip")) { strncpy(profile->audio_ip, val, sizeof(profile->audio_ip) - 1); } else if (!strcmp(var, "host")) { strncpy(profile->woomera_host, val, sizeof(profile->woomera_host) - 1);

1 0

[commit] r2676 - freeswitch/branches/gled
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: sphere Date: Wed Sep 13 07:30:28 2006 New Revision: 2676 Added: freeswitch/branches/gled/ Log: Creating empty folder for gled

1 0