Undoing framehook support. Issues were uncovered by Bamboo.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413668 65c4cc65-6c06-0410-ace0-fbb531ad65f3

3 files changed, 0 insertions, 31 deletions

diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index a5827f2ad..9a49b427b 100644
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -2614,12 +2614,6 @@ static struct ast_frame *transfer_target_framehook_cb(struct ast_channel *chan,
 	return frame;
 }
 
-/*! \brief Callback function which informs upstream if we are consuming a frame of a specific type */
-static int transfer_target_framehook_consume(void *data, enum ast_frame_type type)
-{
-	return (type == AST_FRAME_CONTROL ? 1 : 0);
-}
-
 static void transfer_target_framehook_destroy_cb(void *data)
 {
 	struct attended_transfer_properties *props = data;
@@ -2853,7 +2847,6 @@ static int attach_framehook(struct attended_transfer_properties *props, struct a
 		.version = AST_FRAMEHOOK_INTERFACE_VERSION,
 		.event_cb = transfer_target_framehook_cb,
 		.destroy_cb = transfer_target_framehook_destroy_cb,
-		.consume_cb = transfer_target_framehook_consume,
 	};
 
 	ao2_ref(props, +1);
diff --git a/main/channel.c b/main/channel.c
index 2d84c771d..1161fb676 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2668,13 +2668,6 @@ int ast_channel_has_audio_frame_or_monitor(struct ast_channel *chan)
 		|| !ast_framehook_list_contains_no_active(ast_channel_framehooks(chan));
 }
 
-int ast_channel_has_hook_requiring_audio(struct ast_channel *chan)
-{
-	return ast_channel_monitor(chan)
-		|| !ast_audiohook_write_list_empty(ast_channel_audiohooks(chan))
-		|| !ast_framehook_list_contains_no_active_of_type(ast_channel_framehooks(chan), AST_FRAME_VOICE);
-}
-
 static void destroy_hooks(struct ast_channel *chan)
 {
 	if (ast_channel_audiohooks(chan)) {
diff --git a/main/framehook.c b/main/framehook.c
index 053e11a76..0d353cf36 100644
--- a/main/framehook.c
+++ b/main/framehook.c
@@ -160,10 +160,6 @@ int ast_framehook_attach(struct ast_channel *chan, struct ast_framehook_interfac
 		ast_frfree(frame);
 	}
 
-	if (ast_channel_is_bridged(chan)) {
-		ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE);
-	}
-
 	return framehook->id;
 }
 
@@ -189,10 +185,6 @@ int ast_framehook_detach(struct ast_channel *chan, int id)
 	}
 	AST_LIST_TRAVERSE_SAFE_END;
 
-	if (!res && ast_channel_is_bridged(chan)) {
-		ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE);
-	}
-
 	return res;
 }
 
@@ -223,12 +215,6 @@ int ast_framehook_list_is_empty(struct ast_framehook_list *framehooks)
 
 int ast_framehook_list_contains_no_active(struct ast_framehook_list *framehooks)
 {
-	return ast_framehook_list_contains_no_active_of_type(framehooks, 0);
-}
-
-int ast_framehook_list_contains_no_active_of_type(struct ast_framehook_list *framehooks,
-	enum ast_frame_type type)
-{
 	struct ast_framehook *cur;
 
 	if (!framehooks) {
@@ -243,9 +229,6 @@ int ast_framehook_list_contains_no_active_of_type(struct ast_framehook_list *fra
 		if (cur->detach_and_destroy_me) {
 			continue;
 		}
-		if (type && cur->i.consume_cb && !cur->i.consume_cb(cur->i.data, type)) {
-			continue;
-		}
 		return 0;
 	}