[ekiga/ds-clutter: 8/8] Engine: Init the clutter gst component.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-clutter: 8/8] Engine: Init the clutter gst component.
- Date: Mon, 30 Dec 2013 09:36:54 +0000 (UTC)
commit 459cc4cadfc4c3ddebe76cb45f728353a8a61c6d
Author: Damien Sandras <dsandras beip be>
Date: Mon Dec 30 10:35:41 2013 +0100
Engine: Init the clutter gst component.
lib/engine/engine.cpp | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index c781ec1..f79fdb1 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -70,6 +70,8 @@
#include "videooutput-main-dx.h"
#endif
+#include "videooutput-main-clutter-gst.h"
+
#include "videoinput-main-mlogo.h"
#include "audioinput-main-null.h"
#include "audiooutput-main-null.h"
@@ -126,22 +128,11 @@ engine_init (Ekiga::ServiceCorePtr service_core,
service_core->add (details);
service_core->add (presence_core);
-#ifndef WIN32
- if (!videooutput_x_init (*service_core, &argc, &argv)) {
-
- return;
- }
-#endif
-
-#ifdef HAVE_DX
- if (!videooutput_dx_init (*service_core, &argc, &argv)) {
-
+ if (!videoinput_mlogo_init (*service_core, &argc, &argv)) {
return;
}
-#endif
-
- if (!videoinput_mlogo_init (*service_core, &argc, &argv)) {
+ if (!videooutput_clutter_gst_init (*service_core, &argc, &argv)) {
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]