From dcd7e95387d360014ce90dee53a5f7a20ef79637 Mon Sep 17 00:00:00 2001 From: skrusty Date: Thu, 9 Jan 2014 10:09:40 +0000 Subject: [PATCH] Fixed issue with ConfBridge vents and AMI failing to start --- .../Asterisk.NET/Manager/Event/AbstractConfbridgeEvent.cs | 5 +++++ .../Asterisk.NET/Manager/Event/ConfbridgeEndEvent.cs | 4 ++++ .../Asterisk.NET/Manager/Event/ConfbridgeJoinEvent.cs | 5 +++++ .../Asterisk.NET/Manager/Event/ConfbridgeLeaveEvent.cs | 5 +++++ .../Manager/Event/ConfbridgeListCompleteEvent.cs | 6 +++++- .../Asterisk.NET/Manager/Event/ConfbridgeListEvent.cs | 8 ++------ .../Manager/Event/ConfbridgeListRoomsEvent.cs | 7 +------ .../Asterisk.NET/Manager/Event/ConfbridgeStartEvent.cs | 5 ++++- .../Asterisk.NET/Manager/Event/ConfbridgeTalkingEvent.cs | 5 +++++ Asterisk.2013/ChangeLog.txt | 3 +++ 10 files changed, 39 insertions(+), 14 deletions(-) diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/AbstractConfbridgeEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/AbstractConfbridgeEvent.cs index ede33de..c61dcda 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/AbstractConfbridgeEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/AbstractConfbridgeEvent.cs @@ -12,5 +12,10 @@ namespace AsterNET.Manager.Event /// /// public string Conference { get; set; } + + public AbstractConfbridgeEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeEndEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeEndEvent.cs index 5c48ec4..c1cdcdd 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeEndEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeEndEvent.cs @@ -8,5 +8,9 @@ namespace AsterNET.Manager.Event { public class ConfbridgeEndEvent : AbstractConfbridgeEvent { + public ConfbridgeEndEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeJoinEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeJoinEvent.cs index aba665e..06d9088 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeJoinEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeJoinEvent.cs @@ -17,5 +17,10 @@ namespace AsterNET.Manager.Event /// /// public string CallerIDname { get; set; } + + public ConfbridgeJoinEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeLeaveEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeLeaveEvent.cs index 89d1823..d53fde1 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeLeaveEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeLeaveEvent.cs @@ -17,5 +17,10 @@ namespace AsterNET.Manager.Event /// /// public string CallerIDname { get; set; } + + public ConfbridgeLeaveEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListCompleteEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListCompleteEvent.cs index 197ee13..ff847b4 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListCompleteEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListCompleteEvent.cs @@ -6,7 +6,11 @@ using System.Threading.Tasks; namespace AsterNET.Manager.Event { - class ConfbridgeListCompleteEvent + public class ConfbridgeListCompleteEvent : ResponseEvent { + public ConfbridgeListCompleteEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListEvent.cs index 19bf293..56c89cb 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListEvent.cs @@ -6,13 +6,9 @@ using System.Threading.Tasks; namespace AsterNET.Manager.Event { - public class ConfbridgeListEvent : ResponseEvent + public class ConfbridgeListEvent : AbstractConfbridgeEvent { - /// - /// - /// - public string Conference { get; set; } - + /// /// /// diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListRoomsEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListRoomsEvent.cs index 30efeee..5d137ee 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListRoomsEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeListRoomsEvent.cs @@ -6,13 +6,8 @@ using System.Threading.Tasks; namespace AsterNET.Manager.Event { - public class ConfbridgeListRoomsEvent : ResponseEvent + public class ConfbridgeListRoomsEvent : AbstractConfbridgeEvent { - /// - /// - /// - public string Conference { get; set; } - /// /// /// diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeStartEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeStartEvent.cs index 4eeea64..c5bb7d7 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeStartEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeStartEvent.cs @@ -8,6 +8,9 @@ namespace AsterNET.Manager.Event { public class ConfbridgeStartEvent : AbstractConfbridgeEvent { - + public ConfbridgeStartEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeTalkingEvent.cs b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeTalkingEvent.cs index 7dc07ad..1ec10df 100644 --- a/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeTalkingEvent.cs +++ b/Asterisk.2013/Asterisk.NET/Manager/Event/ConfbridgeTalkingEvent.cs @@ -12,5 +12,10 @@ namespace AsterNET.Manager.Event /// /// public string TalkingStatus { get; set; } + + public ConfbridgeTalkingEvent(ManagerConnection source) + : base(source) + { + } } } diff --git a/Asterisk.2013/ChangeLog.txt b/Asterisk.2013/ChangeLog.txt index 941f859..e62ba99 100644 --- a/Asterisk.2013/ChangeLog.txt +++ b/Asterisk.2013/ChangeLog.txt @@ -1,3 +1,6 @@ +09.09.2014 (skrusty) + Fixed issues with ConfBridge events causing AMI to fail. + 08.01.2014 (skrusty) Migrated to Visual Studio 2013 Migrated from TFS to Git on Codeplex