GNOME.org
 

gnomemm r1301 - in gstreamermm/trunk: . docs/reference examples examples/ogg_player_gtkmm gstreamer gstreamer/gstmm gstreamer/gstreamermm gstreamer/gstreamermm/private gstreamer/src tests

Author: murrayc
Date: Sat Jan 26 11:01:32 2008
New Revision: 1301
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1301&view=rev

Log:
2008-01-26  Murray Cumming  <murrayc murrayc com>

* Makefile.am:
* autogen.sh:
* configure.ac:
* docs/reference/Doxyfile.in:
* examples/Makefile.am_fragment:
* examples/ogg_player_gtkmm/PlayerWindow.cc:
* examples/ogg_player_gtkmm/PlayerWindow.h:
* examples/ogg_player_gtkmm/main.cc:
* gstreamer/Makefile.am:
* gstreamer/gstmm/
* gstreamer/src/Makefile.am:
* tests/Makefile.am:
Renamed directories and headers from gstmm to 
gstreammermm for more consistency.

Added:
   gstreamermm/trunk/gstreamer/gstreamermm/
      - copied from r1300, /gstreamermm/trunk/gstreamer/gstmm/
Removed:
   gstreamermm/trunk/gstreamer/gstmm/
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/Makefile.am
   gstreamermm/trunk/autogen.sh
   gstreamermm/trunk/configure.ac
   gstreamermm/trunk/docs/reference/Doxyfile.in
   gstreamermm/trunk/examples/Makefile.am_fragment
   gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc
   gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.h
   gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
   gstreamermm/trunk/gstreamer/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm.h
   gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/init.cc
   gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc
   gstreamermm/trunk/gstreamer/gstreamermm/object.cc
   gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc
   gstreamermm/trunk/gstreamer/gstreamermm/wrap.h
   gstreamermm/trunk/gstreamer/src/Makefile.am
   gstreamermm/trunk/tests/Makefile.am

Modified: gstreamermm/trunk/Makefile.am
==============================================================================
--- gstreamermm/trunk/Makefile.am	(original)
+++ gstreamermm/trunk/Makefile.am	Sat Jan 26 11:01:32 2008
@@ -1,5 +1,5 @@
 
-SUBDIRS=tools gst tests @EXAMPLE_SUBDIR@ @DEMO_SUBDIR@ @DOCS_SUBDIR@
+SUBDIRS=tools gstreamer tests @EXAMPLE_SUBDIR@ @DEMO_SUBDIR@ @DOCS_SUBDIR@
 DIST_SUBDIRS=$(SUBDIRS) scripts
 
 EXTRA_DIST= build_shared/Makefile_build.am_fragment \

Modified: gstreamermm/trunk/autogen.sh
==============================================================================
--- gstreamermm/trunk/autogen.sh	(original)
+++ gstreamermm/trunk/autogen.sh	Sat Jan 26 11:01:32 2008
@@ -18,8 +18,8 @@
 PKG_NAME="gstreamermm"
 
 (test -f $srcdir/configure.ac \
-  && test -d $srcdir/gst/src \
-  && test -d $srcdir/gst/gstmm) || {
+  && test -d $srcdir/gstreamer/src \
+  && test -d $srcdir/gstreamer/gstreamermm) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1

Modified: gstreamermm/trunk/configure.ac
==============================================================================
--- gstreamermm/trunk/configure.ac	(original)
+++ gstreamermm/trunk/configure.ac	Sat Jan 26 11:01:32 2008
@@ -19,7 +19,7 @@
 pushdef([GSTMM_EXTRA_VERSION],     [])
 pushdef([GSTMM_VERSION], GSTMM_MAJOR_VERSION.GSTMM_MINOR_VERSION.GSTMM_MICRO_VERSION[]GSTMM_EXTRA_VERSION)
 AC_INIT([gstreamermm], GSTMM_VERSION, [Milosz Derezynski <internalerror gmail com>, Rob Page <page rob gmail com>, Dodji Seketeli <dodji gnome org>])
