[farsight2/master] Add new error code for when there is no local codecs

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:22:19 PST 2008


---
 gst-libs/gst/farsight/fs-conference-iface.h  |    4 +++-
 gst/fsrtpconference/fs-rtp-discover-codecs.c |    2 +-
 python/pyfarsight.defs                       |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-conference-iface.h b/gst-libs/gst/farsight/fs-conference-iface.h
index a1cebf9..11bc647 100644
--- a/gst-libs/gst/farsight/fs-conference-iface.h
+++ b/gst-libs/gst/farsight/fs-conference-iface.h
@@ -90,6 +90,7 @@ GType fs_conference_get_type (void);
  * @FS_ERROR_NEGOTIATION_FAILED: The codec negotiation has failed
  * @FS_ERROR_UNKNOWN_CODEC: The codec is unknown
  * @FS_ERROR_UNKNOWN_CNAME: Data was received for an unknown cname
+ * @FS_ERROR_NO_CODECS: There are no valid codecs left.
  *
  * This is the enum of error numbers that will come either on the "error"
  * signal or from the Gst Bus.
@@ -103,7 +104,8 @@ typedef enum {
   FS_ERROR_NOT_IMPLEMENTED,
   FS_ERROR_NEGOTIATION_FAILED,
   FS_ERROR_UNKNOWN_CODEC,
-  FS_ERROR_UNKNOWN_CNAME
+  FS_ERROR_UNKNOWN_CNAME,
+  FS_ERROR_NO_CODECS
 } FsError;
 
 /**
diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
index 6382171..b2b8454 100644
--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
@@ -260,7 +260,7 @@ fs_rtp_blueprints_get (FsMediaType media_type, GError **error)
   if (!recv_list && !send_list)
   {
     codecs_lists_ref[media_type]--;
-    g_set_error (error, FS_ERROR, FS_ERROR_INTERNAL,
+    g_set_error (error, FS_ERROR, FS_ERROR_NO_CODECS,
       "No codecs for media type %s detected",
       fs_media_type_to_string (media_type));
 
diff --git a/python/pyfarsight.defs b/python/pyfarsight.defs
index a9e39ec..73bd017 100644
--- a/python/pyfarsight.defs
+++ b/python/pyfarsight.defs
@@ -236,6 +236,7 @@
     '("negotiation-failed" "FS_ERROR_NEGOTIATION_FAILED")
     '("unknown-codec" "FS_ERROR_UNKNOWN_CODEC")
     '("unknown-cname" "FS_ERROR_UNKNOWN_CNAME")
+    '("no-codecs" "FS_ERROR_NO_CODECS")
   )
 )
 
-- 
1.5.6.5




More information about the farsight-commits mailing list