[asterisk-commits] oej: branch oej/silence-detection-games-1.8 r411815 - in /team/oej/silence-de...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Apr  7 10:07:56 2014
New Revision: 411815

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411815
Log:
Various typos and generally bad stuff

Modified:
    team/oej/silence-detection-games-1.8/channels/chan_sip.c
    team/oej/silence-detection-games-1.8/main/silencedetection.c

Modified: team/oej/silence-detection-games-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/silence-detection-games-1.8/channels/chan_sip.c?view=diff&rev=411815&r1=411814&r2=411815
==============================================================================
--- team/oej/silence-detection-games-1.8/channels/chan_sip.c (original)
+++ team/oej/silence-detection-games-1.8/channels/chan_sip.c Mon Apr  7 10:07:56 2014
@@ -7967,7 +7967,6 @@
 	struct ast_frame *fr;
 	struct sip_pvt *p = ast->tech_pvt;
 	int faxdetected = FALSE;
-	int dsptime = 0;
 
 	sip_pvt_lock(p);
 	fr = sip_rtp_read(ast, p, &faxdetected);

Modified: team/oej/silence-detection-games-1.8/main/silencedetection.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/silence-detection-games-1.8/main/silencedetection.c?view=diff&rev=411815&r1=411814&r2=411815
==============================================================================
--- team/oej/silence-detection-games-1.8/main/silencedetection.c (original)
+++ team/oej/silence-detection-games-1.8/main/silencedetection.c Mon Apr  7 10:07:56 2014
@@ -55,7 +55,7 @@
 #include "asterisk/frame.h"
 #include "asterisk/utils.h"
 #include "asterisk/audiohook.h"
-#include "asterisk/manager.h"
+#include "asterisk/dsp.h"
 
 
 /*! Our own datastore */
@@ -80,11 +80,11 @@
 	struct silence_detection_info *sildet = data;
 
 	ast_dsp_free(sildet->dsp);
-	p->sildet = NULL;
+	sildet->dsp = NULL;
 
 	/* Destroy the audiohook, and destroy ourselves */
-	ast_audiohook_destroy(&sil->audiohook);
-	ast_free(sil);
+	ast_audiohook_destroy(&sildet->audiohook);
+	ast_free(sildet);
 	ast_module_unref(ast_module_info->self);
 
 	return;
@@ -124,7 +124,7 @@
 		int dsptime = 0;
 
 		/* Based on direction of frame grab the gain, and confirm it is applicable */
-		if ((direction == AST_AUDIOHOOK_DIRECTION_READ) {
+		if (direction == AST_AUDIOHOOK_DIRECTION_READ) {
 			/* DETECT SILENCE HERE */
 			ast_dsp_silence(sildet->dsp, frame, &dsptime);
 			if (option_debug && sildet->silencecounter == 0 && dsptime) {
@@ -211,7 +211,7 @@
 	int is_new = 0;
 
 	if (!chan) {
-		ast_log(LOG_WARNING, "No channel was provided.\n", cmd);
+		ast_log(LOG_WARNING, "No channel was provided.\n" );
 		return -1;
 	}
 
@@ -239,7 +239,7 @@
 		if (sildet_add_audiohook(chan, sildet, datastore)) {
 			/* Can't add audiohook - already printed error message */
 			ast_datastore_free(datastore);
-			ast_free(mute);
+			ast_free(sildet);
 		}
 	}
 	ast_channel_unlock(chan);