From bac4f31489d29dce3662287b9ddf31999d60a7fe Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Fri, 1 Feb 2013 15:43:26 -0500 Subject: [PATCH] get rid of num parameter to sdp_replace --- daemon/call.c | 2 +- daemon/sdp.c | 7 +------ daemon/sdp.h | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/daemon/call.c b/daemon/call.c index e84d5f9..4c62fca 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -2224,7 +2224,7 @@ static const char *call_offer_answer_ng(bencode_item_t *input, struct callmaster chopper = sdp_chopper_new(&sdp); bencode_buffer_destroy_add(output->buffer, (free_func_t) sdp_chopper_destroy, chopper); num = call_streams(call, &streams, &fromtag, opmode); - ret = sdp_replace(chopper, &parsed, call, num, opmode, &flags); + ret = sdp_replace(chopper, &parsed, call, (num >= 0) ? opmode : (opmode ^ 1), &flags); mutex_unlock(&call->lock); obj_put(call); diff --git a/daemon/sdp.c b/daemon/sdp.c index 762c129..0b4bc66 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -500,8 +500,7 @@ void sdp_chopper_destroy(struct sdp_chopper *chop) { /* XXX use stream numbers as index */ /* XXX use port numbers as index */ -/* XXX get rid of num/off parameters? */ -int sdp_replace(struct sdp_chopper *chop, GQueue *sessions, struct call *call, int num, +int sdp_replace(struct sdp_chopper *chop, GQueue *sessions, struct call *call, enum call_opmode opmode, struct sdp_ng_flags *flags) { struct sdp_session *session; @@ -510,10 +509,6 @@ int sdp_replace(struct sdp_chopper *chop, GQueue *sessions, struct call *call, i int off, skip; off = opmode; - if (num < 0) - off ^= 1; - num = abs(num); - m = call->callstreams->head; for (l = sessions->head; l; l = l->next) { diff --git a/daemon/sdp.h b/daemon/sdp.h index 5b69889..788ce5e 100644 --- a/daemon/sdp.h +++ b/daemon/sdp.h @@ -29,7 +29,7 @@ struct sdp_chopper { int sdp_parse(str *body, GQueue *sessions); int sdp_streams(const GQueue *sessions, GQueue *streams); void sdp_free(GQueue *sessions); -int sdp_replace(struct sdp_chopper *, GQueue *, struct call *, int, enum call_opmode, struct sdp_ng_flags *); +int sdp_replace(struct sdp_chopper *, GQueue *, struct call *, enum call_opmode, struct sdp_ng_flags *); struct sdp_chopper *sdp_chopper_new(str *input); void sdp_chopper_destroy(struct sdp_chopper *chop);