GNOME.org
 

ekiga r6286 - in trunk: . lib/engine lib/engine/audioinput/skel lib/engine/hal/dbus lib/engine/videoinput/mlogo lib/engine/videoinput/ptlib lib/engine/videoinput/skel lib/engine/videooutput/common lib/engine/videooutput/dx lib/engine/videooutput/skel lib/engine/videooutput/x src/devices src/endpoints src/gui

Author: mschneid
Date: Tue May 20 06:15:06 2008
New Revision: 6286
URL: http://svn.gnome.org/viewvc/ekiga?rev=6286&view=rev

Log:
More renaming.


Added:
   trunk/lib/engine/videoinput/mlogo/videoinput-main-mlogo.cpp
      - copied, changed from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.cpp
   trunk/lib/engine/videoinput/mlogo/videoinput-main-mlogo.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.h
   trunk/lib/engine/videoinput/mlogo/videoinput-manager-mlogo.cpp
      - copied, changed from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.cpp
   trunk/lib/engine/videoinput/mlogo/videoinput-manager-mlogo.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.h
   trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.cpp
      - copied, changed from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.cpp
   trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.h
   trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.cpp
      - copied, changed from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.cpp
   trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.h
   trunk/lib/engine/videoinput/skel/videoinput-core.cpp
      - copied, changed from r6271, /trunk/lib/engine/videoinput/skel/vidinput-core.cpp
   trunk/lib/engine/videoinput/skel/videoinput-core.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/skel/vidinput-core.h
   trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.cpp
      - copied, changed from r6271, /trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.cpp
   trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.h
   trunk/lib/engine/videoinput/skel/videoinput-info.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/skel/vidinput-info.h
   trunk/lib/engine/videoinput/skel/videoinput-manager.h
      - copied, changed from r6271, /trunk/lib/engine/videoinput/skel/vidinput-manager.h
   trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/common/display-manager-common.cpp
   trunk/lib/engine/videooutput/common/videooutput-manager-common.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/common/display-manager-common.h
   trunk/lib/engine/videooutput/dx/videooutput-main-dx.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/dx/display-main-dx.cpp
   trunk/lib/engine/videooutput/dx/videooutput-main-dx.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/dx/display-main-dx.h
   trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/dx/display-manager-dx.cpp
   trunk/lib/engine/videooutput/dx/videooutput-manager-dx.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/dx/display-manager-dx.h
   trunk/lib/engine/videooutput/skel/videooutput-core.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/skel/display-core.cpp
   trunk/lib/engine/videooutput/skel/videooutput-core.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/skel/display-core.h
   trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/skel/display-gmconf-bridge.cpp
   trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/skel/display-gmconf-bridge.h
   trunk/lib/engine/videooutput/skel/videooutput-info.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/skel/display-info.h
   trunk/lib/engine/videooutput/skel/videooutput-manager.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/skel/display-manager.h
   trunk/lib/engine/videooutput/x/videooutput-main-x.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/x/display-main-x.cpp
   trunk/lib/engine/videooutput/x/videooutput-main-x.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/x/display-main-x.h
   trunk/lib/engine/videooutput/x/videooutput-manager-x.cpp
      - copied, changed from r6271, /trunk/lib/engine/videooutput/x/display-manager-x.cpp
   trunk/lib/engine/videooutput/x/videooutput-manager-x.h
      - copied, changed from r6271, /trunk/lib/engine/videooutput/x/display-manager-x.h
Removed:
   trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.cpp
   trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.h
   trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.cpp
   trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.h
   trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.cpp
   trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.h
   trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.cpp
   trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.h
   trunk/lib/engine/videoinput/skel/vidinput-core.cpp
   trunk/lib/engine/videoinput/skel/vidinput-core.h
   trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.cpp
   trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.h
   trunk/lib/engine/videoinput/skel/vidinput-info.h
   trunk/lib/engine/videoinput/skel/vidinput-manager.h
   trunk/lib/engine/videooutput/common/display-manager-common.cpp
   trunk/lib/engine/videooutput/common/display-manager-common.h
   trunk/lib/engine/videooutput/dx/display-main-dx.cpp
   trunk/lib/engine/videooutput/dx/display-main-dx.h
   trunk/lib/engine/videooutput/dx/display-manager-dx.cpp
   trunk/lib/engine/videooutput/dx/display-manager-dx.h
   trunk/lib/engine/videooutput/skel/display-core.cpp
   trunk/lib/engine/videooutput/skel/display-core.h
   trunk/lib/engine/videooutput/skel/display-gmconf-bridge.cpp
   trunk/lib/engine/videooutput/skel/display-gmconf-bridge.h
   trunk/lib/engine/videooutput/skel/display-info.h
   trunk/lib/engine/videooutput/skel/display-manager.h
   trunk/lib/engine/videooutput/x/display-main-x.cpp
   trunk/lib/engine/videooutput/x/display-main-x.h
   trunk/lib/engine/videooutput/x/display-manager-x.cpp
   trunk/lib/engine/videooutput/x/display-manager-x.h
