Misc (#1026): swap the order fo --dis-codec and --add-codec execution in pjsua, so that user can now enable specific codecs

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3093 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 11 insertions, 11 deletions

diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index d5243aa0..42ce0127 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -1942,18 +1942,18 @@ static int write_settings(const struct app_config *config,
 		    config->rtp_cfg.port);
     pj_strcat2(&cfg, line);
 
-    /* Add codec. */
-    for (i=0; i<config->codec_cnt; ++i) {
-	pj_ansi_sprintf(line, "--add-codec %s\n",
-		    config->codec_arg[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
     /* Disable codec */
     for (i=0; i<config->codec_dis_cnt; ++i) {
 	pj_ansi_sprintf(line, "--dis-codec %s\n",
 		    config->codec_dis[i].ptr);
 	pj_strcat2(&cfg, line);
     }
+    /* Add codec. */
+    for (i=0; i<config->codec_cnt; ++i) {
+	pj_ansi_sprintf(line, "--add-codec %s\n",
+		    config->codec_arg[i].ptr);
+	pj_strcat2(&cfg, line);
+    }
 
     pj_strcat2(&cfg, "\n#\n# User agent:\n#\n");
 
@@ -4643,17 +4643,17 @@ pj_status_t app_init(int argc, char *argv[])
 	    goto on_error;
     }
 
+    /* Optionally disable some codec */
+    for (i=0; i<app_config.codec_dis_cnt; ++i) {
+	pjsua_codec_set_priority(&app_config.codec_dis[i],PJMEDIA_CODEC_PRIO_DISABLED);
+    }
+
     /* Optionally set codec orders */
     for (i=0; i<app_config.codec_cnt; ++i) {
 	pjsua_codec_set_priority(&app_config.codec_arg[i],
 				 (pj_uint8_t)(PJMEDIA_CODEC_PRIO_NORMAL+i+9));
     }
 
-    /* Optionally disable some codec */
-    for (i=0; i<app_config.codec_dis_cnt; ++i) {
-	pjsua_codec_set_priority(&app_config.codec_dis[i],PJMEDIA_CODEC_PRIO_DISABLED);
-    }
-
     /* Add RTP transports */
 #ifdef TRANSPORT_ADAPTER_SAMPLE
     status = transport_adapter_sample();