From b2e014dd9403144c085e21284aff2462b4c305a6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 6 Jul 2011 18:21:41 +0200 Subject: [PATCH] fix for inband dtmf not sent --- coreapi/sal.h | 8 ++++++-- mediastreamer2 | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/coreapi/sal.h b/coreapi/sal.h index 6a27f1331..47286b09c 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -28,6 +28,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "mediastreamer2/mscommon.h" +/*Dirty hack, keep in sync with mediastreamer2/include/mediastream.h */ +#ifndef PAYLOAD_TYPE_FLAG_CAN_RECV +#define PAYLOAD_TYPE_FLAG_CAN_RECV PAYLOAD_TYPE_USER_FLAG_1 +#define PAYLOAD_TYPE_FLAG_CAN_SEND PAYLOAD_TYPE_USER_FLAG_2 +#endif struct Sal; typedef struct Sal Sal; @@ -345,8 +350,7 @@ int sal_publish(SalOp *op, const char *from, const char *to, SalPresenceStatus s /*ping: main purpose is to obtain its own contact address behind firewalls*/ int sal_ping(SalOp *op, const char *from, const char *to); -#define PAYLOAD_TYPE_FLAG_CAN_RECV PAYLOAD_TYPE_USER_FLAG_1 -#define PAYLOAD_TYPE_FLAG_CAN_SEND PAYLOAD_TYPE_USER_FLAG_2 + #define payload_type_set_number(pt,n) (pt)->user_data=(void*)((long)n); #define payload_type_get_number(pt) ((int)(long)(pt)->user_data) diff --git a/mediastreamer2 b/mediastreamer2 index 4e1f80ed1..0cd097126 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 4e1f80ed17226db3afaae21bbb7295f2a20eb55b +Subproject commit 0cd097126ba076cdd1d4fff0b5c33549b75bb28a