Update python bindings

svn path=/trunk/; revision=2419

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index efcc96483eda9443bb292ab18d7ce0581618a719..594a51e97673a168324941c752bfe9414dcef240 100644 (file)
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -7,6 +7,20 @@
   (gtype-id "EMPATHY_TYPE_ACCOUNT_MANAGER")
 )
 
+(define-object CallFactory
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyCallFactory")
+  (gtype-id "EMPATHY_TYPE_CALL_FACTORY")
+)
+
+(define-object CallHandler
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyCallHandler")
+  (gtype-id "EMPATHY_TYPE_CALL_HANDLER")
+)
+
 (define-object Chatroom
   (in-module "Empathy")
   (parent "GObject")
@@ -474,6 +488,83 @@
 
 
 
+;; From empathy-call-factory.h
+
+(define-function call_factory_get_type
+  (c-name "empathy_call_factory_get_type")
+  (return-type "GType")
+)
+
+(define-function call_factory_initialise
+  (c-name "empathy_call_factory_initialise")
+  (return-type "EmpathyCallFactory*")
+)
+
+(define-function call_factory_get
+  (c-name "empathy_call_factory_get")
+  (return-type "EmpathyCallFactory*")
+)
+
+(define-method new_call
+  (of-object "EmpathyCallFactory")
+  (c-name "empathy_call_factory_new_call")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-method claim_channel
+  (of-object "EmpathyCallFactory")
+  (c-name "empathy_call_factory_claim_channel")
+  (return-type "none")
+  (parameters
+    '("EmpathyDispatchOperation*" "operation")
+  )
+)
+
+
+
+;; From empathy-call-handler.h
+
+(define-function call_handler_get_type
+  (c-name "empathy_call_handler_get_type")
+  (return-type "GType")
+)
+
+(define-function call_handler_new_for_contact
+  (c-name "empathy_call_handler_new_for_contact")
+  (return-type "EmpathyCallHandler*")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-function call_handler_new_for_channel
+  (c-name "empathy_call_handler_new_for_channel")
+  (return-type "EmpathyCallHandler*")
+  (parameters
+    '("EmpathyTpCall*" "call")
+  )
+)
+
+(define-method start_call
+  (of-object "EmpathyCallHandler")
+  (c-name "empathy_call_handler_start_call")
+  (return-type "none")
+)
+
+(define-method set_bus
+  (of-object "EmpathyCallHandler")
+  (c-name "empathy_call_handler_set_bus")
+  (return-type "none")
+  (parameters
+    '("GstBus*" "bus")
+  )
+)
+
+
+
 ;; From empathy-contact.h
 
 (define-function contact_get_type

diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 5b40f61781b08f3480d789fc6183f2e74fceab9a..a31253ece6962eb81c2971d37a5f9964426e4777 100644 (file)
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -3,6 +3,7 @@ headers
 #include <Python.h>
 #include <pygobject.h>
 #include "empathy-account-manager.h"
+#include "empathy-call-factory.h"
 #include "empathy-chatroom.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-contact.h"

diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 35bc8c9f128ee7708ff46e5a560743412f955bf5..c4cc1e29cecee0e78481555ec3e3deab2a1802bd 100644 (file)
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -90,6 +90,27 @@
   (gtype-id "EMPATHY_TYPE_CONTACT_SELECTOR")
 )
 
+(define-object GstAudioSink
+  (in-module "Empathy")
+  (parent "GstBin")
+  (c-name "EmpathyGstAudioSink")
+  (gtype-id "EMPATHY_TYPE_GST_AUDIO_SINK")
+)
+
+(define-object GstAudioSrc
+  (in-module "Empathy")
+  (parent "GstBin")
+  (c-name "EmpathyGstAudioSrc")
+  (gtype-id "EMPATHY_TYPE_GST_AUDIO_SRC")
+)
+
+(define-object GstVideoSrc
+  (in-module "Empathy")
+  (parent "GstBin")
+  (c-name "EmpathyGstVideoSrc")
+  (gtype-id "EMPATHY_TYPE_GST_VIDEO_SRC")
+)
+
 (define-object PresenceChooser
   (in-module "Empathy")
   (parent "GtkToggleButton")
@@ -125,6 +146,13 @@
   (gtype-id "EMPATHY_TYPE_THEME_MANAGER")
 )
 
+(define-object VideoWidget
+  (in-module "Empathy")
+  (parent "GtkDrawingArea")
+  (c-name "EmpathyVideoWidget")
+  (gtype-id "EMPATHY_TYPE_VIDEO_WIDGET")
+)
+
 ;; Enumerations and flags ...
 
 (define-enum ContactListStoreSort
@@ -1263,6 +1291,91 @@
 
 
 
+;; From empathy-audio-sink.h
+
+(define-function audio_sink_get_type
+  (c-name "empathy_audio_sink_get_type")
+  (return-type "GType")
+)
+
+(define-function audio_sink_new
+  (c-name "empathy_audio_sink_new")
+  (is-constructor-of "EmpathyAudioSink")
+  (return-type "GstElement*")
+)
+
+
+
+;; From empathy-audio-src.h
+
+(define-function audio_src_get_type
+  (c-name "empathy_audio_src_get_type")
+  (return-type "GType")
+)
+
+(define-function audio_src_new
+  (c-name "empathy_audio_src_new")
+  (is-constructor-of "EmpathyAudioSrc")
+  (return-type "GstElement*")
+)
+
+
+
+;; From empathy-video-src.h
+
+(define-function video_src_get_type
+  (c-name "empathy_video_src_get_type")
+  (return-type "GType")
+)
+
+(define-function video_src_new
+  (c-name "empathy_video_src_new")
+  (is-constructor-of "EmpathyVideoSrc")
+  (return-type "GstElement*")
+)
+
+
+
+;; From empathy-video-widget.h
+
+(define-function video_widget_get_type
+  (c-name "empathy_video_widget_get_type")
+  (return-type "GType")
+)
+
+(define-function video_widget_new
+  (c-name "empathy_video_widget_new")
+  (is-constructor-of "EmpathyVideoWidget")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GstBus*" "bus")
+  )
+)
+
+(define-function video_widget_new_with_size
+  (c-name "empathy_video_widget_new_with_size")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GstBus*" "bus")
+    '("gint" "width")
+    '("gint" "height")
+  )
+)
+
+(define-method get_element
+  (of-object "EmpathyVideoWidget")
+  (c-name "empathy_video_widget_get_element")
+  (return-type "GstElement*")
+)
+
+(define-method get_sink
+  (of-object "EmpathyVideoWidget")
+  (c-name "empathy_video_widget_get_sink")
+  (return-type "GstPad*")
+)
+
+
+
 ;; From empathy-images.h
 
 

diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 40d63848b856d05c70019fa3bc5ae36b4cac2f07..7493c42bc95bdd5d4a2d17656ffea2bc393df52e 100644 (file)
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -5,6 +5,8 @@ headers
 #include "empathy-account-chooser.h"
 #include "empathy-account-widget.h"
 #include "empathy-account-widget-irc.h"
+#include "empathy-audio-sink.h"
+#include "empathy-audio-src.h"
 #include "empathy-avatar-chooser.h"
 #include "empathy-avatar-image.h"
 #include "empathy-cell-renderer-activatable.h"
@@ -33,6 +35,8 @@ headers
 #include "empathy-theme-irc.h"
 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
+#include "empathy-video-src.h"
+#include "empathy-video-widget.h"
 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);
@@ -55,6 +59,8 @@ import gtk.EventBox as PyGtkEventBox_Type
 import gtk.CellRendererPixbuf as PyGtkCellRendererPixbuf_Type
 import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
 import gtk.Bin as PyGtkBin_Type
+import gtk.DrawingArea as PyGtkDrawingArea_Type
+import gst.GstBin as PyGstBin_Type
 import empathy.Contact as PyEmpathyContact_Type
 import empathy.ContactList as PyEmpathyContactList_Type
 import empathy.TpChat as PyEmpathyTpChat_Type

diff --git a/python/update-binding.sh b/python/update-binding.sh
index 226dfa2e5d5bfa2be70fcbc1804f6a674cd14f8b..e1ef3a51400879fc4f70779ef127c36496465688 100755 (executable)
--- a/python/update-binding.sh
+++ b/python/update-binding.sh
@@ -8,6 +8,8 @@ python /usr/share/pygobject/2.0/codegen/h2def.py        \
        empathy-account-manager.h               \
        empathy-chatroom.h                      \
        empathy-chatroom-manager.h              \
+       empathy-call-factory.h                  \
+       empathy-call-handler.h                  \
        empathy-contact.h                       \
        empathy-contact-factory.h               \
        empathy-contact-groups.h                \
@@ -62,6 +64,10 @@ python /usr/share/pygobject/2.0/codegen/h2def.py     \
        empathy-contact-selector.h              \
        empathy-contact-widget.h                \
        empathy-geometry.h                      \
+       empathy-audio-sink.h                    \
+       empathy-audio-src.h                     \
+       empathy-video-src.h                     \
+       empathy-video-widget.h                  \
        empathy-images.h                        \
        empathy-irc-network-dialog.h            \
        empathy-log-window.h                    \