GNOME.org
 

ekiga r6271 - in trunk: . lib/engine lib/engine/display lib/engine/videoinput lib/engine/videoinput/mlogo lib/engine/videoinput/ptlib lib/engine/videoinput/skel lib/engine/videooutput lib/engine/videooutput/dx lib/engine/videooutput/skel lib/engine/videooutput/x lib/engine/vidinput src

Author: mschneid
Date: Sun May 18 17:02:58 2008
New Revision: 6271
URL: http://svn.gnome.org/viewvc/ekiga?rev=6271&view=rev

Log:
Start renaming video cores.


Added:
   trunk/lib/engine/videoinput/
      - copied from r6269, /trunk/lib/engine/vidinput/
   trunk/lib/engine/videooutput/
      - copied from r6269, /trunk/lib/engine/display/
Removed:
   trunk/lib/engine/display/
   trunk/lib/engine/vidinput/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   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/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun May 18 17:02:58 2008
@@ -613,14 +613,14 @@
 lib/engine/presence/skel/Makefile
 lib/engine/protocol/Makefile
 lib/engine/protocol/skel/Makefile
-lib/engine/display/Makefile
-lib/engine/display/skel/Makefile
-lib/engine/display/x/Makefile
-lib/engine/display/dx/Makefile
-lib/engine/vidinput/Makefile
-lib/engine/vidinput/skel/Makefile
-lib/engine/vidinput/mlogo/Makefile
-lib/engine/vidinput/ptlib/Makefile
+lib/engine/videooutput/Makefile
+lib/engine/videooutput/skel/Makefile
+lib/engine/videooutput/x/Makefile
+lib/engine/videooutput/dx/Makefile
+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 May 18 17:02:58 2008
@@ -1,4 +1,4 @@
-SUBDIRS = framework addressbook presence gui protocol display vidinput audioinput audiooutput hal components
+SUBDIRS = framework addressbook presence gui protocol videooutput videoinput audioinput audiooutput hal components
 
 noinst_LTLIBRARIES = libekiga_engine.la
 
@@ -16,8 +16,8 @@
 	-I$(top_srcdir)/lib/engine/presence/skel			\
 	-I$(top_srcdir)/lib/engine/presence/avahi			\
 	-I$(top_srcdir)/lib/engine/presence/local-roster		\
-	-I$(top_srcdir)/lib/engine/display/skel				\
-	-I$(top_srcdir)/lib/engine/vidinput/skel			\
+	-I$(top_srcdir)/lib/engine/videooutput/skel				\
+	-I$(top_srcdir)/lib/engine/videoinput/skel			\
 	-I$(top_srcdir)/lib/engine/audioinput/skel			\
 	-I$(top_srcdir)/lib/engine/audiooutput/skel			\
 	-I$(top_srcdir)/lib/engine/hal/skel				\
@@ -27,26 +27,26 @@
 # XVideo/X
 if !WIN32
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/display/common       \
-	-I$(top_srcdir)/lib/engine/display/x
+	-I$(top_srcdir)/lib/engine/videooutput/common   \
+	-I$(top_srcdir)/lib/engine/videooutput/x
 endif
 
 # DirectX
 if HAVE_DX
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/display/common       \
-	-I$(top_srcdir)/lib/engine/display/dx
+	-I$(top_srcdir)/lib/engine/videooutput/common   \
+	-I$(top_srcdir)/lib/engine/videooutput/dx
 endif
 		
 # Default Input Devices
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/vidinput/mlogo	\
+	-I$(top_srcdir)/lib/engine/videoinput/mlogo	\
 	-I$(top_srcdir)/lib/engine/audioinput/null      \
 	-I$(top_srcdir)/lib/engine/audiooutput/null
 
 # Default PTLIB Input Devices
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/vidinput/ptlib       \
+	-I$(top_srcdir)/lib/engine/videoinput/ptlib     \
 	-I$(top_srcdir)/lib/engine/audioinput/ptlib     \
 	-I$(top_srcdir)/lib/engine/audiooutput/ptlib
 
@@ -71,8 +71,8 @@
 	$(top_builddir)/lib/engine/addressbook/call-history/libcall-history.la 				\
 	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la 					\
 	$(top_builddir)/lib/engine/presence/local-roster/liblocal-roster.la 				\
-	$(top_builddir)/lib/engine/display/skel/libgmdisplay.la						\
-	$(top_builddir)/lib/engine/vidinput/skel/libgmvidinput.la					\
+	$(top_builddir)/lib/engine/videooutput/skel/libgmvideooutput.la					\
+	$(top_builddir)/lib/engine/videoinput/skel/libgmvideoinput.la					\
 	$(top_builddir)/lib/engine/audioinput/skel/libgmaudioinput.la					\
 	$(top_builddir)/lib/engine/audiooutput/skel/libgmaudiooutput.la					\
 	$(top_builddir)/lib/engine/hal/skel/libgmhal.la							\
