[asterisk-commits] russell: branch group/vldtmf r40514 - in /team/group/vldtmf: ./ channels/ res/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Aug 18 23:25:42 2006
New Revision: 40514

URL: http://svn.digium.com/view/asterisk?rev=40514&view=rev
Log:
fix more warnings

Modified:
    team/group/vldtmf/channels/chan_agent.c
    team/group/vldtmf/file.c
    team/group/vldtmf/res/res_agi.c

Modified: team/group/vldtmf/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_agent.c?rev=40514&r1=40513&r2=40514&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_agent.c (original)
+++ team/group/vldtmf/channels/chan_agent.c Fri Aug 18 23:25:42 2006
@@ -492,7 +492,8 @@
  				}
  			}
  			break;
- 		case AST_FRAME_DTMF:
+		case AST_FRAME_DTMF_BEGIN:
+ 		case AST_FRAME_DTMF_END:
  			if (!p->acknowledged && (f->subclass == '#')) {
  				if (option_verbose > 2)
  					ast_verbose(VERBOSE_PREFIX_3 "%s acknowledged\n", p->chan->name);
@@ -512,7 +513,9 @@
  				ast_frfree(f);
  				f = &ast_null_frame;
  			}
- 			break;
+		default:
+			/* pass everything else on through */
+			break;
   		}
   	}
 

Modified: team/group/vldtmf/file.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/file.c?rev=40514&r1=40513&r2=40514&view=diff
==============================================================================
--- team/group/vldtmf/file.c (original)
+++ team/group/vldtmf/file.c Fri Aug 18 23:25:42 2006
@@ -1034,7 +1034,8 @@
 			if (!fr)
 				return -1;
 			switch(fr->frametype) {
-			case AST_FRAME_DTMF:
+			case AST_FRAME_DTMF_BEGIN:
+			case AST_FRAME_DTMF_END:
 				if (context) {
 					const char exten[2] = { fr->subclass, '\0' };
 					if (ast_exists_extension(c, context, exten, 1, c->cid.cid_num)) {
@@ -1070,8 +1071,10 @@
 				/* Write audio if appropriate */
 				if (audiofd > -1)
 					write(audiofd, fr->data, fr->datalen);
+			default:
+				/* Ignore all others */
+				break;
 			}
-			/* Ignore all others */
 			ast_frfree(fr);
 		}
 		ast_sched_runq(c->sched);

Modified: team/group/vldtmf/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/res/res_agi.c?rev=40514&r1=40513&r2=40514&view=diff
==============================================================================
--- team/group/vldtmf/res/res_agi.c (original)
+++ team/group/vldtmf/res/res_agi.c Fri Aug 18 23:25:42 2006
@@ -1018,6 +1018,8 @@
 				break;
 			case AST_FRAME_VIDEO:
 				ast_writestream(fs, f);
+			default:
+				/* Ignore all other frames */
 				break;
 			}
 			ast_frfree(f);