Re #1324:
- Changed default value of PJMEDIA_HAS_VIDEO to disabled.
- Fixed code and build setting on Symbian for build correctness, it builds fine now.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3671 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/build.symbian/pjmedia.mmp b/build.symbian/pjmedia.mmp
index b729343..5b84e63 100644
--- a/build.symbian/pjmedia.mmp
+++ b/build.symbian/pjmedia.mmp
@@ -45,12 +45,14 @@
SOURCE codec.c
SOURCE conference.c
SOURCE conf_switch.c
+SOURCE delaybuf.c
SOURCE echo_common.c
SOURCE echo_port.c
SOURCE echo_suppress.c
SOURCE endpoint.c
SOURCE errno.c
-SOURCE delaybuf.c
+SOURCE event.c
+SOURCE format.c
SOURCE g711.c
SOURCE jbuf.c
SOURCE master_port.c
@@ -65,17 +67,19 @@
SOURCE rtcp_xr.c
SOURCE rtp.c
//SDP files are in pjsdp.mmp: sdp.c, sdp_cmp.c, sdp_neg.c
-SOURCE session.c
+//SOURCE session.c // deprecated
SOURCE silencedet.c
SOURCE sound_port.c
SOURCE splitcomb.c
SOURCE stereo_port.c
SOURCE stream.c
+SOURCE stream_common.c
SOURCE tonegen.c
SOURCE transport_adapter_sample.c
SOURCE transport_ice.c
SOURCE transport_udp.c
SOURCE transport_srtp.c
+SOURCE types.c
SOURCE wav_player.c
SOURCE wav_playlist.c
SOURCE wav_writer.c
@@ -83,6 +87,13 @@
SOURCE wsola.c
//
+// pjmedia-codec common files
+//
+SOURCEPATH ..\pjmedia\src\pjmedia-codec
+SOURCE audio_codecs.c
+
+
+//
// Symbian specific
// These are on separate project
//
diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h
index bbcf222..58f56e5 100644
--- a/pjmedia/include/pjmedia/config.h
+++ b/pjmedia/include/pjmedia/config.h
@@ -917,10 +917,12 @@
*/
/**
- * Top level option to disable video.
+ * Top level option to enable/disable video features.
+ *
+ * Default: 0 (disabled)
*/
#ifndef PJMEDIA_HAS_VIDEO
-# define PJMEDIA_HAS_VIDEO 1
+# define PJMEDIA_HAS_VIDEO 0
#endif
diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp
index 139ac47..4543fad 100644
--- a/pjsip-apps/src/symbian_ua/ua.cpp
+++ b/pjsip-apps/src/symbian_ua/ua.cpp
@@ -502,6 +502,7 @@
/* Add account for the transport */
pjsua_acc_add_local(tid, PJ_TRUE, &g_acc_id);
+#if DISABLED_FOR_TICKET_1185
/* Create media transports */
pjsua_transport_config mtcfg;
pjsua_transport_config_default(&mtcfg);
@@ -513,6 +514,7 @@
pjsua_destroy();
return status;
}
+#endif
/* Initialization is done, now start pjsua */
status = pjsua_start();