[longomatch] Move gdk includes to lgm-utils.m



commit 7c859334f62450aaa52a7ed950094a02b817905b
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed Feb 11 17:25:17 2015 +0100

    Move gdk includes to lgm-utils.m

 .../Gui/Utils/FramesCapturer.cs                    |    3 +--
 libcesarplayer/lgm-utils.h                         |    7 -------
 libcesarplayer/lgm-utils.m                         |    8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs 
b/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
index 9dfc95a..32ca657 100644
--- a/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
@@ -52,8 +52,7 @@ namespace LongoMatch.Video.Utils
 
                public FramesSeriesCapturer (MediaFileSet fileSet, TimelineEvent evt, uint interval, string 
outputDir)
                {
-                       MultimediaFactory mf= new MultimediaFactory();
-                       this.capturer=mf.GetFramesCapturer();
+                       this.capturer = Config.MultimediaToolkit.GetFramesCapturer ();
                        this.fileSet = fileSet;
                        this.evt = evt;
                        this.start= evt.Start;
diff --git a/libcesarplayer/lgm-utils.h b/libcesarplayer/lgm-utils.h
index 6dc53e7..5355f72 100644
--- a/libcesarplayer/lgm-utils.h
+++ b/libcesarplayer/lgm-utils.h
@@ -31,13 +31,6 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
-#if defined (GDK_WINDOWING_X11)
-#include <gdk/gdkx.h>
-#elif defined (GDK_WINDOWING_WIN32)
-#include <gdk/gdkwin32.h>
-#elif defined (GDK_WINDOWING_QUARTZ)
-#include <gdk/gdkquartz.h>
-#endif
 
 #ifdef WIN32
 #define EXPORT __declspec (dllexport)
diff --git a/libcesarplayer/lgm-utils.m b/libcesarplayer/lgm-utils.m
index c8fd7e7..6a4a4d2 100644
--- a/libcesarplayer/lgm-utils.m
+++ b/libcesarplayer/lgm-utils.m
@@ -24,6 +24,14 @@
 
 #include "lgm-utils.h"
 
+#if defined (GDK_WINDOWING_X11)
+#include <gdk/gdkx.h>
+#elif defined (GDK_WINDOWING_WIN32)
+#include <gdk/gdkwin32.h>
+#elif defined (GDK_WINDOWING_QUARTZ)
+#include <gdk/gdkquartz.h>
+#endif
+
 GstAutoplugSelectResult
 lgm_filter_video_decoders (GstElement * object, GstPad * arg0,
     GstCaps * arg1, GstElementFactory * arg2, gpointer user_data)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]