- Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r2698 - freeswitch/branches/haisenko
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 06:52:24 2006 New Revision: 2698 Added: freeswitch/branches/haisenko/ Log: Creating empty folder for haisenko

1 0

[commit] r2697 - freeswitch/branches/dede
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 05:43:23 2006 New Revision: 2697 Added: freeswitch/branches/dede/ Log: Creating empty folder for dede

1 0

[commit] r2696 - freeswitch/branches/paulb
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 01:43:24 2006 New Revision: 2696 Added: freeswitch/branches/paulb/ Log: Creating empty folder for paulb

1 0

[commit] r2692 - 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 19:40:13 2006 New Revision: 2692 Modified: 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 namespace name again as per others suggestion. 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 19:40:13 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; -using FreeSwitch.NET.Types; +using FreeSwitch.Marshaling.Types; +using FreeSwitch.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class BufferMarshaler : ICustomMarshaler { @@ -60,14 +60,14 @@ public IntPtr MarshalManagedToNative(object obj) { - FreeSwitch.NET.Types.Buffer buffer = (FreeSwitch.NET.Types.Buffer)obj; + FreeSwitch.Types.Buffer buffer = (FreeSwitch.Types.Buffer)obj; return buffer.marshaledObject.Handle; } public object MarshalNativeToManaged(IntPtr bufferPtr) { - FreeSwitch.NET.Types.Buffer buffer = new FreeSwitch.NET.Types.Buffer(); + FreeSwitch.Types.Buffer buffer = new FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * CallerExtensionMarshaler.cs -- - * +/* + * 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> + * + * + * CallerExtensionMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * CallerProfileMarshaler.cs -- - * +/* + * 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> + * + * + * CallerProfileMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * ChannelMarshaler.cs -- - * +/* + * 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> + * + * + * ChannelMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * ChannelTimetableMarshaler.cs -- - * +/* + * 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> + * + * + * ChannelTimetableMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * CoreSessionMarshaler.cs -- - * +/* + * 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> + * + * + * CoreSessionMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,41 +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> - * - * - * EventMarshaler.cs -- - * +/* + * 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> + * + * + * EventMarshaler.cs -- + * */ using System; using System.Collections; -using FreeSwitch.NET.Marshaling.Types; -using FreeSwitch.NET.Types; +using FreeSwitch.Marshaling.Types; +using FreeSwitch.Types; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * FileHandleMarshaler.cs -- - * +/* + * 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> + * + * + * FileHandleMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * MemoryPoolMarshaler.cs -- - * +/* + * 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> + * + * + * MemoryPoolMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -31,11 +31,11 @@ */ using System; using System.Collections; -using FreeSwitch.NET.Marshaling.Types; -using FreeSwitch.NET.Types; +using FreeSwitch.Marshaling.Types; +using FreeSwitch.Types; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.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 19:40:13 2006 @@ -28,21 +28,21 @@ * * ApiInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class ApiInterfaceMarshal - { - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr interface_name; - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr desc; - internal ApiFunction function; - internal IntPtr next; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class ApiInterfaceMarshal + { + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr interface_name; + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr desc; + internal ApiFunction function; + internal IntPtr next; + } +} 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 19:40:13 2006 @@ -28,25 +28,25 @@ * * ApplicationInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class ApplicationInterfaceMarshal - { - // [MarshalAs(UnmanagedType.LPStr)] - internal IntPtr interface_name; - internal ApplicationFunction application_function; - // [MarshalAs(UnmanagedType.LPStr)] - internal IntPtr long_desc; - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr short_desc; - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr syntax; - internal IntPtr next; - } + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class ApplicationInterfaceMarshal + { + // [MarshalAs(UnmanagedType.LPStr)] + internal IntPtr interface_name; + internal ApplicationFunction application_function; + // [MarshalAs(UnmanagedType.LPStr)] + internal IntPtr long_desc; + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr short_desc; + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr syntax; + internal IntPtr next; + } } \ No newline at end of file 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 19:40:13 2006 @@ -28,19 +28,19 @@ * * BufferMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class BufferMarshal - { - [MarshalAs(UnmanagedType.LPStr)] - internal string data; - internal int used; - internal int datalen; - internal UInt32 id; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class BufferMarshal + { + [MarshalAs(UnmanagedType.LPStr)] + internal string data; + internal int used; + internal int datalen; + internal UInt32 id; + } +} 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 19:40:13 2006 @@ -28,19 +28,19 @@ * * CallerExtensionMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class CallerExtensionMarshal - { - internal IntPtr extension_name; - internal IntPtr extension_number; - internal IntPtr current_application; - internal IntPtr last_application; - internal IntPtr applications; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class CallerExtensionMarshal + { + internal IntPtr extension_name; + internal IntPtr extension_number; + internal IntPtr current_application; + internal IntPtr last_application; + internal IntPtr applications; + } +} 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 19:40:13 2006 @@ -1,38 +1,38 @@ -/* - * 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> - * - * - * CallerProfileMarshal.cs -- - * +/* + * 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> + * + * + * CallerProfileMarshal.cs -- + * */ using System; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Marshaling.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -28,19 +28,19 @@ * * ChannelFlagMarshal.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal enum ChannelFlagMarshal - { - CF_SEND_AUDIO, - CF_RECV_AUDIO, - CF_ANSWERED, - CF_OUTBOUND, - CF_EARLY_MEDIA, - CF_ORIGINATOR, - CF_TRANSFER - } -} + */ +using System; + +namespace FreeSwitch.Marshaling.Types +{ + internal enum ChannelFlagMarshal + { + CF_SEND_AUDIO, + CF_RECV_AUDIO, + CF_ANSWERED, + CF_OUTBOUND, + CF_EARLY_MEDIA, + CF_ORIGINATOR, + CF_TRANSFER + } +} 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 19:40:13 2006 @@ -1,39 +1,39 @@ -/* - * 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> - * - * - * ChannelMarshal.cs -- - * +/* + * 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> + * + * + * ChannelMarshal.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; +using FreeSwitch.Types; -namespace FreeSwitch.NET.Marshaling.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -28,20 +28,20 @@ * * ChannelStateMarshal.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal enum ChannelStateMarshal - { - CS_NEW, - CS_INIT, - CS_RING, - CS_TRANSMIT, - CS_EXECUTE, - CS_LOOPBACK, - CS_HANGUP, - CS_DONE - } -} + */ +using System; + +namespace FreeSwitch.Marshaling.Types +{ + internal enum ChannelStateMarshal + { + CS_NEW, + CS_INIT, + CS_RING, + CS_TRANSMIT, + CS_EXECUTE, + CS_LOOPBACK, + CS_HANGUP, + CS_DONE + } +} 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 19:40:13 2006 @@ -28,17 +28,17 @@ * * ChannelTimetableMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class ChannelTimetableMarshal - { - internal Int64 created; - internal Int64 answered; - internal Int64 hungup; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class ChannelTimetableMarshal + { + internal Int64 created; + internal Int64 answered; + internal Int64 hungup; + } +} 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 19:40:13 2006 @@ -28,27 +28,27 @@ * * CodecImplementationMarshal.cs -- * - */ -using System; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal class CodecImplementationMarshal - { - internal UInt32 samples_per_seconds; - internal int bits_per_second; - internal int microseconds_per_frame; - internal UInt32 samples_per_frame; - internal UInt32 bytes_per_frame; - internal UInt32 encoded_bytes_per_frame; - internal Byte number_of_channels; - internal int pref_frames_per_packet; - internal int max_frames_per_packet; - //internal CodecInitMarshal init; - //internal CodecEncodeMarshal encode; - //internal CodecDecode decode; - //internal CodecDestroy destroy; - internal IntPtr next; - } -} + */ +using System; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + internal class CodecImplementationMarshal + { + internal UInt32 samples_per_seconds; + internal int bits_per_second; + internal int microseconds_per_frame; + internal UInt32 samples_per_frame; + internal UInt32 bytes_per_frame; + internal UInt32 encoded_bytes_per_frame; + internal Byte number_of_channels; + internal int pref_frames_per_packet; + internal int max_frames_per_packet; + //internal CodecInitMarshal init; + //internal CodecEncodeMarshal encode; + //internal CodecDecode decode; + //internal CodecDestroy destroy; + internal IntPtr next; + } +} 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 19:40:13 2006 @@ -28,36 +28,36 @@ * * CodecInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class CodecInterfaceMarshal - { - [MarshalAs(UnmanagedType.LPStr)] - internal string interface_name; - /* - internal CodecImplementation application_function; - [MarshalAs(UnmanagedType.LPStr)] - internal string long_desc; - [MarshalAs(UnmanagedType.LPStr)] - internal string short_desc; - [MarshalAs(UnmanagedType.LPStr)] - internal string syntax; - internal IntPtr next; -} - - + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class CodecInterfaceMarshal + { + [MarshalAs(UnmanagedType.LPStr)] + internal string interface_name; + /* + internal CodecImplementation application_function; + [MarshalAs(UnmanagedType.LPStr)] + internal string long_desc; + [MarshalAs(UnmanagedType.LPStr)] + internal string short_desc; + [MarshalAs(UnmanagedType.LPStr)] + internal string syntax; + internal IntPtr next; +} + + struct switch_codec_interface { ! the name of the interface const char *interface_name; ! a list of codec implementations related to the codec const switch_codec_implementation_t *implementations; const struct switch_codec_interface *next; -};*/ - } +};*/ + } } \ No newline at end of file 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 19:40:13 2006 @@ -28,19 +28,19 @@ * * CodecMarshal.cs -- * - */ -using System; -using System.Text; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal class CodecMarshal - { - internal IntPtr codec_interface; - internal IntPtr implementation; - //internal CodecSettingsMarshal codec_settings; - internal UInt32 flags; - //internal MemoryPoolMarshal memory_pool; - internal IntPtr private_info; - } -} + */ +using System; +using System.Text; + +namespace FreeSwitch.Marshaling.Types +{ + internal class CodecMarshal + { + internal IntPtr codec_interface; + internal IntPtr implementation; + //internal CodecSettingsMarshal codec_settings; + internal UInt32 flags; + //internal MemoryPoolMarshal memory_pool; + internal IntPtr private_info; + } +} 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 19:40:13 2006 @@ -28,16 +28,16 @@ * * CodecTypeMarshal.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal enum CodecTypesMarshal - { - SWITCH_CODEC_TYPE_AUDIO, - SWITCH_CODEC_TYPE_VIDEO, - SWITCH_CODEC_TYPE_T38, - SWITCH_CODEC_TYPE_APP - } -} + */ +using System; + +namespace FreeSwitch.Marshaling.Types +{ + internal enum CodecTypesMarshal + { + SWITCH_CODEC_TYPE_AUDIO, + SWITCH_CODEC_TYPE_VIDEO, + SWITCH_CODEC_TYPE_T38, + SWITCH_CODEC_TYPE_APP + } +} 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 19:40:13 2006 @@ -28,41 +28,41 @@ * * CoreSessionMarshal.cs -- * - */ -using System; -using System.Text; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential, Pack=1)] - internal class CoreSessionMarshal - { - internal UInt32 id; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=80)] - internal byte[] name; - internal int thread_running; - internal IntPtr pool; - internal IntPtr channel; - internal IntPtr thread; - internal IntPtr endpoint_interface; - internal IOEventHooksMarshal event_hooks; - internal IntPtr read_codec; - internal IntPtr write_codec; - internal IntPtr raw_write_buffer; - internal FrameMarshal raw_write_frame; - internal FrameMarshal enc_write_frame; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] raw_write_buf; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] enc_write_buf; - internal IntPtr raw_read_buffer; - internal FrameMarshal raw_read_frame; - internal FrameMarshal enc_read_frame; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] raw_read_buf; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] enc_read_buf; + */ +using System; +using System.Text; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential, Pack=1)] + internal class CoreSessionMarshal + { + internal UInt32 id; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=80)] + internal byte[] name; + internal int thread_running; + internal IntPtr pool; + internal IntPtr channel; + internal IntPtr thread; + internal IntPtr endpoint_interface; + internal IOEventHooksMarshal event_hooks; + internal IntPtr read_codec; + internal IntPtr write_codec; + internal IntPtr raw_write_buffer; + internal FrameMarshal raw_write_frame; + internal FrameMarshal enc_write_frame; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] raw_write_buf; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] enc_write_buf; + internal IntPtr raw_read_buffer; + internal FrameMarshal raw_read_frame; + internal FrameMarshal enc_read_frame; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] raw_read_buf; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] enc_read_buf; internal IntPtr read_resampler; internal IntPtr write_resampler; internal IntPtr mutex; @@ -73,8 +73,8 @@ internal int stream_count; /* 36 + 1 char string, but need to grab 40 bytes */ [MarshalAs(UnmanagedType.ByValArray, SizeConst=40)] - internal byte[] uuid_str; + internal byte[] uuid_str; internal IntPtr private_info; internal IntPtr event_queue; - } -} + } +} 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 19:40:13 2006 @@ -28,32 +28,32 @@ * * EventMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class EventMarshal - { - internal EventType event_id; - internal Priority priority; - internal IntPtr owner; - internal IntPtr subclass; - internal IntPtr headers; - internal IntPtr body; - internal IntPtr bind_user_data; - internal IntPtr event_user_data; - internal IntPtr next; - } - - [StructLayout(LayoutKind.Sequential)] - internal class EventHeaderMarshal - { - internal string name; - internal string value; - internal IntPtr next; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class EventMarshal + { + internal EventType event_id; + internal Priority priority; + internal IntPtr owner; + internal IntPtr subclass; + internal IntPtr headers; + internal IntPtr body; + internal IntPtr bind_user_data; + internal IntPtr event_user_data; + internal IntPtr next; + } + + [StructLayout(LayoutKind.Sequential)] + internal class EventHeaderMarshal + { + internal string name; + internal string value; + internal IntPtr next; + } +} 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 19:40:13 2006 @@ -28,30 +28,30 @@ * * FileHandleMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class FileHandleMarshal - { - internal IntPtr file_interface; - internal UInt32 flags; - internal IntPtr fd; - internal uint samples; - internal UInt32 samplerate; - internal Byte channels; - internal uint format; - internal uint sections; - internal int seekable; - internal uint sample_count; - internal int speed; - internal IntPtr memory_pool; - internal IntPtr private_info; - internal Int64 pos; - internal IntPtr audio_buffer; - } - -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class FileHandleMarshal + { + internal IntPtr file_interface; + internal UInt32 flags; + internal IntPtr fd; + internal uint samples; + internal UInt32 samplerate; + internal Byte channels; + internal uint format; + internal uint sections; + internal int seekable; + internal uint sample_count; + internal int speed; + internal IntPtr memory_pool; + internal IntPtr private_info; + internal Int64 pos; + internal IntPtr audio_buffer; + } + +} 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 19:40:13 2006 @@ -28,27 +28,27 @@ * * FrameMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class FrameMarshal - { - internal IntPtr codec; - internal IntPtr source; - internal IntPtr packet; - internal UInt32 packetlen; - internal IntPtr data; - internal UInt32 datalen; - internal UInt32 buflen; - internal UInt32 samples; - internal UInt32 rate; - internal byte payload; - internal UInt32 timestamp; - internal byte flags; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class FrameMarshal + { + internal IntPtr codec; + internal IntPtr source; + internal IntPtr packet; + internal UInt32 packetlen; + internal IntPtr data; + internal UInt32 datalen; + internal UInt32 buflen; + internal UInt32 samples; + internal UInt32 rate; + internal byte payload; + internal UInt32 timestamp; + internal byte flags; + } +} 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 19:40:13 2006 @@ -28,24 +28,24 @@ * * IOEventHooksMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class IOEventHooksMarshal - { - internal IntPtr outgoing_channel; - internal IntPtr answer_channel; - internal IntPtr receive_message; - internal IntPtr receive_event; - internal IntPtr read_frame; - internal IntPtr write_frame; - internal IntPtr kill_channel; - internal IntPtr waitfor_read; - internal IntPtr waitfor_write; - internal IntPtr send_dtmf; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class IOEventHooksMarshal + { + internal IntPtr outgoing_channel; + internal IntPtr answer_channel; + internal IntPtr receive_message; + internal IntPtr receive_event; + internal IntPtr read_frame; + internal IntPtr write_frame; + internal IntPtr kill_channel; + internal IntPtr waitfor_read; + internal IntPtr waitfor_write; + internal IntPtr send_dtmf; + } +} 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 19:40:13 2006 @@ -28,25 +28,25 @@ * * LoadableModuleInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class LoadableModuleInterfaceMarshal - { - internal IntPtr module_name; - internal IntPtr endpoint_interface; - internal IntPtr timer_interface; - internal IntPtr dialplan_interface; - internal IntPtr codec_interface; - internal IntPtr application_interface; - internal IntPtr api_interface; - internal IntPtr file_interface; - internal IntPtr speech_interface; - internal IntPtr directory_interface; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class LoadableModuleInterfaceMarshal + { + internal IntPtr module_name; + internal IntPtr endpoint_interface; + internal IntPtr timer_interface; + internal IntPtr dialplan_interface; + internal IntPtr codec_interface; + internal IntPtr application_interface; + internal IntPtr api_interface; + internal IntPtr file_interface; + internal IntPtr speech_interface; + internal IntPtr directory_interface; + } +} 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 19:40:13 2006 @@ -28,27 +28,27 @@ * * LoadableModuleMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - - - [StructLayout(LayoutKind.Sequential)] - public class LoadableModuleMarshal - { - public IntPtr filename; - public IntPtr module_interface; - public IntPtr lib; - public ModuleLoad module_load; - public ModuleReload module_reload; - public ModulePause module_pause; - public ModuleResume module_resume; - public ModuleStatus module_status; - public ModuleRuntime module_runtime; - public ModuleShutdown module_shutdown; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + + + [StructLayout(LayoutKind.Sequential)] + public class LoadableModuleMarshal + { + public IntPtr filename; + public IntPtr module_interface; + public IntPtr lib; + public ModuleLoad module_load; + public ModuleReload module_reload; + public ModulePause module_pause; + public ModuleResume module_resume; + public ModuleStatus module_status; + public ModuleRuntime module_runtime; + public ModuleShutdown module_shutdown; + } +} 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 19:40:13 2006 @@ -28,21 +28,21 @@ * * StreamHandleMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.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; - } -} + */ +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/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 19:40:13 2006 @@ -28,18 +28,18 @@ * * TypesMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - public delegate - Status DtmfCallbackFunctionMarshal( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] - CoreSession session, - string dtmf, - IntPtr buf, - uint buflen); -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + public delegate + Status DtmfCallbackFunctionMarshal( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] + CoreSession session, + string dtmf, + IntPtr buf, + uint buflen); +} 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 19:40:13 2006 @@ -1,50 +1,50 @@ -/* - * 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> - * - * - * Module.cs -- - * - */ +/* + * 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> + * + * + * Module.cs -- + * + */ using System; using System.Collections; using System.Reflection; using System.Runtime.InteropServices; using System.Text; using FreeSwitch.NET; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Modules; -using FreeSwitch.NET.Marshaling.Types; - -namespace FreeSwitch.NET -{ +using FreeSwitch.Types; +using FreeSwitch.Modules; +using FreeSwitch.Marshaling.Types; + +namespace FreeSwitch.NET +{ /// <summary> /// Base class for all Freeswitch.NET modules - /// </summary> - /// <example> + /// </summary> + /// <example> /// public class Example : Module /// { /// public Example() @@ -54,9 +54,9 @@ /// /// Register(); /// } - /// } - /// </example> - public class Module + /// } + /// </example> + public class Module { private LoadableModuleInterfaceMarshal module_interface = new LoadableModuleInterfaceMarshal(); private LoadableModuleMarshal module = new LoadableModuleMarshal(); @@ -71,19 +71,19 @@ /// <summary> /// Module constructor /// </summary> - public Module() + public Module() { - Console.WriteLine("*** Creating new module object"); - - load = new ModuleLoad(Load); - } - + Console.WriteLine("*** Creating new module object"); + + load = new ModuleLoad(Load); + } + /// <summary> /// Implementation of ModuleLoad Delegate /// </summary> /// <param name="module"></param> /// <param name="name"></param> - /// <returns></returns> + /// <returns></returns> public Status Load(ref IntPtr module, string name) { /* Allocate some unmanaged mem for the ModuleInterface */ @@ -110,13 +110,13 @@ Marshal.StructureToPtr(module_interface, module, true); return Status.Success; - } - + } + /// <summary> /// AddApiInterface /// </summary> - /// <param name="apiInterface"></param> - public void AddApiInterface(Api apiInterface) + /// <param name="apiInterface"></param> + public void AddApiInterface(Api apiInterface) { /* Create a new ApiInterface type and allocate unmanaged mem */ ApiInterfaceMarshal apiInterfaceMarshal = new ApiInterfaceMarshal(); @@ -185,21 +185,21 @@ /* Finally, add our new interface to the array */ applicationInterfaces.Add(applicationInterface); - } - + } + /// <summary> /// Register - /// </summary> - public void Register() + /// </summary> + public void Register() { module.module_load = new ModuleLoad(Load); - Switch.switch_loadable_module_build_dynamic(filename, - module.module_load, - module.module_runtime, - module.module_shutdown); + Switch.switch_loadable_module_build_dynamic(filename, + module.module_load, + module.module_runtime, + module.module_shutdown); } - - } -} + + } +} 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 19:40:13 2006 @@ -1,41 +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> - * - * - * Api.cs -- - * +/* + * 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> + * + * + * Api.cs -- + * */ using System; using System.Collections; using System.Text; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; +using FreeSwitch.Types; -namespace FreeSwitch.NET.Modules +namespace FreeSwitch.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 19:40:13 2006 @@ -1,43 +1,43 @@ -/* - * 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> - * - * - * Application.cs -- - * +/* + * 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> + * + * + * Application.cs -- + * */ using System; using System.Collections; using System.Text; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Modules +namespace FreeSwitch.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 19:40:13 2006 @@ -1,42 +1,42 @@ -/* - * 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> - * - * - * CallerProfile.cs -- - * +/* + * 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> + * + * + * CallerProfile.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { 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 19:40:13 2006 @@ -1,41 +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> - * - * - * Channel.cs -- - * +/* + * 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> + * + * + * Channel.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; -namespace FreeSwitch.NET +namespace FreeSwitch { public partial class Switch { @@ -60,14 +60,14 @@ [DllImport("freeswitch")] public extern static - 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, + 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")] 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 19:40:13 2006 @@ -34,7 +34,7 @@ using System.Diagnostics; using System.Text; -namespace FreeSwitch.NET +namespace FreeSwitch { 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 19:40:13 2006 @@ -1,41 +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> - * - * - * CoreSession.cs -- - * +/* + * 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> + * + * + * CoreSession.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; -namespace FreeSwitch.NET +namespace FreeSwitch { 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 19:40:13 2006 @@ -1,42 +1,42 @@ -/* - * 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> - * - * - * Ivr.cs -- - * +/* + * 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> + * + * + * Ivr.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { 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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * LoadableModule.cs -- - * +/* + * 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> + * + * + * LoadableModule.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { /* * 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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * LoadableModule.cs -- - * +/* + * 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> + * + * + * LoadableModule.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { /* * 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 19:40:13 2006 @@ -28,10 +28,10 @@ * * ApplicationFunction.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - -} + */ +using System; + +namespace FreeSwitch.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 19:40:13 2006 @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Text; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -28,29 +28,29 @@ * * Buffer.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Types -{ - public class Buffer - { - internal HandleRef marshaledObject; - - public string Data - { - get { throw new NotImplementedException(); } - } - - public int Used - { - get { throw new NotImplementedException(); } - } - - public int Length - { - get { throw new NotImplementedException(); } - } - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Types +{ + public class Buffer + { + internal HandleRef marshaledObject; + + public string Data + { + get { throw new NotImplementedException(); } + } + + public int Used + { + get { throw new NotImplementedException(); } + } + + public int Length + { + get { throw new NotImplementedException(); } + } + } +} 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 19:40:13 2006 @@ -1,37 +1,37 @@ -/* - * 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> - * - * - * CallCause.cs -- - * +/* + * 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> + * + * + * CallCause.cs -- + * */ using System; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -1,39 +1,39 @@ -/* - * 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> - * - * - * CallerExtension.cs -- - * +/* + * 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> + * + * + * CallerExtension.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -1,39 +1,39 @@ -/* - * 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> - * - * - * CallerProfile.cs -- - * +/* + * 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> + * + * + * CallerProfile.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -1,63 +1,63 @@ -/* - * 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> - * - * - * Channel.cs -- - * +/* + * 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> + * + * + * Channel.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* - * char *name; - switch_buffer_t *dtmf_buffer; - switch_mutex_t *dtmf_mutex; - switch_mutex_t *flag_mutex; - switch_mutex_t *profile_mutex; - switch_core_session_t *session; - switch_channel_state_t state; - uint32_t flags; - switch_caller_profile_t *caller_profile; - switch_caller_profile_t *originator_caller_profile; - switch_caller_profile_t *originatee_caller_profile; - switch_caller_extension_t *caller_extension; - const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; - int state_handler_index; - switch_hash_t *variables; - switch_channel_timetable_t *times; - void *private_info; - switch_call_cause_t hangup_cause; - int freq; - int bits; - int channels; - int ms; + * char *name; + switch_buffer_t *dtmf_buffer; + switch_mutex_t *dtmf_mutex; + switch_mutex_t *flag_mutex; + switch_mutex_t *profile_mutex; + switch_core_session_t *session; + switch_channel_state_t state; + uint32_t flags; + switch_caller_profile_t *caller_profile; + switch_caller_profile_t *originator_caller_profile; + switch_caller_profile_t *originatee_caller_profile; + switch_caller_extension_t *caller_extension; + const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; + int state_handler_index; + switch_hash_t *variables; + switch_channel_timetable_t *times; + void *private_info; + switch_call_cause_t hangup_cause; + int freq; + int bits; + int channels; + int ms; int kbps; */ public class Channel 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 19:40:13 2006 @@ -28,19 +28,19 @@ * * ChannelFlag.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum ChannelFlag - { - CF_SEND_AUDIO, - CF_RECV_AUDIO, - CF_ANSWERED, - CF_OUTBOUND, - CF_EARLY_MEDIA, - CF_ORIGINATOR, - CF_TRANSFER - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum ChannelFlag + { + CF_SEND_AUDIO, + CF_RECV_AUDIO, + CF_ANSWERED, + CF_OUTBOUND, + CF_EARLY_MEDIA, + CF_ORIGINATOR, + CF_TRANSFER + } +} 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 19:40:13 2006 @@ -28,20 +28,20 @@ * * ChannelState.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum ChannelState - { - CS_NEW, - CS_INIT, - CS_RING, - CS_TRANSMIT, - CS_EXECUTE, - CS_LOOPBACK, - CS_HANGUP, - CS_DONE - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum ChannelState + { + CS_NEW, + CS_INIT, + CS_RING, + CS_TRANSMIT, + CS_EXECUTE, + CS_LOOPBACK, + CS_HANGUP, + CS_DONE + } +} 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 19:40:13 2006 @@ -28,29 +28,29 @@ * * ChannelTimetable.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Types -{ - public class ChannelTimetable - { - internal HandleRef marshaledObject; - - public Int64 Created - { - get { throw new NotImplementedException(); } - } - - public Int64 Answered - { - get { throw new NotImplementedException(); } - } - - public Int64 Hungup - { - get { throw new NotImplementedException(); } - } - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Types +{ + public class ChannelTimetable + { + internal HandleRef marshaledObject; + + public Int64 Created + { + get { throw new NotImplementedException(); } + } + + public Int64 Answered + { + get { throw new NotImplementedException(); } + } + + public Int64 Hungup + { + get { throw new NotImplementedException(); } + } + } +} 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 19:40:13 2006 @@ -1,80 +1,80 @@ -/* - * 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> - * - * - * CoreSession.cs -- - * +/* + * 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> + * + * + * CoreSession.cs -- + * */ using System; using System.Collections; using System.Runtime.InteropServices; using System.Text; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* - * uint32_t id; - char name[80]; - int thread_running; - switch_memory_pool_t *pool; - switch_channel_t *channel; - switch_thread_t *thread; - const switch_endpoint_interface_t *endpoint_interface; - switch_io_event_hooks_t event_hooks; - switch_codec_t *read_codec; - switch_codec_t *write_codec; - - switch_buffer_t *raw_write_buffer; - switch_frame_t raw_write_frame; - switch_frame_t enc_write_frame; - uint8_t raw_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - uint8_t enc_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - - switch_buffer_t *raw_read_buffer; - switch_frame_t raw_read_frame; - switch_frame_t enc_read_frame; - uint8_t raw_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - uint8_t enc_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - - - switch_audio_resampler_t *read_resampler; - switch_audio_resampler_t *write_resampler; - - switch_mutex_t *mutex; - switch_thread_cond_t *cond; - - switch_thread_rwlock_t *rwlock; - - void *streams[SWITCH_MAX_STREAMS]; - int stream_count; - - char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - void *private_info; + * uint32_t id; + char name[80]; + int thread_running; + switch_memory_pool_t *pool; + switch_channel_t *channel; + switch_thread_t *thread; + const switch_endpoint_interface_t *endpoint_interface; + switch_io_event_hooks_t event_hooks; + switch_codec_t *read_codec; + switch_codec_t *write_codec; + + switch_buffer_t *raw_write_buffer; + switch_frame_t raw_write_frame; + switch_frame_t enc_write_frame; + uint8_t raw_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + uint8_t enc_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + + switch_buffer_t *raw_read_buffer; + switch_frame_t raw_read_frame; + switch_frame_t enc_read_frame; + uint8_t raw_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + uint8_t enc_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + + + switch_audio_resampler_t *read_resampler; + switch_audio_resampler_t *write_resampler; + + switch_mutex_t *mutex; + switch_thread_cond_t *cond; + + switch_thread_rwlock_t *rwlock; + + void *streams[SWITCH_MAX_STREAMS]; + int stream_count; + + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + void *private_info; switch_queue_t *event_queue; */ public class CoreSession 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 19:40:13 2006 @@ -28,10 +28,10 @@ * * DtmfCallbackFunction.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public delegate Status DtmfCallbackFunction(CoreSession session, string dtmf); -} + */ +using System; + +namespace FreeSwitch.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 19:40:13 2006 @@ -1,40 +1,40 @@ -/* - * 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> - * - * - * Event.cs -- - * +/* + * 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> + * + * + * Event.cs -- + * */ using System; using System.Collections; using System.Text; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -28,15 +28,15 @@ * * FileHandle.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; - -namespace FreeSwitch.NET.Types -{ - public class FileHandle - { - internal HandleRef marshaledObject; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling.Types; + +namespace FreeSwitch.Types +{ + public class FileHandle + { + internal HandleRef marshaledObject; + } +} 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 19:40:13 2006 @@ -28,20 +28,20 @@ * * DtmfCallbackFunction.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling; - -namespace FreeSwitch.NET.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); -} + */ +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); +} 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 19:40:13 2006 @@ -28,14 +28,14 @@ * * ChannelState.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum InputType - { + */ +using System; + +namespace FreeSwitch.Types +{ + public enum InputType + { INPUT_TYPE_DTMF, INPUT_TYPE_EVENT - } -} + } +} 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 19:40:13 2006 @@ -1,38 +1,38 @@ -/* - * 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> - * - * - * Channel.cs -- - * +/* + * 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> + * + * + * Channel.cs -- + * */ using System; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -28,34 +28,34 @@ * * LoadableModuleInterfaces.cs -- * - */ -using System; -using System.Collections; -using System.Runtime.InteropServices; -using System.Text; -using FreeSwitch.NET.Marshaling; - -namespace FreeSwitch.NET.Types -{ - public delegate Status WriteFunction( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] - StreamHandle streamHandle, - [MarshalAs(UnmanagedType.LPStr)] - string fmt); - - //public delegate void ModuleLoad(); - - public class LoadableModuleInterface - { - private string module_name; - //private EndpointInterface endpoint_interface; - //private TimerInterface timer_interface; - //private DialplanInterface dialplan_interface; - //private CodecInterface codec_interface; - //private ApplicationInterface application_interface; - //private ApiInterface api_interface; - //private FileInterface file_interface; - //private SpeechInterface speech_interface; - //private DirectoryInterface directory_interface; - } + */ +using System; +using System.Collections; +using System.Runtime.InteropServices; +using System.Text; +using FreeSwitch.Marshaling; + +namespace FreeSwitch.Types +{ + public delegate Status WriteFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] + StreamHandle streamHandle, + [MarshalAs(UnmanagedType.LPStr)] + string fmt); + + //public delegate void ModuleLoad(); + + public class LoadableModuleInterface + { + private string module_name; + //private EndpointInterface endpoint_interface; + //private TimerInterface timer_interface; + //private DialplanInterface dialplan_interface; + //private CodecInterface codec_interface; + //private ApplicationInterface application_interface; + //private ApiInterface api_interface; + //private FileInterface file_interface; + //private SpeechInterface speech_interface; + //private DirectoryInterface directory_interface; + } } 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 19:40:13 2006 @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.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 19:40:13 2006 @@ -28,32 +28,32 @@ * * Module.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling; - -namespace FreeSwitch.NET.Types -{ - public delegate Status ModuleReload(); - public delegate bool ModulePause(); - public delegate bool ModuleResume(); - public delegate bool ModuleStatus(); - public delegate Status ModuleRuntime(); - public delegate bool ModuleShutdown(); - public delegate Status ModuleLoad(ref IntPtr module, string name); - - public delegate void - ApplicationFunction( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] - CoreSession session, - [MarshalAs(UnmanagedType.LPStr)] - string data); - - public delegate Status - ApiFunction( - [MarshalAs(UnmanagedType.LPStr)] - string command, - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(StreamHandleMarshaler))] - StreamHandle streamHandle); -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling; + +namespace FreeSwitch.Types +{ + public delegate Status ModuleReload(); + public delegate bool ModulePause(); + public delegate bool ModuleResume(); + public delegate bool ModuleStatus(); + public delegate Status ModuleRuntime(); + public delegate bool ModuleShutdown(); + public delegate Status ModuleLoad(ref IntPtr module, string name); + + public delegate void + ApplicationFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] + CoreSession session, + [MarshalAs(UnmanagedType.LPStr)] + string data); + + public delegate Status + ApiFunction( + [MarshalAs(UnmanagedType.LPStr)] + string command, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(StreamHandleMarshaler))] + StreamHandle streamHandle); +} 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 19:40:13 2006 @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Text; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* public class ApplicationInterface @@ -44,26 +44,26 @@ private string long_desc; private string short_desc; private string syntax; - //const struct switch_application_interface *next; - - public string InterfaceName - { - get { return interface_name; } - } - - public ApplicationFunction ApplicationFunction - { - get { return application_function; } - } - - public string LongDesc - { - get { return long_desc; } - } - - public string ShortDesc - { - get { return short_desc; } + //const struct switch_application_interface *next; + + public string InterfaceName + { + get { return interface_name; } + } + + public ApplicationFunction ApplicationFunction + { + get { return application_function; } + } + + public string LongDesc + { + get { return long_desc; } + } + + public string ShortDesc + { + get { return short_desc; } } }*/ } 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 19:40:13 2006 @@ -28,24 +28,24 @@ * * Status.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum Status - { - Success, - False, - Timeout, - Restart, - Terminate, - NotImplemented, - MemoryError, - NoOp, - Resample, - GeneralError, - InUse, - Break - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum Status + { + Success, + False, + Timeout, + Restart, + Terminate, + NotImplemented, + MemoryError, + NoOp, + Resample, + GeneralError, + InUse, + Break + } +} 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 19:40:13 2006 @@ -28,24 +28,24 @@ * * StreamHandle.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; - -namespace FreeSwitch.NET.Types -{ - public class StreamHandle - { - internal HandleRef marshaledObject; - internal WriteFunction writeFunction; - - public void Write(string data) - { - StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal)marshaledObject.Wrapper; - WriteFunction writeFunction = (WriteFunction)Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); - - writeFunction(this, data); - } - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling.Types; + +namespace FreeSwitch.Types +{ + public class StreamHandle + { + internal HandleRef marshaledObject; + internal WriteFunction writeFunction; + + public void Write(string data) + { + 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 19:40:13 2006 @@ -28,15 +28,15 @@ * * TextChannel.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum TextChannel - { - ChannelIdConsole, - ChannelIdConsoleClean, - ChannelIdEvent - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum TextChannel + { + ChannelIdConsole, + ChannelIdConsoleClean, + ChannelIdEvent + } +}

1 0

[commit] r2689 - freeswitch/branches/te3jay
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: sphere Date: Wed Sep 13 16:21:27 2006 New Revision: 2689 Added: freeswitch/branches/te3jay/ Log: Creating empty folder for te3jay

1 0

[commit] r2688 - freeswitch/branches/jorge
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: sphere Date: Wed Sep 13 16:09:27 2006 New Revision: 2688 Added: freeswitch/branches/jorge/ Log: Creating empty folder for jorge

1 0

[commit] r2686 - freeswitch/branches/andrew
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: sphere Date: Wed Sep 13 13:02:26 2006 New Revision: 2686 Added: freeswitch/branches/andrew/ Log: Creating empty folder for andrew

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