-AC_CONFIG_SRCDIR([gst/gstmmconfig.h.in])
+AC_CONFIG_SRCDIR([gstreamer/gstmmconfig.h.in])
 AC_PREREQ(2.59)
 
 #########################################################################
@@ -62,7 +62,7 @@
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 dnl Specify a configuration file (no autoheader)
-AM_CONFIG_HEADER(config.h gst/gstmmconfig.h)
+AM_CONFIG_HEADER(config.h gstreamer/gstmmconfig.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -298,11 +298,11 @@
 AC_CONFIG_FILES([
   Makefile
 
-  gst/Makefile
-  gst/gstreamermm-1.0.pc
-    gst/src/Makefile
-    gst/gstmm/Makefile
-      gst/gstmm/private/Makefile
+  gstreamer/Makefile
+  gstreamer/gstreamermm-1.0.pc
+    gstreamer/src/Makefile
+    gstreamer/gstreamermm/Makefile
+      gstreamer/gstreamermm/private/Makefile
 
   tools/Makefile
     tools/generate_gst_wrap_init.pl

Modified: gstreamermm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- gstreamermm/trunk/docs/reference/Doxyfile.in	(original)
+++ gstreamermm/trunk/docs/reference/Doxyfile.in	Sat Jan 26 11:01:32 2008
@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = gstmm
+PROJECT_NAME           = gstreamermm
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -459,7 +459,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/gst/gstmm  @top_srcdir@/docs/reference/reference-index.txt
+INPUT                  = @top_srcdir@/gstreamer/gstreamermm  @top_srcdir@/docs/reference/reference-index.txt
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

Modified: gstreamermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- gstreamermm/trunk/examples/Makefile.am_fragment	(original)
+++ gstreamermm/trunk/examples/Makefile.am_fragment	Sat Jan 26 11:01:32 2008
@@ -1,9 +1,9 @@
-local_gstmm_lib		= $(top_builddir)/gst/gstmm/libgstmm-1.0.la
+local_gstmm_lib		= $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-1.0.la
 
 LIBS  = $(local_gstmm_lib) $(GSTMM_LIBS) $(GSTMM_EXAMPLES_LIBS)
 
 all_includes = \
-		  -I$(top_builddir)/gst		-I$(top_srcdir)/gst	\
+		  -I$(top_builddir)/gstreamer -I$(top_srcdir)/gstreamer \
 		  $(GSTMM_CFLAGS) $(GSTMM_EXAMPLES_CFLAGS)
 
 DEFS = @DEFS@

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc	Sat Jan 26 11:01:32 2008
@@ -19,11 +19,11 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm/filechooserdialog.h>
-#include <gstmm/bus.h>
-#include <gstmm/clock.h>
-#include <gstmm/event.h>
-#include <gstmm/message.h>
-#include <gstmm/query.h>
+#include <gstreamermm/bus.h>
+#include <gstreamermm/clock.h>
+#include <gstreamermm/event.h>
+#include <gstreamermm/message.h>
+#include <gstreamermm/query.h>
 #include <iostream>
 #include <sstream>
 #include <iomanip>

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.h
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.h	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.h	Sat Jan 26 11:01:32 2008
@@ -31,8 +31,8 @@
 #include <gtkmm/label.h>
 #include <gtkmm/button.h>
 #include <gtkmm/scale.h>
-#include <gstmm/element.h>
-#include <gstmm/pipeline.h>
+#include <gstreamermm/element.h>
+#include <gstreamermm/pipeline.h>
 
 class PlayerWindow : public Gtk::Window
 {

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc	Sat Jan 26 11:01:32 2008
@@ -18,10 +18,10 @@
  */
 
 #include <gtkmm/main.h>
-#include <gstmm/init.h>
-#include <gstmm/element.h>
-#include <gstmm/pad.h>
-#include <gstmm/pipeline.h>
+#include <gstreamermm/init.h>
+#include <gstreamermm/element.h>
+#include <gstreamermm/pad.h>
+#include <gstreamermm/pipeline.h>
 #include <iostream>
 #include "PlayerWindow.h"
 

Modified: gstreamermm/trunk/gstreamer/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/Makefile.am	Sat Jan 26 11:01:32 2008
@@ -1,4 +1,4 @@
-SUBDIRS = src gstmm
+SUBDIRS = src gstreamermm
 
 EXTRA_DIST = README gstmmconfig.h.in gstreamermm-1.0.pc.in gstreamermm.h
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h	Sat Jan 26 11:01:32 2008
@@ -1,29 +1,29 @@
 #ifndef _GSTMM_H_
 #define _GSTMM_H_
 
-#include <gstmm/bin.h>
-#include <gstmm/bus.h>
-#include <gstmm/caps.h>
-#include <gstmm/clock.h>
-#include <gstmm/element.h>
-#include <gstmm/enums.h>
-#include <gstmm/error.h>
-#include <gstmm/event.h>
-#include <gstmm/format.h>
-#include <gstmm/iterator.h>
-#include <gstmm/message.h>
-#include <gstmm/object.h>
-#include <gstmm/pad.h>
-#include <gstmm/padtemplate.h>
-#include <gstmm/pipeline.h>
-#include <gstmm/query.h>
-#include <gstmm/structure.h>
-#include <gstmm/systemclock.h>
-#include <gstmm/xml.h>
+#include <gstreamermm/bin.h>
+#include <gstreamermm/bus.h>
+#include <gstreamermm/caps.h>
+#include <gstreamermm/clock.h>
+#include <gstreamermm/element.h>
+#include <gstreamermm/enums.h>
+#include <gstreamermm/error.h>
+#include <gstreamermm/event.h>
+#include <gstreamermm/format.h>
+#include <gstreamermm/iterator.h>
+#include <gstreamermm/message.h>
+#include <gstreamermm/object.h>
+#include <gstreamermm/pad.h>
+#include <gstreamermm/padtemplate.h>
+#include <gstreamermm/pipeline.h>
+#include <gstreamermm/query.h>
+#include <gstreamermm/structure.h>
+#include <gstreamermm/systemclock.h>
+#include <gstreamermm/xml.h>
 
-#include <gstmm/init.h>
-#include <gstmm/version.h>
-#include <gstmm/wrap_init.h>
+#include <gstreamermm/init.h>
+#include <gstreamermm/version.h>
+#include <gstreamermm/wrap_init.h>
 
 #endif // _GSTMM_H
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	Sat Jan 26 11:01:32 2008
@@ -3,17 +3,17 @@
 
 SUBDIRS                 = private
 
-sublib_name             = gstmm
-sublib_libname          = gstmm-1.0
+sublib_name             = gstreamermm
+sublib_libname          = gstreamermm-1.0
 sublib_libversion       = $(LIBGSTMM_SO_VERSION)
 sublib_namespace        = Gst
 sublib_cflags           = $(GSTMM_CFLAGS)
-sublib_topdir           = gst
+sublib_topdir           = gstreamer
 sublib_win32_dlls_libs	=
 
 sublib_files_extra_posix_cc = 
 sublib_files_extra_win32_cc =
-sublib_files_extra_general_cc =  init.cc miniobject.cc object.cc version.cc wrap.cc gst_wrap_init.cc
+sublib_files_extra_general_cc = init.cc miniobject.cc object.cc version.cc wrap.cc gst_wrap_init.cc
 sublib_files_extra_general_deprecated_cc = 
 
 sublib_files_extra_posix_h = 
@@ -23,8 +23,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build.am_fragment
 
-lib_LTLIBRARIES	        = libgstmm-1.0.la
-libgstmm_1_0_la_SOURCES = $(files_built_cc) $(files_extra_cc)
-libgstmm_1_0_la_LDFLAGS = $(common_ldflags)
-libgstmm_1_0_la_LIBADD  = $(GSTMM_LIBS)
+lib_LTLIBRARIES = libgstreamermm-1.0.la
+libgstreamermm_1_0_la_SOURCES = $(files_built_cc) $(files_extra_cc)
+libgstreamermm_1_0_la_LDFLAGS = $(common_ldflags)
+libgstreamermm_1_0_la_LIBADD  = $(GSTMM_LIBS)
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm/init.cc
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/init.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/init.cc	Sat Jan 26 11:01:32 2008
@@ -1,6 +1,6 @@
-#include <gstmm/init.h>
-#include <gstmm/wrap.h>
-#include <gstmm/gst_wrap_init.h>
+#include <gstreamermm/init.h>
+#include <gstreamermm/wrap.h>
+#include <gstreamermm/gst_wrap_init.h>
 #include <gst/gst.h>
 
 namespace Gst

Modified: gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/miniobject.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc	Sat Jan 26 11:01:32 2008
@@ -1,5 +1,5 @@
-#include <gstmm/miniobject.h>
-#include <gstmm/private/miniobject_p.h>
+#include <gstreamermm/miniobject.h>
+#include <gstreamermm/private/miniobject_p.h>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/gstreamermm/object.cc
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/object.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/object.cc	Sat Jan 26 11:01:32 2008
@@ -1,5 +1,5 @@
-#include <gstmm/object.h>
-#include <gstmm/private/object_p.h>
+#include <gstreamermm/object.h>
+#include <gstreamermm/private/object_p.h>
 
 #include <gst/gstobject.h>
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/private/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am	Sat Jan 26 11:01:32 2008
@@ -11,7 +11,7 @@
 dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h)
 DISTFILES = $(DIST_COMMON) $(dist_sources)
 
-private_includedir	= $(includedir)/gstmm-1.0/gstmm/private
+private_includedir	= $(includedir)/gstreamermm-1.0/gstreamermm/private
 private_include_HEADERS	= $(files_built_p_h) $(files_extra_p_h)
 
 maintainer-clean-local:

Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/wrap.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc	Sat Jan 26 11:01:32 2008
@@ -24,8 +24,8 @@
 #include <glib/gmacros.h>
 
 #include <vector>
-#include <gstmm/miniobject.h>
-#include <gstmm/wrap.h>
+#include <gstreamermm/miniobject.h>
+#include <gstreamermm/wrap.h>
 
 #include <glibmmconfig.h>
 GLIBMM_USING_STD(vector)

Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap.h
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstmm/wrap.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap.h	Sat Jan 26 11:01:32 2008
@@ -23,7 +23,7 @@
 
 #include <gst/gstminiobject.h>
 #include <glibmm/refptr.h>
-#include <gstmm/miniobject.h>
+#include <gstreamermm/miniobject.h>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/src/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/src/Makefile.am	Sat Jan 26 11:01:32 2008
@@ -1,9 +1,9 @@
 ## Copyright (c) 2001
 ## The gtkmm development team.
 
-sublib_name = gstmm
+sublib_name = gstreamermm
 sublib_namespace = Gst
-sublib_parentdir = gstmm
+sublib_parentdir = gstreamermm
 files_defs = gst.defs gst_methods.defs gst_signals.defs gst_enums.defs gst_vfuncs.defs gst_others.defs
 
 include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment

Modified: gstreamermm/trunk/tests/Makefile.am
==============================================================================
--- gstreamermm/trunk/tests/Makefile.am	(original)
+++ gstreamermm/trunk/tests/Makefile.am	Sat Jan 26 11:01:32 2008
@@ -1,6 +1,6 @@
-INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gst @GSTMM_CFLAGS@
+INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gstreamer @GSTMM_CFLAGS@
 
-LDADD=$(top_builddir)/gst/gstmm/libgstmm-1.0.la
+LDADD=$(top_builddir)/gstreamer/gstreamermm/libgstreamermm-1.0.la
 
 noinst_PROGRAMS = test-create-element test-pipeline-add-element \
                   test-link-elements test-create-bin test-miniobject-wrap \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]