@@ -81,13 +81,13 @@
 
 # Default Input Devices
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/vidinput/mlogo/libgmvidinput-mlogo.la \
+	$(top_builddir)/lib/engine/videoinput/mlogo/libgmvideoinput-mlogo.la \
 	$(top_builddir)/lib/engine/audioinput/null/libgmaudioinput-null.la \
 	$(top_builddir)/lib/engine/audiooutput/null/libgmaudiooutput-null.la
 
 # PTLIB Input Devices
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/vidinput/ptlib/libgmvidinput-ptlib.la \
+	$(top_builddir)/lib/engine/videoinput/ptlib/libgmvideoinput-ptlib.la \
 	$(top_builddir)/lib/engine/audioinput/ptlib/libgmaudioinput-ptlib.la \
 	$(top_builddir)/lib/engine/audiooutput/ptlib/libgmaudiooutput-ptlib.la
 
@@ -100,14 +100,14 @@
 # XVideo/X
 if !WIN32
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/display/x/libgmdisplay-x.la \
+	$(top_builddir)/lib/engine/videooutput/x/libgmvideooutput-x.la \
 	$(top_builddir)/lib/pixops/libpixops.la
 endif
 
 # DirectX
 if HAVE_DX
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/display/dx/libgmdisplay-dx.la
+	$(top_builddir)/lib/engine/videooutput/dx/libgmvideooutput-dx.la
 endif
 
 

Modified: trunk/lib/engine/videoinput/mlogo/Makefile.am
==============================================================================
--- /trunk/lib/engine/vidinput/mlogo/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/mlogo/Makefile.am	Sun May 18 17:02:58 2008
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libgmvidinput-mlogo.la
+noinst_LTLIBRARIES = libgmvideoinput-mlogo.la
 
-vidinput_dir = $(top_srcdir)/lib/engine/vidinput/mlogo
+videoinput_dir = $(top_srcdir)/lib/engine/videoinput/mlogo
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
@@ -9,15 +9,15 @@
 	-I$(top_srcdir)/pixmaps \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/display/skel \
-	-I$(top_srcdir)/lib/engine/vidinput/skel \
-	-I$(top_srcdir)/lib/engine/vidinput/mlogo \
+	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput/mlogo \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
-libgmvidinput_mlogo_la_SOURCES = \
-	$(vidinput_dir)/vidinput-manager-mlogo.h \
-	$(vidinput_dir)/vidinput-manager-mlogo.cpp \
-	$(vidinput_dir)/vidinput-main-mlogo.h \
-	$(vidinput_dir)/vidinput-main-mlogo.cpp 
+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 
 
-libgmvidinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideoinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/videoinput/ptlib/Makefile.am
==============================================================================
--- /trunk/lib/engine/vidinput/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/ptlib/Makefile.am	Sun May 18 17:02:58 2008
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libgmvidinput-ptlib.la
+noinst_LTLIBRARIES = libgmvideoinput-ptlib.la
 
-vidinput_dir = $(top_srcdir)/lib/engine/vidinput/ptlib
+videoinput_dir = $(top_srcdir)/lib/engine/videoinput/ptlib
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
@@ -8,15 +8,15 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/display/skel \
-	-I$(top_srcdir)/lib/engine/vidinput/skel \
-	-I$(top_srcdir)/lib/engine/vidinput/ptlib \
+	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput/ptlib \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
-libgmvidinput_ptlib_la_SOURCES = \
-	$(vidinput_dir)/vidinput-manager-ptlib.h \
-	$(vidinput_dir)/vidinput-manager-ptlib.cpp \
-	$(vidinput_dir)/vidinput-main-ptlib.h \
-	$(vidinput_dir)/vidinput-main-ptlib.cpp 
+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 
 
-libgmvidinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideoinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/videoinput/skel/Makefile.am
==============================================================================
--- /trunk/lib/engine/vidinput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/skel/Makefile.am	Sun May 18 17:02:58 2008
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libgmvidinput.la
+noinst_LTLIBRARIES = libgmvideoinput.la
 
-vidinput_dir = $(top_srcdir)/lib/engine/vidinput/skel
+videoinput_dir = $(top_srcdir)/lib/engine/videoinput/skel
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
@@ -8,16 +8,16 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/display/skel \
-	-I$(top_srcdir)/lib/engine/vidinput/skel \
+	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput/skel \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
-libgmvidinput_la_SOURCES = \
-	$(vidinput_dir)/vidinput-manager.h	\
-	$(vidinput_dir)/vidinput-info.h		\
-	$(vidinput_dir)/vidinput-core.h		\
-	$(vidinput_dir)/vidinput-core.cpp       \
-	$(vidinput_dir)/vidinput-gmconf-bridge.h \
-	$(vidinput_dir)/vidinput-gmconf-bridge.cpp
+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
 
-libgmvidinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideoinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/videooutput/dx/Makefile.am
==============================================================================
--- /trunk/lib/engine/display/dx/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/dx/Makefile.am	Sun May 18 17:02:58 2008
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libgmdisplay-dx.la
+noinst_LTLIBRARIES = libgmvideooutput-dx.la
 
