[farsight2/master] FsStreamDirection is now a flags, not a enum (and both=send|recv)

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


---
 gst-libs/gst/farsight/fs-stream.c   |    2 +-
 gst/fsrtpconference/fs-rtp-stream.c |    4 ++--
 python/pyfarsight.defs              |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index d147d92..cba9cdf 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -171,7 +171,7 @@ fs_stream_class_init (FsStreamClass *klass)
    */
   g_object_class_install_property (gobject_class,
       PROP_DIRECTION,
-      g_param_spec_enum ("direction",
+      g_param_spec_flags ("direction",
         "The direction of the stream",
         "An enum to set and get the direction of the stream",
         FS_TYPE_STREAM_DIRECTION,
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index 2f66b25..25927a8 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -273,7 +273,7 @@ fs_rtp_stream_get_property (GObject *object,
       g_value_set_object (value, self->priv->stream_transmitter);
       break;
     case PROP_DIRECTION:
-      g_value_set_enum (value, self->priv->direction);
+      g_value_set_flags (value, self->priv->direction);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -302,7 +302,7 @@ fs_rtp_stream_set_property (GObject *object,
         FS_STREAM_TRANSMITTER (g_value_get_object (value));
       break;
     case PROP_DIRECTION:
-      self->priv->direction = g_value_get_enum (value);
+      self->priv->direction = g_value_get_flags (value);
       if (self->priv->stream_transmitter)
         g_object_set (self->priv->stream_transmitter, "sending",
             self->priv->direction & FS_DIRECTION_SEND, NULL);
diff --git a/python/pyfarsight.defs b/python/pyfarsight.defs
index 91cb021..7f879b2 100644
--- a/python/pyfarsight.defs
+++ b/python/pyfarsight.defs
@@ -101,6 +101,7 @@
   (return-type "GList*")
   (parameters
     '("const-gchar*" "filename")
+    '("GError**" "error")
   )
 )
 
@@ -423,7 +424,7 @@
 
 ;; Enumerations and flags ...
 
-(define-enum StreamDirection
+(define-flags StreamDirection
   (in-module "Fs")
   (c-name "FsStreamDirection")
   (gtype-id "FS_TYPE_STREAM_DIRECTION")
-- 
1.5.6.5




More information about the farsight-commits mailing list