[empathy] Add framerate and resolution change signal
- From: Sjoerd Simons <sjoerds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Add framerate and resolution change signal
- Date: Mon, 7 Nov 2011 20:07:30 +0000 (UTC)
commit dd3a57dfb3466de4207ed5233db504ad20ef54e6
Author: Nicolas Dufresne <nicolas dufresne collabora com>
Date: Wed Jul 6 18:11:28 2011 -0400
Add framerate and resolution change signal
src/empathy-call-handler.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 99054b9..ef07c50 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -52,6 +52,8 @@ enum {
CLOSED,
CANDIDATES_CHANGED,
STATE_CHANGED,
+ FRAMERATE_CHANGED,
+ RESOLUTION_CHANGED,
LAST_SIGNAL
};
@@ -511,6 +513,19 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+
+ signals[FRAMERATE_CHANGED] =
+ g_signal_new ("framerate-changed", G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 1, G_TYPE_UINT);
+
+ signals[RESOLUTION_CHANGED] =
+ g_signal_new ("resolution-changed", G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE,
+ 2, G_TYPE_UINT, G_TYPE_UINT);
}
EmpathyCallHandler *
@@ -761,6 +776,31 @@ on_tf_content_src_pad_added_cb (TfContent *content,
}
static void
+on_tf_content_framerate_changed (TfContent *content,
+ GParamSpec *spec,
+ EmpathyCallHandler *handler)
+{
+ guint framerate;
+
+ g_object_get (content, "framerate", &framerate, NULL);
+
+ if (framerate != 0)
+ g_signal_emit (G_OBJECT (handler), signals[FRAMERATE_CHANGED], 0,
+ framerate);
+}
+
+static void
+on_tf_content_resolution_changed (TfContent *content,
+ guint width,
+ guint height,
+ EmpathyCallHandler *handler)
+{
+ if (width > 0 && height > 0)
+ g_signal_emit (G_OBJECT (handler), signals[RESOLUTION_CHANGED], 0,
+ width, height);
+}
+
+static void
on_tf_channel_content_added_cb (TfChannel *tfchannel,
TfContent *content,
EmpathyCallHandler *handler)
@@ -812,6 +852,33 @@ on_tf_channel_content_added_cb (TfChannel *tfchannel,
tp_clear_object (&fs_stream);
*/
+ if (mtype == FS_MEDIA_TYPE_VIDEO)
+ {
+ guint framerate, width, height;
+
+ g_signal_connect (content, "notify::framerate",
+ G_CALLBACK (on_tf_content_framerate_changed),
+ handler);
+
+ g_signal_connect (content, "resolution-changed",
+ G_CALLBACK (on_tf_content_resolution_changed),
+ handler);
+
+ g_object_get (content,
+ "framerate", &framerate,
+ "width", &width,
+ "height", &height,
+ NULL);
+
+ if (framerate > 0)
+ g_signal_emit (G_OBJECT (handler), signals[FRAMERATE_CHANGED], 0,
+ framerate);
+
+ if (width > 0 && height > 0)
+ g_signal_emit (G_OBJECT (handler), signals[RESOLUTION_CHANGED], 0,
+ width, height);
+ }
+
gst_object_unref (spad);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]