-display_dir = $(top_srcdir)/lib/engine/display/dx
-common_dir = $(top_srcdir)/lib/engine/display/common
+videooutput_dir = $(top_srcdir)/lib/engine/videooutput/dx
+common_dir = $(top_srcdir)/lib/engine/videooutput/common
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(DX_CFLAGS) $(GLIB_CFLAGS)
 
@@ -9,16 +9,16 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/display/skel \
-	-I$(top_srcdir)/lib/engine/display/common \
+	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videooutput/common \
 	-I$(top_srcdir)/lib/gui
 
-libgmdisplay_dx_la_SOURCES = \
+libgmvideooutput_dx_la_SOURCES = \
 	$(common_dir)/display-manager-common.cpp\
 	$(common_dir)/display-manager-common.h  \
-	$(display_dir)/display-manager-dx.cpp    \
-	$(display_dir)/display-manager-dx.h      \
-	$(display_dir)/display-main-dx.cpp    \
-	$(display_dir)/display-main-dx.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
 
-libgmdisplay_dx_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS) $(GLIB_LIBS)
+libgmvideooutput_dx_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/videooutput/skel/Makefile.am
==============================================================================
--- /trunk/lib/engine/display/skel/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/skel/Makefile.am	Sun May 18 17:02:58 2008
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libgmdisplay.la
+noinst_LTLIBRARIES = libgmvideooutput.la
 
-display_dir = $(top_srcdir)/lib/engine/display/skel
+videooutput_dir = $(top_srcdir)/lib/engine/videooutput/skel
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
@@ -8,13 +8,13 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/display/skel
+	-I$(top_srcdir)/lib/engine/videooutput/skel
 
-libgmdisplay_la_SOURCES = \
-	$(display_dir)/display-manager.h	\
-	$(display_dir)/display-core.h		\
-	$(display_dir)/display-core.cpp         \
-	$(display_dir)/display-gmconf-bridge.h  \
-	$(display_dir)/display-gmconf-bridge.cpp
+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
 
-libgmdisplay_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/videooutput/x/Makefile.am
==============================================================================
--- /trunk/lib/engine/display/x/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/x/Makefile.am	Sun May 18 17:02:58 2008
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libgmdisplay-x.la
+noinst_LTLIBRARIES = libgmvideooutput-x.la
 
-display_dir = $(top_srcdir)/lib/engine/display/x
-common_dir = $(top_srcdir)/lib/engine/display/common
+videooutput_dir = $(top_srcdir)/lib/engine/videooutput/x
+common_dir = $(top_srcdir)/lib/engine/videooutput/common
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(GLIB_CFLAGS) $(XV_CFLAGS)
 
@@ -9,16 +9,16 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/display/skel \
-	-I$(top_srcdir)/lib/engine/display/common \
+	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videooutput/common \
 	-I$(top_srcdir)/lib/gui
 
-libgmdisplay_x_la_SOURCES = \
-	$(common_dir)/display-manager-common.cpp\
-	$(common_dir)/display-manager-common.h  \
-	$(display_dir)/display-manager-x.cpp    \
-	$(display_dir)/display-manager-x.h      \
-	$(display_dir)/display-main-x.cpp    \
-	$(display_dir)/display-main-x.h
+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
 
-libgmdisplay_x_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(GLIB_LIBS) $(XV_LIBS)
+libgmvideooutput_x_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(GLIB_LIBS) $(XV_LIBS)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun May 18 17:02:58 2008
@@ -14,8 +14,8 @@
 	-I$(top_srcdir)/lib/engine/presence/skel	\
 	-I$(top_srcdir)/lib/engine/protocol/skel	\
 	-I$(top_srcdir)/lib/engine/protocol/sip		\
-	-I$(top_srcdir)/lib/engine/display/skel		\
-	-I$(top_srcdir)/lib/engine/vidinput/skel	\
+	-I$(top_srcdir)/lib/engine/videooutput/skel	\
+	-I$(top_srcdir)/lib/engine/videoinput/skel	\
 	-I$(top_srcdir)/lib/engine/audioinput/skel	\
 	-I$(top_srcdir)/lib/engine/audiooutput/skel	\
 	-I$(top_srcdir)/lib/engine/hal/skel	\
@@ -27,15 +27,15 @@
 # XVideo/X
 if !WIN32
 INCLUDES +=                   				\
-	-I$(top_srcdir)/lib/engine/display/common       \
-	-I$(top_srcdir)/lib/engine/display/x
+	-I$(top_srcdir)/lib/engine/videooutput/common   \
+	-I$(top_srcdir)/lib/engine/videooutput/x
 endif
 
 # DirectX
 if HAVE_DX
 INCLUDES +=                   				\
-	-I$(top_srcdir)/lib/engine/display/common       \
-	-I$(top_srcdir)/lib/engine/display/dx
+	-I$(top_srcdir)/lib/engine/videooutput/common   \
+	-I$(top_srcdir)/lib/engine/videooutput/dx
 endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]