[ekiga] Moving logo: little code simplification and cosmetic changes

[Julien Puydt <jpuydt src gnome org>]

commit be410ddf8a57fbd7d26b38a5f1d0fdc7afaf3433
Author: Julien Puydt <jpuydt free fr>
Date:   Tue Jan 22 09:44:50 2013 +0100

    Moving logo: little code simplification and cosmetic changes

 .../mlogo-videoinput/videoinput-main-mlogo.cpp     |    2 +-
 .../mlogo-videoinput/videoinput-manager-mlogo.cpp  |    7 +++++--
 .../mlogo-videoinput/videoinput-manager-mlogo.h    |   20 ++++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp b/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
index baf23a4..03c37aa 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
+++ b/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
@@ -50,7 +50,7 @@ videoinput_mlogo_init (Ekiga::ServiceCore &core,
 
   if (videoinput_core) {
 
-    GMVideoInputManager_mlogo *videoinput_manager = new GMVideoInputManager_mlogo(core);
+    GMVideoInputManager_mlogo *videoinput_manager = new GMVideoInputManager_mlogo;
 
     videoinput_core->add_manager (*videoinput_manager);
     result = true;
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
index d43986e..51be6e1 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
+++ b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
@@ -35,14 +35,17 @@
  */
 
 #include "videoinput-manager-mlogo.h"
+
+#include "runtime.h"
+
+#include <glib.h>
 #include "pixmaps/icon.h"
 
 #define DEVICE_TYPE   "Moving Logo"
 #define DEVICE_SOURCE "Moving Logo"
 #define DEVICE_NAME   "Moving Logo"
 
-GMVideoInputManager_mlogo::GMVideoInputManager_mlogo (Ekiga::ServiceCore & _core)
-: core (_core)
+GMVideoInputManager_mlogo::GMVideoInputManager_mlogo ()
 {
   current_state.opened  = false;
 }
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
index f8c032b..2dc1070 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
+++ b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
@@ -38,11 +38,10 @@
 #ifndef __VIDEOINPUT_MANAGER_MLOGO_H__
 #define __VIDEOINPUT_MANAGER_MLOGO_H__
 
-#include "videoinput-core.h"
 #include "videoinput-manager.h"
-#include "runtime.h"
 
 #include "ptbuildopts.h"
+#include "ptlib.h"
 #include <ptclib/delaychan.h>
 
 /**
@@ -55,22 +54,29 @@
     {
   public:
 
-      GMVideoInputManager_mlogo (Ekiga::ServiceCore & core);
+      GMVideoInputManager_mlogo ();
 
       ~GMVideoInputManager_mlogo ();
 
 
       virtual void get_devices(std::vector <Ekiga::VideoInputDevice> & devices);
 
-      virtual bool set_device (const Ekiga::VideoInputDevice & device, int channel, Ekiga::VideoInputFormat format);
+      virtual bool set_device (const Ekiga::VideoInputDevice & device,
+			       int channel,
+			       Ekiga::VideoInputFormat format);
 
-      virtual bool open (unsigned width, unsigned height, unsigned fps);
+      virtual bool open (unsigned width,
+			 unsigned height,
+			 unsigned fps);
 
       virtual void close();
 
       virtual bool get_frame_data (char *data);
 
-      virtual bool has_device (const std::string & source, const std::string & device_name, unsigned capabilities, Ekiga::VideoInputDevice & device);
+      virtual bool has_device (const std::string & source,
+			       const std::string & device_name,
+			       unsigned capabilities,
+			       Ekiga::VideoInputDevice & device);
 
   protected:
       void CopyYUVArea (const char* srcFrame,
@@ -86,8 +92,6 @@
       unsigned pos;
       unsigned increment;
 
-      Ekiga::ServiceCore & core;
-
       PAdaptiveDelay adaptive_delay;
 
     private: