ekiga r7411 - in trunk: . lib/engine lib/engine/audioinput/ptlib lib/engine/audiooutput/ptlib lib/engine/components/ptlib lib/engine/videoinput lib/engine/videoinput/ptlib

[dsandras svn gnome org]

Author: dsandras
Date: Sun Nov 23 18:56:11 2008
New Revision: 7411
URL: http://svn.gnome.org/viewvc/ekiga?rev=7411&view=rev

Log:
Moved the videoinput to the components directory.


Added:
   trunk/lib/engine/components/ptlib/videoinput-main-ptlib.cpp   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.cpp
   trunk/lib/engine/components/ptlib/videoinput-main-ptlib.h   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/videoinput/ptlib/videoinput-main-ptlib.h
   trunk/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.cpp
   trunk/lib/engine/components/ptlib/videoinput-manager-ptlib.h   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/videoinput/ptlib/videoinput-manager-ptlib.h
Removed:
   trunk/lib/engine/audioinput/ptlib/
   trunk/lib/engine/audiooutput/ptlib/
   trunk/lib/engine/videoinput/ptlib/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/ptlib/Makefile.am
   trunk/lib/engine/videoinput/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 23 18:56:11 2008
@@ -784,7 +784,6 @@
 lib/engine/videoinput/Makefile
 lib/engine/videoinput/skel/Makefile
 lib/engine/videoinput/mlogo/Makefile
-lib/engine/videoinput/ptlib/Makefile
 lib/engine/audioinput/Makefile
 lib/engine/audioinput/skel/Makefile
 lib/engine/audioinput/null/Makefile

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Nov 23 18:56:11 2008
@@ -99,7 +99,6 @@
 
 # PTLIB Input Devices
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/videoinput/ptlib/libgmvideoinput-ptlib.la \
 	$(top_builddir)/lib/engine/components/ptlib/libgmptlib.la
 
 # DBus/HALd

Modified: trunk/lib/engine/components/ptlib/Makefile.am
==============================================================================
--- trunk/lib/engine/components/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/components/ptlib/Makefile.am	Sun Nov 23 18:56:11 2008
@@ -9,6 +9,8 @@
 	-I$(top_srcdir)/lib/engine/framework            \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel     \
 	-I$(top_srcdir)/lib/engine/audioinput/skel      \
+	-I$(top_srcdir)/lib/engine/videoinput/skel      \
+	-I$(top_srcdir)/lib/engine/videooutput/skel     \
 	-I$(top_srcdir)/lib/engine/components/ptlib     \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
@@ -17,6 +19,10 @@
 	$(ptlib_dir)/audioinput-manager-ptlib.cpp       \
 	$(ptlib_dir)/audioinput-main-ptlib.h            \
 	$(ptlib_dir)/audioinput-main-ptlib.cpp          \
+	$(ptlib_dir)/videoinput-manager-ptlib.h         \
+	$(ptlib_dir)/videoinput-manager-ptlib.cpp       \
+	$(ptlib_dir)/videoinput-main-ptlib.h            \
+	$(ptlib_dir)/videoinput-main-ptlib.cpp          \
 	$(ptlib_dir)/audiooutput-manager-ptlib.h        \
 	$(ptlib_dir)/audiooutput-manager-ptlib.cpp      \
 	$(ptlib_dir)/audiooutput-main-ptlib.h           \

Modified: trunk/lib/engine/videoinput/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/Makefile.am	Sun Nov 23 18:56:11 2008
@@ -1 +1 @@
-SUBDIRS = skel mlogo ptlib
+SUBDIRS = skel mlogo