Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/pjsua_app_legacy.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (3 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -1216 +1216 @@
         char buf[128];
 
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0               
         if (!simple_input("DTMF strings to send (0-9*R#A-B)", buf,
             sizeof(buf)))
+#else
+        if (!simple_input("DTMF strings to send (0-9*#A-B)", buf,
+            sizeof(buf)))
+#endif
         {
             return;
@@ -1265 +1270 @@
             pjsua_msg_data msg_data_;
 
-            pjsua_msg_data_init(&msg_data);
+            pjsua_msg_data_init(&msg_data_);
             msg_data_.content_type = pj_str("application/dtmf-relay");
 
@@ -1374 +1379 @@
         }
 
-        delay = pj_strtoul(&tmp);
+        delay = (int)pj_strtoul(&tmp);
         if (delay < 0) delay = 0;
         pj_thread_sleep(delay);