[asterisk-commits] phsultan: branch phsultan/rtmp-support r206803 - /team/phsultan/rtmp-support/...

[SVN commits to the Asterisk project]

Author: phsultan
Date: Thu Jul 16 02:11:15 2009
New Revision: 206803

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206803
Log:
Compile warning fixed

Modified:
    team/phsultan/rtmp-support/channels/chan_rtmp.c

Modified: team/phsultan/rtmp-support/channels/chan_rtmp.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/rtmp-support/channels/chan_rtmp.c?view=diff&rev=206803&r1=206802&r2=206803
==============================================================================
--- team/phsultan/rtmp-support/channels/chan_rtmp.c (original)
+++ team/phsultan/rtmp-support/channels/chan_rtmp.c Thu Jul 16 02:11:15 2009
@@ -230,7 +230,7 @@
 unsigned int outgoing_chunksize = RTMP_CHUNK_SIZE;
 unsigned int incoming_chunksize = RTMP_CHUNK_SIZE;
 
-static struct ast_channel *rtmp_request(const char *type, int format, void *data, int *cause);
+static struct ast_channel *rtmp_request(const char *type, int format, const struct ast_channel *requestor, void *data, int *cause);
 static int rtmp_call(struct ast_channel *ast, char *dest, int timeout);
 static void rtmp_destroy_fn(void *p);
 static void rtmp_destroy(struct rtmp_pvt *p);
@@ -594,11 +594,11 @@
 	return 0;
 }
 
-static struct ast_channel *rtmp_new(struct rtmp_pvt *i, int state)
+static struct ast_channel *rtmp_new(struct rtmp_pvt *i, int state, const char *linkedid)
 {
 	struct ast_channel *tmp;
 
-	tmp = ast_channel_alloc(1, state, 0, 0, "", "s", context, 0, "RTMP/%d", i->streamid);
+	tmp = ast_channel_alloc(1, state, 0, 0, "", linkedid, "s", context, 0, "RTMP/%d", i->streamid);
 	if (!tmp) {
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 		return NULL;
@@ -655,7 +655,7 @@
 }
 
 
-static struct ast_channel *rtmp_request(const char *type, int format, void *data, int *cause)
+static struct ast_channel *rtmp_request(const char *type, int format, const struct ast_channel *requestor, void *data, int *cause)
 {
 	int oldformat;
 	struct rtmp_pvt *p;
@@ -685,7 +685,7 @@
 	p = rtmp_alloc(args.writestream, args.readstream, args.readnum);
 
 	if (p) {
-		tmp = rtmp_new(p, AST_STATE_DOWN);
+		tmp = rtmp_new(p, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
 		if (!tmp) {
 			rtmp_destroy(p);
 		}