commit 9c1f668650e26c8b298f79d6f2149b9383d896fb
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Mon Mar 09 16:21:28 2015 -0400
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Mon Mar 09 16:21:32 2015 -0400
tree b85ee091b418e01ca85552e0ccc96a1d134f0e62
parent 36c025ccea95cc2c476544a5996440de7043068b

gnome: libringclient API compatiblity update

New way to access video renderer for call.

Refs #66538

Change-Id: I64a081735a494cda8d92ccc48fb96ed1e0d2829c

src/currentcallview.cpp

diff --git a/src/currentcallview.cpp b/src/currentcallview.cpp
index 70ddeb7..a9968ac 100644
--- a/src/currentcallview.cpp
+++ b/src/currentcallview.cpp
@@ -35,7 +35,6 @@
 #include <callmodel.h>
 #include "utils/drawing.h"
 #include "video/video_widget.h"
-#include <video/manager.h>
 
 struct _CurrentCallView
 {
@@ -186,11 +185,11 @@
 }
 
 static gboolean
-set_remote_renderer(gpointer data)
+set_remote_renderer(CurrentCallView *view)
 {
-    g_return_val_if_fail(IS_CURRENT_CALL_VIEW(data), FALSE);
+    g_return_val_if_fail(IS_CURRENT_CALL_VIEW(view), FALSE);
 
-    CurrentCallViewPrivate *priv = CURRENT_CALL_VIEW_GET_PRIVATE(data);
+    CurrentCallViewPrivate *priv = CURRENT_CALL_VIEW_GET_PRIVATE(view);
 
     video_widget_set_remote_renderer(VIDEO_WIDGET(priv->video_widget), priv->remote_renderer);
 
@@ -209,7 +208,7 @@
     g_object_unref(framed_avatar);
 
     /* get name */
-    QVariant var = idx.model()->data(idx, Call::Role::Name);
+    QVariant var = idx.model()->data(idx, static_cast<int>(Call::Role::Name));
     QByteArray ba_name = var.toString().toLocal8Bit();
     gtk_label_set_text(GTK_LABEL(priv->label_identity), ba_name.constData());
 
@@ -237,30 +236,20 @@
     gtk_widget_show_all(priv->frame_video);
 
     /* check if we already have a renderer */
-    priv->remote_renderer = Video::Manager::instance()->getRenderer(call);
-    video_widget_set_remote_renderer(VIDEO_WIDGET(priv->video_widget), priv->remote_renderer);
+    priv->remote_renderer = call->videoRenderer();
+    set_remote_renderer(view);
 
     /* callback for video renderer */
     priv->renderer_connection = QObject::connect(
-        Video::Manager::instance(),
-        &Video::Manager::videoCallInitiated,
+        call,
+        &Call::videoStarted,
         [=](Video::Renderer *renderer) {
-            /* check if the renderer is for this call */
-            const char* id_call = CallModel::instance()->getMime(call).constData();
-            const char* id_video = renderer->id().toLocal8Bit().constData();
+            priv->remote_renderer = renderer;
 
-            g_debug("got signal for video renderer, id: %s", id_video);
-
-            if (strcmp(id_call, id_video) == 0) {
-                g_debug("matches call id");
-
-                priv->remote_renderer = renderer;
-
-                g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-                                (GSourceFunc)set_remote_renderer,
-                                view,
-                                NULL);
-            }
+            g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+                            (GSourceFunc)set_remote_renderer,
+                            view,
+                            NULL);
         }
     );
 }