Modified:
   trunk/ChangeLog
   trunk/lib/engine/audioinput/skel/audioinput-info.h
   trunk/lib/engine/engine.cpp
   trunk/lib/engine/hal/dbus/hal-main-dbus.h
   trunk/lib/engine/videoinput/mlogo/Makefile.am
   trunk/lib/engine/videoinput/ptlib/Makefile.am
   trunk/lib/engine/videoinput/skel/Makefile.am
   trunk/lib/engine/videooutput/dx/Makefile.am
   trunk/lib/engine/videooutput/skel/Makefile.am
   trunk/lib/engine/videooutput/x/Makefile.am
   trunk/src/devices/videoinput.h
   trunk/src/devices/videooutput.h
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/opal-main.cpp
   trunk/src/gui/assistant.cpp
   trunk/src/gui/main.cpp
   trunk/src/gui/preferences.cpp
   trunk/src/gui/preferences.h

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	Tue May 20 06:15:06 2008
@@ -29,8 +29,8 @@
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
- *   description          : Declaration of the interface of a vidinput core.
- *                          A vidinput core manages VidInputManagers.
+ *   description          : Declaration of the interface of a audioinput core.
+ *                          A audioinput core manages AudioInputManagers.
  *
  */
 

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Tue May 20 06:15:06 2008
@@ -44,8 +44,8 @@
 #include "presence-core.h"
 #include "contact-core.h"
 #include "call-core.h"
-#include "display-core.h"
-#include "vidinput-core.h"
+#include "videooutput-core.h"
+#include "videoinput-core.h"
 #include "audioinput-core.h"
 #include "audiooutput-core.h"
 #include "hal-core.h"
@@ -57,18 +57,18 @@
 #include "gmconf-personal-details-main.h"
 
 #ifndef WIN32
-#include "display-main-x.h"
+#include "videooutput-main-x.h"
 #endif
 
 #ifdef HAVE_DX
-#include "display-main-dx.h"
+#include "videooutput-main-dx.h"
 #endif
 
-#include "vidinput-main-mlogo.h"
+#include "videoinput-main-mlogo.h"
 #include "audioinput-main-null.h"
 #include "audiooutput-main-null.h"
 
-#include "vidinput-main-ptlib.h"
+#include "videoinput-main-ptlib.h"
 #include "audioinput-main-ptlib.h"
 #include "audiooutput-main-ptlib.h"
 
@@ -136,14 +136,14 @@
   }
 
 #ifndef WIN32
