GNOME.org
 

ekiga r6775 - in trunk: . lib/gui src/endpoints src/gui

Author: dsandras
Date: Mon Sep  1 17:59:56 2008
New Revision: 6775
URL: http://svn.gnome.org/viewvc/ekiga?rev=6775&view=rev

Log:
Updated keys for 3.00. Disabled less used codecs.


Modified:
   trunk/ChangeLog
   trunk/ekiga.schemas.in.in
   trunk/lib/gui/codecsbox.cpp
   trunk/src/endpoints/opal-gmconf-bridge.cpp
   trunk/src/gui/conf.cpp

Modified: trunk/ekiga.schemas.in.in
==============================================================================
--- trunk/ekiga.schemas.in.in	(original)
+++ trunk/ekiga.schemas.in.in	Mon Sep  1 17:59:56 2008
@@ -168,39 +168,17 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/list</key>
-      <applyto>/apps/@PACKAGE_NAME@/codecs/audio/list</applyto>
+      <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/media_list</key>
+      <applyto>/apps/@PACKAGE_NAME@/codecs/audio/media_list</applyto>
       <owner>Ekiga</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[Speex*16000*1*H.323 SIP*1,iLBC*8000*1*H.323 SIP*1,gsm*8000*1*H.323 SIP*1,Speex*8000*1*H.323 SIP*1,PCMU*8000*1*H.323 SIP*1,PCMA*8000*1*H.323 SIP*1,G726-16*8000*1*H.323 SIP*1,G726-24*8000*1*H.323 SIP*1,G726-32*8000*1*H.323 SIP*1,G726-40*8000*1*H.323 SIP*1,ms-gsm*8000*1*H.323*1]</default>
+      <default>[Speex*16000*1*H.323 SIP*1,iLBC*8000*1*H.323 SIP*1,PCMU*8000*1*H.323 SIP*1,PCMA*8000*1*H.323 SIP*1,gsm*8000*1*H.323 SIP*0,Speex*8000*1*H.323 SIP*0,G726-16*8000*1*H.323 SIP*0,G726-24*8000*1*H.323 SIP*0,G726-32*8000*1*H.323 SIP*0,G726-40*8000*1*H.323 SIP*0,ms-gsm*8000*1*H.323*0]</default>
       <locale name="C">
 	<short>The Audio Codecs List</short>
 	<long>The audio codecs list</long>
       </locale>
     </schema>
-    <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/gsm_frames</key>
-      <applyto>/apps/@PACKAGE_NAME@/codecs/audio/gsm_frames</applyto>
-      <owner>Ekiga</owner>
-      <type>int</type>
-      <default>4</default>
-      <locale name="C">
-	<short>Number of frames for GSM</short>
-	<long>Number of frames transmitted in each packet for the GSM codec</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/g711_frames</key>
-      <applyto>/apps/@PACKAGE_NAME@/codecs/audio/g711_frames</applyto>
-      <owner>Ekiga</owner>
-      <type>int</type>
-      <default>30</default>
-      <locale name="C">
-	<short>Number of frames for G.711</short>
-	<long>Number of frames transmitted in each packet for the G.711 codec</long>
-      </locale>
-    </schema>
     <schema>	
       <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/enable_silence_detection</key>
       <applyto>/apps/@PACKAGE_NAME@/codecs/audio/enable_silence_detection</applyto>
@@ -986,8 +964,8 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/codecs/video/list</key>
-      <applyto>/apps/@PACKAGE_NAME@/codecs/video/list</applyto>
+      <key>/schemas/apps/@PACKAGE_NAME@/codecs/video/media_list</key>
+      <applyto>/apps/@PACKAGE_NAME@/codecs/video/media_list</applyto>
       <owner>Ekiga</owner>
       <type>list</type>
       <list_type>string</list_type>

Modified: trunk/lib/gui/codecsbox.cpp
==============================================================================
--- trunk/lib/gui/codecsbox.cpp	(original)
+++ trunk/lib/gui/codecsbox.cpp	Mon Sep  1 17:59:56 2008
@@ -562,9 +562,9 @@
   }
 
   if (self->priv->type == Ekiga::Call::Audio)
-    list = gm_conf_get_string_list ("/apps/ekiga/codecs/audio/list");
+    list = gm_conf_get_string_list ("/apps/ekiga/codecs/audio/media_list");
   else if (self->priv->type == Ekiga::Call::Video)
-    list = gm_conf_get_string_list ("/apps/ekiga/codecs/video/list");
+    list = gm_conf_get_string_list ("/apps/ekiga/codecs/video/media_list");
 
   codecs_box_set_codecs (self, list);
 
@@ -572,9 +572,9 @@
   g_slist_free (list);
 
   if (self->priv->type == Ekiga::Call::Audio)
-    gm_conf_notifier_add ("/apps/ekiga/codecs/audio/list", codecs_list_changed_nt, GTK_WIDGET (self));
+    gm_conf_notifier_add ("/apps/ekiga/codecs/audio/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
   else
-    gm_conf_notifier_add ("/apps/ekiga/codecs/video/list", codecs_list_changed_nt, GTK_WIDGET (self));
+    gm_conf_notifier_add ("/apps/ekiga/codecs/video/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
 }
 
 

Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp	Mon Sep  1 17:59:56 2008
@@ -59,8 +59,8 @@
   keys.push_back (AUDIO_CODECS_KEY "enable_silence_detection");
   keys.push_back (AUDIO_CODECS_KEY "enable_echo_cancelation");
 
-  keys.push_back (AUDIO_CODECS_KEY "list");
-  keys.push_back (VIDEO_CODECS_KEY "list");
+  keys.push_back (AUDIO_CODECS_KEY "media_list");
+  keys.push_back (VIDEO_CODECS_KEY "media_list");
 
   keys.push_back (AUDIO_CODECS_KEY "minimum_jitter_buffer");
   keys.push_back (AUDIO_CODECS_KEY "maximum_jitter_buffer");
@@ -171,23 +171,23 @@
   // 
   // Audio & video codecs
   //
-  else if (key == AUDIO_CODECS_KEY "list"
-           || key == VIDEO_CODECS_KEY "list") {
+  else if (key == AUDIO_CODECS_KEY "media_list"
+           || key == VIDEO_CODECS_KEY "media_list") {
 
     // This is a bit longer, we are not sure the list stored in the 
     // configuration is complete, and it could also contain unsupported codecs
     GSList *audio_codecs = NULL;
     GSList *video_codecs = NULL;
 
-    if (key == AUDIO_CODECS_KEY "list") {
+    if (key == AUDIO_CODECS_KEY "media_list") {
 
       audio_codecs = gm_conf_entry_get_list (entry);
-      video_codecs = gm_conf_get_string_list (VIDEO_CODECS_KEY "list");
+      video_codecs = gm_conf_get_string_list (VIDEO_CODECS_KEY "media_list");
     }
     else {
 
       video_codecs = gm_conf_entry_get_list (entry);
-      audio_codecs = gm_conf_get_string_list (AUDIO_CODECS_KEY "list");
+      audio_codecs = gm_conf_get_string_list (AUDIO_CODECS_KEY "media_list");
     }
 
     Ekiga::CodecList codecs;
@@ -209,7 +209,7 @@
     if (a_codecs != codecs.get_audio_list ()) {
 
       audio_codecs = codecs.get_audio_list ().gslist ();
-      gm_conf_set_string_list (AUDIO_CODECS_KEY "list", audio_codecs);
+      gm_conf_set_string_list (AUDIO_CODECS_KEY "media_list", audio_codecs);
       g_slist_foreach (audio_codecs, (GFunc) g_free, NULL);
       g_slist_free (audio_codecs);
     }
@@ -217,7 +217,7 @@
     if (v_codecs != codecs.get_video_list ()) {
 
       video_codecs = codecs.get_video_list ().gslist ();
-      gm_conf_set_string_list (VIDEO_CODECS_KEY "list", video_codecs);
+      gm_conf_set_string_list (VIDEO_CODECS_KEY "media_list", video_codecs);
       g_slist_foreach (video_codecs, (GFunc) g_free, NULL);
       g_slist_free (video_codecs);
     }

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Mon Sep  1 17:59:56 2008
@@ -267,7 +267,6 @@
 void 
 gnomemeeting_conf_upgrade ()
 {
-  GSList *codecs = NULL;
   gchar *conf_url = NULL;
 
   int version = 0;
@@ -323,18 +322,4 @@
     gm_conf_set_string (NAT_KEY "public_ip_detector", 
 			"http://ekiga.net/ip/";);
   g_free (conf_url);
-
-  /* Upgrade the audio codecs list */
-  codecs = g_slist_append (codecs, g_strdup ("106|16000|20800=1"));
-  codecs = g_slist_append (codecs, g_strdup ("107|8000|13333=1"));
-  codecs = g_slist_append (codecs, g_strdup ("3|8000|13200=1"));
-  codecs = g_slist_append (codecs, g_strdup ("96|8000|12800=1"));
-  codecs = g_slist_append (codecs, g_strdup ("105|8000|8000=1"));
-  codecs = g_slist_append (codecs, g_strdup ("0|8000|64000=1"));
-  codecs = g_slist_append (codecs, g_strdup ("8|8000|64000=1"));
-  codecs = g_slist_append (codecs, g_strdup ("112|8000|16000=1"));
-  codecs = g_slist_append (codecs, g_strdup ("110|8000|32000=1"));
-  gm_conf_set_string_list (AUDIO_CODECS_KEY "list", codecs);
-  g_slist_foreach (codecs, (GFunc) g_free, NULL);
-  g_slist_free (codecs);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]