[asterisk-commits] file: branch file/gulp_fax r395105 - /team/file/gulp_fax/res/res_sip_t38.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jul 23 07:53:07 2013
New Revision: 395105

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395105
Log:
Remove silly hackish code.

Modified:
    team/file/gulp_fax/res/res_sip_t38.c

Modified: team/file/gulp_fax/res/res_sip_t38.c
URL: http://svnview.digium.com/svn/asterisk/team/file/gulp_fax/res/res_sip_t38.c?view=diff&rev=395105&r1=395104&r2=395105
==============================================================================
--- team/file/gulp_fax/res/res_sip_t38.c (original)
+++ team/file/gulp_fax/res/res_sip_t38.c Tue Jul 23 07:53:07 2013
@@ -47,25 +47,6 @@
 
 #include "asterisk/res_sip.h"
 #include "asterisk/res_sip_session.h"
-
-/* XXX The Gulp stuff below is temporary until a method for accessing the session given a channel appears, give it time! */
-
-/*!
- * \brief Positions of various media
- */
-enum sip_session_media_position {
-	/*! \brief First is audio */
-	SIP_MEDIA_AUDIO = 0,
-	/*! \brief Second is video */
-	SIP_MEDIA_VIDEO,
-	/*! \brief Last is the size for media details */
-	SIP_MEDIA_SIZE,
-};
-
-struct gulp_pvt {
-	struct ast_sip_session *session;
-	struct ast_sip_session_media *media[SIP_MEDIA_SIZE];
-};
 
 /*! \brief The number of seconds after receiving a T.38 re-invite before automatically rejecting it */
 #define T38_AUTOMATIC_REJECTION_SECONDS 5
@@ -442,12 +423,12 @@
 static struct ast_frame *t38_framehook(struct ast_channel *chan, struct ast_frame *f,
 	enum ast_framehook_event event, void *data)
 {
-	struct gulp_pvt *pvt = ast_channel_tech_pvt(chan);
+	struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(chan);
 
 	if (event == AST_FRAMEHOOK_EVENT_READ) {
-		f = t38_framehook_read(pvt->session, f);
+		f = t38_framehook_read(channel->session, f);
 	} else if (event == AST_FRAMEHOOK_EVENT_WRITE) {
-		f = t38_framehook_write(pvt->session, f);
+		f = t38_framehook_write(channel->session, f);
 	}
 
 	return f;