-  if (!display_x_init (*core, &argc, &argv)) {
+  if (!videooutput_x_init (*core, &argc, &argv)) {
     delete core;
     return;
   }
 #endif
 
 #ifdef HAVE_DX
-  if (!display_dx_init (*core, &argc, &argv)) {
+  if (!videooutput_dx_init (*core, &argc, &argv)) {
     delete core;
     return;
   }

Modified: trunk/lib/engine/hal/dbus/hal-main-dbus.h
==============================================================================
--- trunk/lib/engine/hal/dbus/hal-main-dbus.h	(original)
+++ trunk/lib/engine/hal/dbus/hal-main-dbus.h	Tue May 20 06:15:06 2008
@@ -27,7 +27,7 @@
 
 
 /*
- *                         vidinput-main-mlogo.h  -  description
+ *                         hal-main-dbus.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider

Modified: trunk/lib/engine/videoinput/mlogo/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/mlogo/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/mlogo/Makefile.am	Tue May 20 06:15:06 2008
@@ -15,9 +15,9 @@
 	-I$(top_srcdir)/lib/engine/hal/skel
 
 libgmvideoinput_mlogo_la_SOURCES = \
-	$(videoinput_dir)/vidinput-manager-mlogo.h \
-	$(videoinput_dir)/vidinput-manager-mlogo.cpp \
-	$(videoinput_dir)/vidinput-main-mlogo.h \
-	$(videoinput_dir)/vidinput-main-mlogo.cpp 
+	$(videoinput_dir)/videoinput-manager-mlogo.h \
+	$(videoinput_dir)/videoinput-manager-mlogo.cpp \
+	$(videoinput_dir)/videoinput-main-mlogo.h \
+	$(videoinput_dir)/videoinput-main-mlogo.cpp 
 
 libgmvideoinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Copied: trunk/lib/engine/videoinput/mlogo/videoinput-main-mlogo.cpp (from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.cpp)
==============================================================================
--- /trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.cpp	(original)
+++ trunk/lib/engine/videoinput/mlogo/videoinput-main-mlogo.cpp	Tue May 20 06:15:06 2008
@@ -36,9 +36,9 @@
  *
  */
 
-#include "vidinput-main-mlogo.h"
-#include "vidinput-core.h"
-#include "vidinput-manager-mlogo.h"
+#include "videoinput-main-mlogo.h"
+#include "videoinput-core.h"
+#include "videoinput-manager-mlogo.h"
 
 bool
 videoinput_mlogo_init (Ekiga::ServiceCore &core,

Copied: trunk/lib/engine/videoinput/mlogo/videoinput-main-mlogo.h (from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.h)
==============================================================================
--- /trunk/lib/engine/videoinput/mlogo/vidinput-main-mlogo.h	(original)
+++ trunk/lib/engine/videoinput/mlogo/videoinput-main-mlogo.h	Tue May 20 06:15:06 2008
@@ -27,7 +27,7 @@
 
 
 /*
- *                         vidinput-main-mlogo.h  -  description
+ *                         videoinput-main-mlogo.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider

Copied: trunk/lib/engine/videoinput/mlogo/videoinput-manager-mlogo.cpp (from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.cpp)
==============================================================================
--- /trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.cpp	(original)
+++ trunk/lib/engine/videoinput/mlogo/videoinput-manager-mlogo.cpp	Tue May 20 06:15:06 2008
@@ -34,7 +34,7 @@
  *
  */
 
-#include "vidinput-manager-mlogo.h"
+#include "videoinput-manager-mlogo.h"
 #include "icon.h"
 
 #define DEVICE_TYPE   "Moving Logo"

Copied: trunk/lib/engine/videoinput/mlogo/videoinput-manager-mlogo.h (from r6271, /trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.h)
==============================================================================
--- /trunk/lib/engine/videoinput/mlogo/vidinput-manager-mlogo.h	(original)
+++ trunk/lib/engine/videoinput/mlogo/videoinput-manager-mlogo.h	Tue May 20 06:15:06 2008
@@ -25,7 +25,7 @@
 
 
 /*
- *                         vidinput-manager-mlogo.h  -  description
+ *                         videoinput-manager-mlogo.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
@@ -38,8 +38,8 @@
 #ifndef __VIDEOINPUT_MANAGER_MLOGO_H__
 #define __VIDEOINPUT_MANAGER_MLOGO_H__
 
-#include "vidinput-core.h"
-#include "vidinput-manager.h"
+#include "videoinput-core.h"
+#include "videoinput-manager.h"
 #include "runtime.h"
 
 #include "ptbuildopts.h"

Modified: trunk/lib/engine/videoinput/ptlib/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/ptlib/Makefile.am	Tue May 20 06:15:06 2008
@@ -14,9 +14,9 @@
 	-I$(top_srcdir)/lib/engine/hal/skel
 
 libgmvideoinput_ptlib_la_SOURCES = \
-	$(videoinput_dir)/vidinput-manager-ptlib.h \
-	$(videoinput_dir)/vidinput-manager-ptlib.cpp \
-	$(videoinput_dir)/vidinput-main-ptlib.h \
-	$(videoinput_dir)/vidinput-main-ptlib.cpp 
+	$(videoinput_dir)/videoinput-manager-ptlib.h \
+	$(videoinput_dir)/videoinput-manager-ptlib.cpp \
+	$(videoinput_dir)/videoinput-main-ptlib.h \
+	$(videoinput_dir)/videoinput-main-ptlib.cpp 
 
 libgmvideoinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Copied: trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.cpp (from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.cpp)
==============================================================================
--- /trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.cpp	(original)
+++ trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.cpp	Tue May 20 06:15:06 2008
@@ -36,9 +36,9 @@
  *
  */
 
-#include "vidinput-main-ptlib.h"
-#include "vidinput-core.h"
-#include "vidinput-manager-ptlib.h"
+#include "videoinput-main-ptlib.h"
+#include "videoinput-core.h"
+#include "videoinput-manager-ptlib.h"
 
 bool
 videoinput_ptlib_init (Ekiga::ServiceCore &core,

Copied: trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.h (from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.h)
==============================================================================
--- /trunk/lib/engine/videoinput/ptlib/vidinput-main-ptlib.h	(original)
+++ trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.h	Tue May 20 06:15:06 2008
@@ -27,7 +27,7 @@
 
 
 /*
- *                         vidinput-main-ptlib.h  -  description
+ *                         videoinput-main-ptlib.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider

Copied: trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.cpp (from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.cpp)
==============================================================================
--- /trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.cpp	(original)
+++ trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.cpp	Tue May 20 06:15:06 2008
@@ -34,7 +34,7 @@
  *
  */
 
-#include "vidinput-manager-ptlib.h"
+#include "videoinput-manager-ptlib.h"
 #include "ptbuildopts.h"
 #include "ptlib.h"
 

Copied: trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.h (from r6271, /trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.h)
==============================================================================
--- /trunk/lib/engine/videoinput/ptlib/vidinput-manager-ptlib.h	(original)
+++ trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.h	Tue May 20 06:15:06 2008
@@ -25,7 +25,7 @@
 
 
 /*
- *                         vidinput-manager-ptlib.h  -  description
+ *                         videoinput-manager-ptlib.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
@@ -38,7 +38,7 @@
 #ifndef __VIDEOINPUT_MANAGER_PTLIB_H__
 #define __VIDEOINPUT_MANAGER_PTLIB_H__
 
-#include "vidinput-manager.h"
+#include "videoinput-manager.h"
 #include "runtime.h"
 
 #include "ptbuildopts.h"

Modified: trunk/lib/engine/videoinput/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/skel/Makefile.am	Tue May 20 06:15:06 2008
@@ -13,11 +13,11 @@
 	-I$(top_srcdir)/lib/engine/hal/skel
 
 libgmvideoinput_la_SOURCES = \
-	$(videoinput_dir)/vidinput-manager.h	\
-	$(videoinput_dir)/vidinput-info.h		\
-	$(videoinput_dir)/vidinput-core.h		\
-	$(videoinput_dir)/vidinput-core.cpp       \
-	$(videoinput_dir)/vidinput-gmconf-bridge.h \
-	$(videoinput_dir)/vidinput-gmconf-bridge.cpp
+	$(videoinput_dir)/videoinput-manager.h	\
+	$(videoinput_dir)/videoinput-info.h		\
+	$(videoinput_dir)/videoinput-core.h		\
+	$(videoinput_dir)/videoinput-core.cpp       \
+	$(videoinput_dir)/videoinput-gmconf-bridge.h \
+	$(videoinput_dir)/videoinput-gmconf-bridge.cpp
 
 libgmvideoinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Copied: trunk/lib/engine/videoinput/skel/videoinput-core.cpp (from r6271, /trunk/lib/engine/videoinput/skel/vidinput-core.cpp)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/vidinput-core.cpp	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-core.cpp	Tue May 20 06:15:06 2008
@@ -39,8 +39,8 @@
 
 #include "config.h"
 
-#include "vidinput-core.h"
-#include "vidinput-manager.h"
+#include "videoinput-core.h"
+#include "videoinput-manager.h"
 
 using namespace Ekiga;
 

Copied: trunk/lib/engine/videoinput/skel/videoinput-core.h (from r6271, /trunk/lib/engine/videoinput/skel/vidinput-core.h)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/vidinput-core.h	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-core.h	Tue May 20 06:15:06 2008
@@ -25,7 +25,7 @@
 
 
 /*
- *                         vidinput-core.h  -  description
+ *                         videoinput-core.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
@@ -39,10 +39,10 @@
 
 #include "services.h"
 #include "runtime.h"
-#include "display-core.h"
+#include "videooutput-core.h"
 #include "hal-core.h"
-#include "vidinput-gmconf-bridge.h"
-#include "vidinput-info.h"
+#include "videoinput-gmconf-bridge.h"
+#include "videoinput-info.h"
 
 #include <sigc++/sigc++.h>
 #include <glib.h>
@@ -89,7 +89,7 @@
   };
 
 /**
- * @defgroup vidinput Video VidInput
+ * @defgroup videoinput
  * @{
  */
 
@@ -181,7 +181,7 @@
 
       /*** VidInput Related Signals ***/
       
-      /** See vidinput-manager.h for the API
+      /** See videoinput-manager.h for the API
        */
       sigc::signal<void, VideoInputManager &, VideoInputDevice &, VidInputConfig&> device_opened;
       sigc::signal<void, VideoInputManager &, VideoInputDevice &> device_closed;

Copied: trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.cpp (from r6271, /trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.cpp)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.cpp	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.cpp	Tue May 20 06:15:06 2008
@@ -36,8 +36,8 @@
 
 #include "config.h"
 
-#include "vidinput-gmconf-bridge.h"
-#include "vidinput-core.h"
+#include "videoinput-gmconf-bridge.h"
+#include "videoinput-core.h"
 
 #define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
 #define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"

Copied: trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.h (from r6271, /trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.h)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/vidinput-gmconf-bridge.h	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.h	Tue May 20 06:15:06 2008
@@ -25,12 +25,12 @@
 
 
 /*
- *                         vidinput-core.h  -  description
+ *                         videoinput-core.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
- *   description          : Declaration of the interface of a vidinput core.
- *                          A vidinput core manages VidInputManagers.
+ *   description          : Declaration of the interface of a videoinput core.
+ *                          A videoinput core manages VidInputManagers.
  *
  */
 

Copied: trunk/lib/engine/videoinput/skel/videoinput-info.h (from r6271, /trunk/lib/engine/videoinput/skel/vidinput-info.h)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/vidinput-info.h	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-info.h	Tue May 20 06:15:06 2008
@@ -25,7 +25,7 @@
 
 
 /*
- *                         vidinput-core.h  -  description
+ *                         videoinput-core.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider

Copied: trunk/lib/engine/videoinput/skel/videoinput-manager.h (from r6271, /trunk/lib/engine/videoinput/skel/vidinput-manager.h)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/vidinput-manager.h	(original)
+++ trunk/lib/engine/videoinput/skel/videoinput-manager.h	Tue May 20 06:15:06 2008
@@ -25,7 +25,7 @@
 
 
 /*
- *                         vidinput-manager.h  -  description
+ *                         videoinput-manager.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
@@ -38,7 +38,7 @@
 #ifndef __VIDEOINPUT_MANAGER_H__
 #define __VIDEOINPUT_MANAGER_H__
 
-#include "vidinput-core.h"
+#include "videoinput-core.h"
 
 namespace Ekiga
 {

Copied: trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp (from r6271, /trunk/lib/engine/videooutput/common/display-manager-common.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/common/display-manager-common.cpp	(original)
+++ trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp	Tue May 20 06:15:06 2008
@@ -43,7 +43,7 @@
  */
 
 
-#include "display-manager-common.h"
+#include "videooutput-manager-common.h"
 
 /* The functions */
 GMVideoOutputManager::GMVideoOutputManager(Ekiga::ServiceCore & _core)

Copied: trunk/lib/engine/videooutput/common/videooutput-manager-common.h (from r6271, /trunk/lib/engine/videooutput/common/display-manager-common.h)
==============================================================================
--- /trunk/lib/engine/videooutput/common/display-manager-common.h	(original)
+++ trunk/lib/engine/videooutput/common/videooutput-manager-common.h	Tue May 20 06:15:06 2008
@@ -46,7 +46,7 @@
 #ifndef _VIDEODISPLAY_H_
 #define _VIDEODISPLAY_H_
 
-#include "display-manager.h"
+#include "videooutput-manager.h"
 #include "runtime.h"
 //FIXME
 #include "ptbuildopts.h"

Modified: trunk/lib/engine/videooutput/dx/Makefile.am
==============================================================================
--- trunk/lib/engine/videooutput/dx/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/dx/Makefile.am	Tue May 20 06:15:06 2008
@@ -14,11 +14,11 @@
 	-I$(top_srcdir)/lib/gui
 
 libgmvideooutput_dx_la_SOURCES = \
-	$(common_dir)/display-manager-common.cpp\
-	$(common_dir)/display-manager-common.h  \
-	$(videooutput_dir)/display-manager-dx.cpp    \
-	$(videooutput_dir)/display-manager-dx.h      \
-	$(videooutput_dir)/display-main-dx.cpp    \
-	$(videooutput_dir)/display-main-dx.h
+	$(common_dir)/videooutput-manager-common.cpp\
+	$(common_dir)/videooutput-manager-common.h  \
+	$(videooutput_dir)/videooutput-manager-dx.cpp    \
+	$(videooutput_dir)/videooutput-manager-dx.h      \
+	$(videooutput_dir)/videooutput-main-dx.cpp    \
+	$(videooutput_dir)/videooutput-main-dx.h
 
 libgmvideooutput_dx_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS) $(GLIB_LIBS)

Copied: trunk/lib/engine/videooutput/dx/videooutput-main-dx.cpp (from r6271, /trunk/lib/engine/videooutput/dx/display-main-dx.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/dx/display-main-dx.cpp	(original)
+++ trunk/lib/engine/videooutput/dx/videooutput-main-dx.cpp	Tue May 20 06:15:06 2008
@@ -27,20 +27,20 @@
 
 
 /*
- *                         display-main-dx.cpp  -  description
+ *                         videooutput-main-dx.cpp  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
- *   description          : code to hook the DX display manager into the main program
+ *   description          : code to hook the DX videooutput manager into the main program
  *
  */
 
-#include "display-main-dx.h"
-#include "display-core.h"
-#include "display-manager-dx.h"
+#include "videooutput-main-dx.h"
+#include "videooutput-core.h"
+#include "videooutput-manager-dx.h"
 
 bool
-display_dx_init (Ekiga::ServiceCore &core,
+videooutput_dx_init (Ekiga::ServiceCore &core,
 	    int */*argc*/,
 	    char **/*argv*/[])
 {

Copied: trunk/lib/engine/videooutput/dx/videooutput-main-dx.h (from r6271, /trunk/lib/engine/videooutput/dx/display-main-dx.h)
==============================================================================
--- /trunk/lib/engine/videooutput/dx/display-main-dx.h	(original)
+++ trunk/lib/engine/videooutput/dx/videooutput-main-dx.h	Tue May 20 06:15:06 2008
@@ -35,12 +35,12 @@
  *
  */
 
-#ifndef __DISPLAY_MAIN_DX_H__
-#define __DISPLAY_MAIN_DX_H__
+#ifndef __VIDEOOUTPUT_MAIN_DX_H__
+#define __VIDEOOUTPUT_MAIN_DX_H__
 
 #include "services.h"
 
-bool display_dx_init (Ekiga::ServiceCore &core,
+bool videooutput_dx_init (Ekiga::ServiceCore &core,
   		     int *argc,
 		     char **argv[]);
 

Copied: trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp (from r6271, /trunk/lib/engine/videooutput/dx/display-manager-dx.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/dx/display-manager-dx.cpp	(original)
+++ trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp	Tue May 20 06:15:06 2008
@@ -35,7 +35,7 @@
  *                          accelerated window
  */
 
-#include "display-manager-dx.h"
+#include "videooutput-manager-dx.h"
 
 GMVideoOutputManager_dx::GMVideoOutputManager_dx (Ekiga::ServiceCore & _core)
 : GMVideoOutputManager(_core)

Copied: trunk/lib/engine/videooutput/dx/videooutput-manager-dx.h (from r6271, /trunk/lib/engine/videooutput/dx/display-manager-dx.h)
==============================================================================
--- /trunk/lib/engine/videooutput/dx/display-manager-dx.h	(original)
+++ trunk/lib/engine/videooutput/dx/videooutput-manager-dx.h	Tue May 20 06:15:06 2008
@@ -38,10 +38,10 @@
  */
 
 
-#ifndef _DISPLAY_MANAGER_DX_H_
-#define _DISPLAY_MANAGER_DX_H_
+#ifndef _VIDEOOUTPUT_MANAGER_DX_H_
+#define _VIDEOOUTPUT_MANAGER_DX_H_
 
-#include "display-manager-common.h"
+#include "videooutput-manager-common.h"
 #include "dxwindow.h"
 
 class GMVideoOutputManager_dx
@@ -106,4 +106,4 @@
 
   DXWindow *dxWindow;
 };
-#endif /* VIDEODISPLAY_DX */
+#endif /* _VIDEOOUTPUT_MANAGER_DX_H_ */

Modified: trunk/lib/engine/videooutput/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/videooutput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/skel/Makefile.am	Tue May 20 06:15:06 2008
@@ -11,10 +11,10 @@
 	-I$(top_srcdir)/lib/engine/videooutput/skel
 
 libgmvideooutput_la_SOURCES = \
-	$(videooutput_dir)/display-manager.h	\
-	$(videooutput_dir)/display-core.h		\
-	$(videooutput_dir)/display-core.cpp         \
-	$(videooutput_dir)/display-gmconf-bridge.h  \
-	$(videooutput_dir)/display-gmconf-bridge.cpp
+	$(videooutput_dir)/videooutput-manager.h	\
+	$(videooutput_dir)/videooutput-core.h		\
+	$(videooutput_dir)/videooutput-core.cpp         \
+	$(videooutput_dir)/videooutput-gmconf-bridge.h  \
+	$(videooutput_dir)/videooutput-gmconf-bridge.cpp
 
 libgmvideooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Copied: trunk/lib/engine/videooutput/skel/videooutput-core.cpp (from r6271, /trunk/lib/engine/videooutput/skel/display-core.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/display-core.cpp	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-core.cpp	Tue May 20 06:15:06 2008
@@ -39,8 +39,8 @@
 
 #include "config.h"
 
-#include "display-core.h"
-#include "display-manager.h"
+#include "videooutput-core.h"
+#include "videooutput-manager.h"
 
 #include <math.h>
 

Copied: trunk/lib/engine/videooutput/skel/videooutput-core.h (from r6271, /trunk/lib/engine/videooutput/skel/display-core.h)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/display-core.h	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-core.h	Tue May 20 06:15:06 2008
@@ -39,8 +39,8 @@
 
 #include "services.h"
 
-#include "display-gmconf-bridge.h"
-#include "display-info.h"
+#include "videooutput-gmconf-bridge.h"
+#include "videooutput-info.h"
 
 #include <sigc++/sigc++.h>
 #include <set>

Copied: trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.cpp (from r6271, /trunk/lib/engine/videooutput/skel/display-gmconf-bridge.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/display-gmconf-bridge.cpp	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.cpp	Tue May 20 06:15:06 2008
@@ -36,8 +36,8 @@
 
 #include "config.h"
 
-#include "display-gmconf-bridge.h"
-#include "display-core.h"
+#include "videooutput-gmconf-bridge.h"
+#include "videooutput-core.h"
 
 #define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
 #define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"

Copied: trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.h (from r6271, /trunk/lib/engine/videooutput/skel/display-gmconf-bridge.h)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/display-gmconf-bridge.h	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.h	Tue May 20 06:15:06 2008
@@ -25,7 +25,7 @@
 
 
 /*
- *                         vidinput-core.h  -  description
+ *                         videoinput-core.h  -  description
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider

Copied: trunk/lib/engine/videooutput/skel/videooutput-info.h (from r6271, /trunk/lib/engine/videooutput/skel/display-info.h)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/display-info.h	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-info.h	Tue May 20 06:15:06 2008
@@ -34,8 +34,8 @@
  *
  */
 
-#ifndef __DISPLAY_INFO_H__
-#define __DISPLAY_INFO_H__
+#ifndef __VIDEOOUTPUT_INFO_H__
+#define __VIDEOOUTPUT_INFO_H__
 
 #ifdef WIN32
 #include <windows.h>

Copied: trunk/lib/engine/videooutput/skel/videooutput-manager.h (from r6271, /trunk/lib/engine/videooutput/skel/display-manager.h)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/display-manager.h	(original)
+++ trunk/lib/engine/videooutput/skel/videooutput-manager.h	Tue May 20 06:15:06 2008
@@ -38,7 +38,7 @@
 #ifndef __VIDEOOUTPUT_MANAGER_H__
 #define __VIDEOOUTPUT_MANAGER_H__
 
-#include "display-core.h"
+#include "videooutput-core.h"
 
 namespace Ekiga
 {

Modified: trunk/lib/engine/videooutput/x/Makefile.am
==============================================================================
--- trunk/lib/engine/videooutput/x/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/x/Makefile.am	Tue May 20 06:15:06 2008
@@ -14,11 +14,11 @@
 	-I$(top_srcdir)/lib/gui
 
 libgmvideooutput_x_la_SOURCES = \
-	$(common_dir)/display-manager-common.cpp \
-	$(common_dir)/display-manager-common.h   \
-	$(videooutput_dir)/display-manager-x.cpp  \
-	$(videooutput_dir)/display-manager-x.h      \
-	$(videooutput_dir)/display-main-x.cpp    \
-	$(videooutput_dir)/display-main-x.h
+	$(common_dir)/videooutput-manager-common.cpp \
+	$(common_dir)/videooutput-manager-common.h   \
+	$(videooutput_dir)/videooutput-manager-x.cpp  \
+	$(videooutput_dir)/videooutput-manager-x.h      \
+	$(videooutput_dir)/videooutput-main-x.cpp    \
+	$(videooutput_dir)/videooutput-main-x.h
 
 libgmvideooutput_x_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(GLIB_LIBS) $(XV_LIBS)

Copied: trunk/lib/engine/videooutput/x/videooutput-main-x.cpp (from r6271, /trunk/lib/engine/videooutput/x/display-main-x.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/x/display-main-x.cpp	(original)
+++ trunk/lib/engine/videooutput/x/videooutput-main-x.cpp	Tue May 20 06:15:06 2008
@@ -35,12 +35,12 @@
  *
  */
 
-#include "display-main-x.h"
-#include "display-core.h"
-#include "display-manager-x.h"
+#include "videooutput-main-x.h"
+#include "videooutput-core.h"
+#include "videooutput-manager-x.h"
 
 bool
-display_x_init (Ekiga::ServiceCore &core,
+videooutput_x_init (Ekiga::ServiceCore &core,
 	    int */*argc*/,
 	    char **/*argv*/[])
 {

Copied: trunk/lib/engine/videooutput/x/videooutput-main-x.h (from r6271, /trunk/lib/engine/videooutput/x/display-main-x.h)
==============================================================================
--- /trunk/lib/engine/videooutput/x/display-main-x.h	(original)
+++ trunk/lib/engine/videooutput/x/videooutput-main-x.h	Tue May 20 06:15:06 2008
@@ -35,12 +35,12 @@
  *
  */
 
-#ifndef __DISPLAY_MAIN_X_H__
-#define __DISPLAY_MAIN_X_H__
+#ifndef __VIDEOOUTPUT_MAIN_X_H__
+#define __VIDEOOUTPUT_MAIN_X_H__
 
 #include "services.h"
 
-bool display_x_init (Ekiga::ServiceCore &core,
+bool videooutput_x_init (Ekiga::ServiceCore &core,
   		     int *argc,
 		     char **argv[]);
 

Copied: trunk/lib/engine/videooutput/x/videooutput-manager-x.cpp (from r6271, /trunk/lib/engine/videooutput/x/display-manager-x.cpp)
==============================================================================
--- /trunk/lib/engine/videooutput/x/display-manager-x.cpp	(original)
+++ trunk/lib/engine/videooutput/x/videooutput-manager-x.cpp	Tue May 20 06:15:06 2008
@@ -35,7 +35,7 @@
  *                          accelerated window
  */
 
-#include "display-manager-x.h"
+#include "videooutput-manager-x.h"
 
 #include "xwindow.h"
 

Copied: trunk/lib/engine/videooutput/x/videooutput-manager-x.h (from r6271, /trunk/lib/engine/videooutput/x/display-manager-x.h)
==============================================================================
--- /trunk/lib/engine/videooutput/x/display-manager-x.h	(original)
+++ trunk/lib/engine/videooutput/x/videooutput-manager-x.h	Tue May 20 06:15:06 2008
@@ -38,10 +38,10 @@
  */
 
 
-#ifndef _DISPLAY_MANAGER_X_H_
-#define _DISPLAY_MANAGER_X_H_
+#ifndef _VIDEOOUTPUT_MANAGER_X_H_
+#define _VIDEOOUTPUT_MANAGER_X_H_
 
-#include "display-manager-common.h"
+#include "videooutput-manager-common.h"
 #include "xwindow.h"
 
 class GMVideoOutputManager_x
@@ -113,4 +113,4 @@
   bool pip_window_available;
 
 };
-#endif /* DISPLAY_MANAGER_X */
+#endif /* _VIDEOOUTPUT_MANAGER_X_H_ */

Modified: trunk/src/devices/videoinput.h
==============================================================================
--- trunk/src/devices/videoinput.h	(original)
+++ trunk/src/devices/videoinput.h	Tue May 20 06:15:06 2008
@@ -40,7 +40,7 @@
 #ifndef _EKIGA_VIDEO_INPUT_H_
 #define _EKIGA_VIDEO_INPUT_H_
 
-#include "vidinput-core.h"
+#include "videoinput-core.h"
 #include "common.h"
 
 class PVideoInputDevice_EKIGA : public PVideoInputDevice 

Modified: trunk/src/devices/videooutput.h
==============================================================================
--- trunk/src/devices/videooutput.h	(original)
+++ trunk/src/devices/videooutput.h	Tue May 20 06:15:06 2008
@@ -40,7 +40,7 @@
 #ifndef _EKIGA_VIDEO_OUTPUT_H_
 #define _EKIGA_VIDEO_OUTPUT_H_
 
-#include "display-core.h"
+#include "videooutput-core.h"
 #include "common.h"
 
 class GMManager;

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Tue May 20 06:15:06 2008
@@ -47,7 +47,7 @@
 #include "call-core.h"
 #include "opal-call.h"
 #include "opal-codec-description.h"
-#include "vidinput-info.h"
+#include "videoinput-info.h"
 
 #include "call-manager.h"
 

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Tue May 20 06:15:06 2008
@@ -39,7 +39,6 @@
 #include "contact-core.h"
 #include "presence-core.h"
 #include "call-core.h"
-#include "display-core.h"
 #include "opal-gmconf-bridge.h"
 
 #include "manager.h"

Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp	(original)
+++ trunk/src/gui/assistant.cpp	Tue May 20 06:15:06 2008
@@ -44,7 +44,7 @@
 #include "toolbox/toolbox.h"
 #include "assistant.h"
 
-#include "vidinput-core.h"
+#include "videoinput-core.h"
 #include "audioinput-core.h"
 #include "audiooutput-core.h"
 

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Tue May 20 06:15:06 2008
@@ -88,7 +88,7 @@
 
 #include <libxml/parser.h>
 
-#include "vidinput-core.h"
+#include "videoinput-core.h"
 #include "audioinput-core.h"
 #include "audiooutput-core.h"
 

Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp	(original)
+++ trunk/src/gui/preferences.cpp	Tue May 20 06:15:06 2008
@@ -53,6 +53,10 @@
 #include <gmconf.h>
 #include "codecsbox.h"
 
+#include "videoinput-core.h"
+#include "audioinput-core.h"
+#include "audiooutput-core.h"
+
 #ifdef WIN32
 #include "platform/winpaths.h"
 #endif

Modified: trunk/src/gui/preferences.h
==============================================================================
--- trunk/src/gui/preferences.h	(original)
+++ trunk/src/gui/preferences.h	Tue May 20 06:15:06 2008
@@ -42,10 +42,6 @@
 
 #include "common.h"
 #include "framework/services.h"
-#include "vidinput-core.h"
-#include "audioinput-core.h"
-#include "audiooutput-core.h"
-
 
 /* DESCRIPTION  :  / 
  * BEHAVIOR     :  Builds the sound events list of the preferences window.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]