ekiga r7111 - in trunk: . lib/engine/audioinput/skel lib/engine/audiooutput/skel lib/engine/videoinput/skel lib/engine/videooutput/skel

[jpuydt svn gnome org]

Author: jpuydt
Date: Sun Sep 28 09:21:34 2008
New Revision: 7111
URL: http://svn.gnome.org/viewvc/ekiga?rev=7111&view=rev

Log:
Fixed circular includes, which allows removing strange forward declarations.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/audioinput/skel/audioinput-core.cpp
   trunk/lib/engine/audioinput/skel/audioinput-core.h
   trunk/lib/engine/audioinput/skel/audioinput-info.h
   trunk/lib/engine/audioinput/skel/audioinput-manager.h
   trunk/lib/engine/audiooutput/skel/audiooutput-core.h
   trunk/lib/engine/audiooutput/skel/audiooutput-manager.h
   trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.cpp
   trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.h
   trunk/lib/engine/videoinput/skel/videoinput-core.h
   trunk/lib/engine/videoinput/skel/videoinput-manager.h
   trunk/lib/engine/videooutput/skel/videooutput-core.h
   trunk/lib/engine/videooutput/skel/videooutput-manager.h

Modified: trunk/lib/engine/audioinput/skel/audioinput-core.cpp
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.cpp	(original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.cpp	Sun Sep 28 09:21:34 2008
@@ -39,7 +39,6 @@
 #include <math.h>
 
 #include "audioinput-core.h"
-#include "audioinput-manager.h"
 
 using namespace Ekiga;
 

Modified: trunk/lib/engine/audioinput/skel/audioinput-core.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.h	(original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.h	Sun Sep 28 09:21:34 2008
@@ -39,14 +39,11 @@
 
 #include "services.h"
 #include "runtime.h"
+
+#include "audioinput-manager.h"
 #include "audiooutput-core.h"
 #include "hal-core.h"
 #include "audioinput-gmconf-bridge.h"
-#include "audioinput-info.h"
-
-#include <sigc++/sigc++.h>
-#include <glib.h>
-#include <set>
 
 #include "ptbuildopts.h"
 #include "ptlib.h"
@@ -57,9 +54,6 @@
 
 namespace Ekiga
 {
-  class AudioInputManager;
-  class AudioInputCore;
-
 /**
  * @defgroup audioinput
  * @{

Modified: trunk/lib/engine/audioinput/skel/audioinput-info.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-info.h	(original)
+++ trunk/lib/engine/audioinput/skel/audioinput-info.h	Sun Sep 28 09:21:34 2008
@@ -38,7 +38,6 @@
 #define __AUDIOINPUT_INFO_H__
 
 #include "device-def.h"
-#include <string>
 
 namespace Ekiga
 {

Modified: trunk/lib/engine/audioinput/skel/audioinput-manager.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-manager.h	(original)
+++ trunk/lib/engine/audioinput/skel/audioinput-manager.h	Sun Sep 28 09:21:34 2008
@@ -38,7 +38,10 @@
 #ifndef __AUDIOINPUT_MANAGER_H__
 #define __AUDIOINPUT_MANAGER_H__
 
-#include "audioinput-core.h"
+#include <vector>
+#include <sigc++/sigc++.h>
+
+#include "audioinput-info.h"
 
 namespace Ekiga
 {

Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.h	(original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.h	Sun Sep 28 09:21:34 2008
@@ -38,16 +38,12 @@
 
 #include "services.h"
 #include "runtime.h"
-#include "audiooutput-core.h"
 #include "hal-core.h"
+
+#include "audiooutput-manager.h"
 #include "audiooutput-gmconf-bridge.h"
-#include "audiooutput-info.h"
 #include "audiooutput-scheduler.h"
 
-#include <sigc++/sigc++.h>
-#include <glib.h>
-#include <set>
-
 #include "ptbuildopts.h"
 #include "ptlib.h"
 
@@ -62,9 +58,6 @@
  * @{
  */
 
-   class AudioOutputManager;
-   class AudioOutputCore;
-
   /** Core object for the audio output support
    * The audio output core abstracts all functionality related to audio output
    * in a thread safe manner. Typically, most of the functions except start(),

Modified: trunk/lib/engine/audiooutput/skel/audiooutput-manager.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-manager.h	(original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-manager.h	Sun Sep 28 09:21:34 2008
@@ -35,10 +35,13 @@
  */
 
 
-#ifndef __AUDIOINPUT_MANAGER_H__
-#define __AUDIOINPUT_MANAGER_H__
+#ifndef __AUDIOOUTPUT_MANAGER_H__
+#define __AUDIOOUTPUT_MANAGER_H__
 
-#include "audiooutput-core.h"
+#include <vector>
+#include <sigc++/sigc++.h>
+
+#include "audiooutput-info.h"
 
 namespace Ekiga
 {

Modified: trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.cpp
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.cpp	(original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.cpp	Sun Sep 28 09:21:34 2008
@@ -34,8 +34,8 @@
  *
  */
 
-#include "audiooutput-core.h"
 #include "audiooutput-scheduler.h"
+#include "audiooutput-core.h"
 #include "config.h"
 
 using namespace Ekiga;

Modified: trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.h	(original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.h	Sun Sep 28 09:21:34 2008
@@ -38,7 +38,8 @@
 #define __AUDIOOUTPUT_SCHEDULER_H__
 
 #include "services.h"
-#include "audiooutput-core.h"
+
+#include "audiooutput-info.h"
 
 #include <glib.h>
 #include <vector>
@@ -49,6 +50,8 @@
 
 namespace Ekiga
 {
+  class AudioOutputCore;
+
   typedef struct AudioEvent {
     std::string name;
     bool is_file_name;
@@ -64,14 +67,12 @@
     AudioOutputPS ps;
   } EventFileName;
 
-  class AudioOutputCore;
-
   class AudioEventScheduler : public PThread
   {
     PCLASSINFO(AudioEventScheduler, PThread);
 
   public:
-    AudioEventScheduler(AudioOutputCore& _audio_output_core);
+    AudioEventScheduler(Ekiga::AudioOutputCore& _audio_output_core);
     ~AudioEventScheduler();
     void add_event_to_queue(const std::string & name, bool is_file_name, unsigned interval, unsigned repetitions);
     void remove_event_from_queue(const std::string & name);
@@ -97,7 +98,7 @@
     PMutex event_file_list_mutex;
     std::vector <EventFileName> event_file_list;
 
-    AudioOutputCore& audio_output_core;
+    Ekiga::AudioOutputCore& audio_output_core;
   };
 };
 #endif

Modified: trunk/lib/engine/videoinput/skel/videoinput-core.h
==============================================================================
--- trunk/lib/engine/videoinput/skel/videoinput-core.h	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-core.h	Sun Sep 28 09:21:34 2008
@@ -41,8 +41,8 @@
 #include "runtime.h"
 #include "videooutput-core.h"
 #include "hal-core.h"
+#include "videoinput-manager.h"
 #include "videoinput-gmconf-bridge.h"
-#include "videoinput-info.h"
 
 #include <sigc++/sigc++.h>
 #include <glib.h>
@@ -62,9 +62,6 @@
  * @{
  */
 
-  class VideoInputManager;
-  class VideoInputCore;
-
   /** Core object for the video input support
    * The video input core abstracts all functionality related to video input
    * in a thread safe manner. Typically, most of the functions except start_stream(),

Modified: trunk/lib/engine/videoinput/skel/videoinput-manager.h
==============================================================================
--- trunk/lib/engine/videoinput/skel/videoinput-manager.h	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-manager.h	Sun Sep 28 09:21:34 2008
@@ -38,7 +38,10 @@
 #ifndef __VIDEOINPUT_MANAGER_H__
 #define __VIDEOINPUT_MANAGER_H__
 
-#include "videoinput-core.h"
+#include <vector>
+#include <sigc++/sigc++.h>
+
+#include "videoinput-info.h"
 
 namespace Ekiga
 {

Modified: trunk/lib/engine/videooutput/skel/videooutput-core.h
==============================================================================
--- trunk/lib/engine/videooutput/skel/videooutput-core.h	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-core.h	Sun Sep 28 09:21:34 2008
@@ -40,7 +40,7 @@
 #include "services.h"
 
 #include "videooutput-gmconf-bridge.h"
-#include "videooutput-info.h"
+#include "videooutput-manager.h"
 
 #include <sigc++/sigc++.h>
 #include <set>
@@ -59,8 +59,6 @@
  * @{
  */
 
-  class VideoOutputManager;
-
   /** Core object for the video display support
    *
    * The VideoOutputCore will control the different VideoOutputManagers and pass pointers to 

Modified: trunk/lib/engine/videooutput/skel/videooutput-manager.h
==============================================================================
--- trunk/lib/engine/videooutput/skel/videooutput-manager.h	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-manager.h	Sun Sep 28 09:21:34 2008
@@ -38,7 +38,9 @@
 #ifndef __VIDEOOUTPUT_MANAGER_H__
 #define __VIDEOOUTPUT_MANAGER_H__
 
-#include "videooutput-core.h"
+#include <sigc++/sigc++.h>
+
+#include "videooutput-info.h"
 
 namespace Ekiga
 {