gnomemm r1317 - in gstreamermm/trunk: . docs/reference examples gstreamer gstreamer/gstreamermm gstreamer/gstreamermm/private tests tools/extra_defs_gen
- From: jaalburqu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1317 - in gstreamermm/trunk: . docs/reference examples gstreamer gstreamer/gstreamermm gstreamer/gstreamermm/private tests tools/extra_defs_gen
- Date: Tue, 5 Feb 2008 05:22:31 +0000 (GMT)
Author: jaalburqu
Date: Tue Feb 5 05:22:30 2008
New Revision: 1317
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1317&view=rev
Log:
2008-02-05 Josà Alburquerque <jaalburqu svn gnome org>
* configure.ac:
* docs/reference/Doxyfile.in:
* examples/Makefile.am_fragment:
* gstreamer/Makefile.am:
* gstreamer/gstmmconfig.h.in:
* gstreamer/gstreamermm.h:
* gstreamer/gstreamermm/Makefile.am:
* gstreamer/gstreamermm/gst_wrap_init.h:
* gstreamer/gstreamermm/init.h:
* gstreamer/gstreamermm/miniobject.h:
* gstreamer/gstreamermm/object.h:
* gstreamer/gstreamermm/private/miniobject_p.h:
* gstreamer/gstreamermm/private/object_p.h:
* gstreamer/gstreamermm/version.cc:
* gstreamer/gstreamermm/version.h:
* gstreamer/gstreamermm/wrap.h:
* gstreamer/gstreamermm/wrap_init.h:
* gstreamer/gstreamermmconfig.h.in:
* tests/Makefile.am:
* tools/extra_defs_gen/Makefile.am: Final rename from gstmm to
gstreamermm
Added:
gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in
Removed:
gstreamermm/trunk/gstreamer/gstmmconfig.h.in
Modified:
gstreamermm/trunk/ChangeLog
gstreamermm/trunk/configure.ac
gstreamermm/trunk/docs/reference/Doxyfile.in
gstreamermm/trunk/examples/Makefile.am_fragment
gstreamermm/trunk/gstreamer/Makefile.am
gstreamermm/trunk/gstreamer/gstreamermm.h
gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h
gstreamermm/trunk/gstreamer/gstreamermm/init.h
gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h
gstreamermm/trunk/gstreamer/gstreamermm/object.h
gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h
gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h
gstreamermm/trunk/gstreamer/gstreamermm/version.cc
gstreamermm/trunk/gstreamer/gstreamermm/version.h
gstreamermm/trunk/gstreamer/gstreamermm/wrap.h
gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h
gstreamermm/trunk/tests/Makefile.am
gstreamermm/trunk/tools/extra_defs_gen/Makefile.am
Modified: gstreamermm/trunk/configure.ac
==============================================================================
--- gstreamermm/trunk/configure.ac (original)
+++ gstreamermm/trunk/configure.ac Tue Feb 5 05:22:30 2008
@@ -13,37 +13,37 @@
#
#We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
-pushdef([GSTMM_MAJOR_VERSION], [0])
-pushdef([GSTMM_MINOR_VERSION], [9])
-pushdef([GSTMM_MICRO_VERSION], [2])
-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([gstreamer/gstmmconfig.h.in])
+pushdef([GSTREAMERMM_MAJOR_VERSION], [0])
+pushdef([GSTREAMERMM_MINOR_VERSION], [9])
+pushdef([GSTREAMERMM_MICRO_VERSION], [2])
+pushdef([GSTREAMERMM_EXTRA_VERSION], [])
+pushdef([GSTREAMERMM_VERSION], GSTREAMERMM_MAJOR_VERSION.GSTREAMERMM_MINOR_VERSION.GSTREAMERMM_MICRO_VERSION[]GSTREAMERMM_EXTRA_VERSION)
+AC_INIT([gstreamermm], GSTREAMERMM_VERSION, [Milosz Derezynski <internalerror gmail com>, Rob Page <page rob gmail com>, Dodji Seketeli <dodji gnome org>])
+AC_CONFIG_SRCDIR([gstreamer/gstreamermmconfig.h.in])
AC_PREREQ(2.59)
#########################################################################
# Version and initialization
#########################################################################
-[GSTMM_MAJOR_VERSION]=GSTMM_MAJOR_VERSION
-[GSTMM_MINOR_VERSION]=GSTMM_MINOR_VERSION
-[GSTMM_MICRO_VERSION]=GSTMM_MICRO_VERSION
-[GSTMM_EXTRA_VERSION]=GSTMM_EXTRA_VERSION
-[GSTMM_VERSION]=GSTMM_VERSION
-popdef([GSTMM_MAJOR_VERSION])
-popdef([GSTMM_MINOR_VERSION])
-popdef([GSTMM_MICRO_VERSION])
-popdef([GSTMM_EXTRA_VERSION])
-popdef([GSTMM_VERSION])
-GSTMM_RELEASE=$GSTMM_MAJOR_VERSION.$GSTMM_MINOR_VERSION
-AC_DEFINE_UNQUOTED(GSTMM_MAJOR_VERSION, $GSTMM_MAJOR_VERSION, [Major version of gstreamermm])
-AC_DEFINE_UNQUOTED(GSTMM_MINOR_VERSION, $GSTMM_MINOR_VERSION, [Minor version of gstreamermm])
-AC_DEFINE_UNQUOTED(GSTMM_MICRO_VERSION, $GSTMM_MICRO_VERSION, [Micro version of gstreamermm])
-AC_SUBST(GSTMM_MAJOR_VERSION)
-AC_SUBST(GSTMM_MINOR_VERSION)
-AC_SUBST(GSTMM_MICRO_VERSION)
-AC_SUBST(GSTMM_VERSION)
-AC_SUBST(GSTMM_RELEASE)
+[GSTREAMERMM_MAJOR_VERSION]=GSTREAMERMM_MAJOR_VERSION
+[GSTREAMERMM_MINOR_VERSION]=GSTREAMERMM_MINOR_VERSION
+[GSTREAMERMM_MICRO_VERSION]=GSTREAMERMM_MICRO_VERSION
+[GSTREAMERMM_EXTRA_VERSION]=GSTREAMERMM_EXTRA_VERSION
+[GSTREAMERMM_VERSION]=GSTREAMERMM_VERSION
+popdef([GSTREAMERMM_MAJOR_VERSION])
+popdef([GSTREAMERMM_MINOR_VERSION])
+popdef([GSTREAMERMM_MICRO_VERSION])
+popdef([GSTREAMERMM_EXTRA_VERSION])
+popdef([GSTREAMERMM_VERSION])
+GSTREAMERMM_RELEASE=$GSTREAMERMM_MAJOR_VERSION.$GSTREAMERMM_MINOR_VERSION
+AC_DEFINE_UNQUOTED(GSTREAMERMM_MAJOR_VERSION, $GSTREAMERMM_MAJOR_VERSION, [Major version of gstreamermm])
+AC_DEFINE_UNQUOTED(GSTREAMERMM_MINOR_VERSION, $GSTREAMERMM_MINOR_VERSION, [Minor version of gstreamermm])
+AC_DEFINE_UNQUOTED(GSTREAMERMM_MICRO_VERSION, $GSTREAMERMM_MICRO_VERSION, [Micro version of gstreamermm])
+AC_SUBST(GSTREAMERMM_MAJOR_VERSION)
+AC_SUBST(GSTREAMERMM_MINOR_VERSION)
+AC_SUBST(GSTREAMERMM_MICRO_VERSION)
+AC_SUBST(GSTREAMERMM_VERSION)
+AC_SUBST(GSTREAMERMM_RELEASE)
#
# +1 : ? : +1 == new interface that does not break old one
@@ -52,8 +52,8 @@
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LIBGSTMM_SO_VERSION=2:1:0
-AC_SUBST(LIBGSTMM_SO_VERSION)
+LIBGSTREAMERMM_SO_VERSION=2:1:0
+AC_SUBST(LIBGSTREAMERMM_SO_VERSION)
AC_CONFIG_AUX_DIR(scripts)
@@ -62,7 +62,7 @@
AM_INIT_AUTOMAKE([1.9 tar-ustar])
dnl Specify a configuration file (no autoheader)
-AM_CONFIG_HEADER(config.h gstreamer/gstmmconfig.h)
+AM_CONFIG_HEADER(config.h gstreamer/gstreamermmconfig.h)
AM_MAINTAINER_MODE
AL_ACLOCAL_INCLUDE(scripts)
@@ -126,9 +126,9 @@
gstreamermm_min_gtkmm_version=2.10
gstreamermm_min_gst_version=0.10
-PKG_CHECK_MODULES(GSTMM, glibmm-2.4 >= ${gstreamermm_min_glibmm_version} gstreamer-0.10 >= ${gstreamermm_min_gst_version})
-AC_SUBST(GSTMM_CFLAGS)
-AC_SUBST(GSTMM_LIBS)
+PKG_CHECK_MODULES(GSTREAMERMM, glibmm-2.4 >= ${gstreamermm_min_glibmm_version} gstreamer-0.10 >= ${gstreamermm_min_gst_version})
+AC_SUBST(GSTREAMERMM_CFLAGS)
+AC_SUBST(GSTREAMERMM_LIBS)
# This macro is installed by glibmm
# Doxygen needs the path to the installed perl.
@@ -188,10 +188,10 @@
# Create a list of input directories for Doxygen.
-#GSTMM_DOXYGEN_INPUT_SUBDIRS([gst])
+#GSTREAMERMM_DOXYGEN_INPUT_SUBDIRS([gst])
# Evaluate the --enable-warnings=level option.
-GSTMM_ARG_ENABLE_WARNINGS()
+GSTREAMERMM_ARG_ENABLE_WARNINGS()
# Add an --enable-use-deprecations configure option:
AC_ARG_ENABLE(deprecations,
@@ -228,9 +228,9 @@
if test "x$enable_examples" = "xyes"; then
#Extra dependencies needed for the examples. Use --enable-examples=no to build the library without this.
-PKG_CHECK_MODULES(GSTMM_EXAMPLES, gtkmm-2.4 >= ${gstreamermm_min_gtkmm_version})
-AC_SUBST(GSTMM_EXAMPLES_CFLAGS)
-AC_SUBST(GSTMM_EXAMPLES_LIBS)
+PKG_CHECK_MODULES(GSTREAMERMM_EXAMPLES, gtkmm-2.4 >= ${gstreamermm_min_gtkmm_version})
+AC_SUBST(GSTREAMERMM_EXAMPLES_CFLAGS)
+AC_SUBST(GSTREAMERMM_EXAMPLES_LIBS)
EXAMPLE_SUBDIR="examples"
AC_CONFIG_FILES([
@@ -288,7 +288,7 @@
# Dummy conditional just to make automake-1.4 happy.
# We need an always-false condition in docs/Makefile.am.
-AM_CONDITIONAL(GSTMM_FALSE,[false])
+AM_CONDITIONAL(GSTREAMERMM_FALSE,[false])
# HACK: Assign a dummy in order to prevent execution of autoheader by the
# maintainer-mode rules. That would fail since we aren't using autoheader.
Modified: gstreamermm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- gstreamermm/trunk/docs/reference/Doxyfile.in (original)
+++ gstreamermm/trunk/docs/reference/Doxyfile.in Tue Feb 5 05:22:30 2008
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = @GSTMM_VERSION@
+PROJECT_NUMBER = @GSTREAMERMM_VERSION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Modified: gstreamermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- gstreamermm/trunk/examples/Makefile.am_fragment (original)
+++ gstreamermm/trunk/examples/Makefile.am_fragment Tue Feb 5 05:22:30 2008
@@ -1,26 +1,26 @@
-local_gstmm_lib = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la
+local_gstreamermm_lib = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la
-LIBS = $(local_gstmm_lib) $(GSTMM_LIBS) $(GSTMM_EXAMPLES_LIBS)
+LIBS = $(local_gstreamermm_lib) $(GSTREAMERMM_LIBS) $(GSTREAMERMM_EXAMPLES_LIBS)
all_includes = \
-I$(top_builddir)/gstreamer -I$(top_srcdir)/gstreamer \
- $(GSTMM_CFLAGS) $(GSTMM_EXAMPLES_CFLAGS)
+ $(GSTREAMERMM_CFLAGS) $(GSTREAMERMM_EXAMPLES_CFLAGS)
DEFS = @DEFS@
DEFAULT_INCLUDES =
INCLUDES = -I. -I$(srcdir) $(strip $(all_includes))
-gstmm_docdir = $(datadir)/doc/gstreamermm-0.10
+gstreamermm_docdir = $(datadir)/doc/gstreamermm-0.10
install-example-src:
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(gstmm_docdir)/$(subdir)
+ $(mkinstalldirs) $(DESTDIR)$(gstreamermm_docdir)/$(subdir)
for p in $(srcdir)/*.cc $(srcdir)/*.h; do \
if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gstmm_docdir)/$(subdir)/$$f"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(gstmm_docdir)/$(subdir)/$$f; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gstreamermm_docdir)/$(subdir)/$$f"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(gstreamermm_docdir)/$(subdir)/$$f; \
fi; \
done
@@ -29,8 +29,8 @@
for p in $(srcdir)/*.cc $(srcdir)/*.h; do \
if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(gstmm_docdir)/$(subdir)/$$f"; \
- rm -f $(DESTDIR)$(gstmm_docdir)/$(subdir)/$$f; \
+ echo " rm -f $(DESTDIR)$(gstreamermm_docdir)/$(subdir)/$$f"; \
+ rm -f $(DESTDIR)$(gstreamermm_docdir)/$(subdir)/$$f; \
fi; \
done
Modified: gstreamermm/trunk/gstreamer/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/Makefile.am (original)
+++ gstreamermm/trunk/gstreamer/Makefile.am Tue Feb 5 05:22:30 2008
@@ -1,12 +1,12 @@
SUBDIRS = src gstreamermm
-EXTRA_DIST = README gstmmconfig.h.in gstreamermm-0.10.pc.in gstreamermm.h
+EXTRA_DIST = README gstreamermmconfig.h.in gstreamermm-0.10.pc.in gstreamermm.h
gstreamermm_includedir = $(includedir)/gstreamermm-0.10
gstreamermm_include_DATA = gstreamermm.h
gstreamermm_configdir = $(libdir)/gstreamermm-0.10/include
-gstreamermm_config_DATA = gstmmconfig.h
+gstreamermm_config_DATA = gstreamermmconfig.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gstreamermm-0.10.pc
Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h Tue Feb 5 05:22:30 2008
@@ -1,5 +1,5 @@
-#ifndef _GSTMM_H_
-#define _GSTMM_H_
+#ifndef _GSTREAMERMM_H_
+#define _GSTREAMERMM_H_
#include <gstreamermm/bin.h>
#include <gstreamermm/bus.h>
@@ -25,5 +25,5 @@
#include <gstreamermm/version.h>
#include <gstreamermm/wrap_init.h>
-#endif // _GSTMM_H
+#endif // _GSTREAMERMM_H
Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am Tue Feb 5 05:22:30 2008
@@ -5,9 +5,9 @@
sublib_name = gstreamermm
sublib_libname = gstreamermm-0.10
-sublib_libversion = $(LIBGSTMM_SO_VERSION)
+sublib_libversion = $(LIBGSTREAMERMM_SO_VERSION)
sublib_namespace = Gst
-sublib_cflags = $(GSTMM_CFLAGS)
+sublib_cflags = $(GSTREAMERMM_CFLAGS)
sublib_topdir = gstreamer
sublib_win32_dlls_libs =
@@ -26,5 +26,5 @@
lib_LTLIBRARIES = libgstreamermm-0.10.la
libgstreamermm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
libgstreamermm_0_10_la_LDFLAGS = $(common_ldflags)
-libgstreamermm_0_10_la_LIBADD = $(GSTMM_LIBS)
+libgstreamermm_0_10_la_LIBADD = $(GSTREAMERMM_LIBS)
Modified: gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h Tue Feb 5 05:22:30 2008
@@ -1,6 +1,6 @@
// -*- c++ -*-
-#ifndef _GSTMM_GST_WRAP_INIT_H
-#define _GSTMM_GST_WRAP_INIT_H
+#ifndef _GSTREAMERMM_GST_WRAP_INIT_H
+#define _GSTREAMERMM_GST_WRAP_INIT_H
// gst_wrap_init.cc is generated by tools/generate_gst_wrap_init.pl
@@ -11,6 +11,6 @@
void gst_wrap_init();
}
-#endif //_GSTMM_GST_WRAP_INIT_H
+#endif //_GSTREAMERMM_GST_WRAP_INIT_H
Modified: gstreamermm/trunk/gstreamer/gstreamermm/init.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/init.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/init.h Tue Feb 5 05:22:30 2008
@@ -1,6 +1,6 @@
// -*- c++ -*-
-#ifndef _GSTMM_INIT_H
-#define _GSTMM_INIT_H
+#ifndef _GSTREAMERMM_INIT_H
+#define _GSTREAMERMM_INIT_H
#include "wrap_init.h"
#include <string.h>
@@ -14,5 +14,5 @@
}//end namespace Gst
-#endif //_GSTMM_INIT_H
+#endif //_GSTREAMERMM_INIT_H
Modified: gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h Tue Feb 5 05:22:30 2008
@@ -1,5 +1,5 @@
-#ifndef _GSTMM_MINIOBJECT_H
-#define _GSTMM_MINIOBJECT_H
+#ifndef _GSTREAMERMM_MINIOBJECT_H
+#define _GSTREAMERMM_MINIOBJECT_H
#include <glibmm/objectbase.h>
#include <gst/gstminiobject.h>
@@ -71,5 +71,5 @@
} //namespace Glib
*/
-#endif //#ifndef _GSTMM_MINIOBJECT_H
+#endif //#ifndef _GSTREAMERMM_MINIOBJECT_H
Modified: gstreamermm/trunk/gstreamer/gstreamermm/object.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/object.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/object.h Tue Feb 5 05:22:30 2008
@@ -1,5 +1,5 @@
-#ifndef _GSTMM_OBJECT_H
-#define _GSTMM_OBJECT_H
+#ifndef _GSTREAMERMM_OBJECT_H
+#define _GSTREAMERMM_OBJECT_H
#include <glibmm.h>
@@ -136,5 +136,5 @@
}
-#endif /* _GSTMM_OBJECT_H */
+#endif /* _GSTREAMERMM_OBJECT_H */
Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h Tue Feb 5 05:22:30 2008
@@ -1,5 +1,5 @@
-#ifndef _GSTMM_MINIOBJECT_P_H
-#define _GSTMM_MINIOBJECT_P_H
+#ifndef _GSTREAMERMM_MINIOBJECT_P_H
+#define _GSTREAMERMM_MINIOBJECT_P_H
#include <glibmm/class.h>
@@ -26,5 +26,5 @@
} // namespace Gst
-#endif /* _GSTMM_MINIOBJECT_P_H */
+#endif /* _GSTREAMERMM_MINIOBJECT_P_H */
Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h Tue Feb 5 05:22:30 2008
@@ -1,5 +1,5 @@
-#ifndef _GSTMM_OBJECT_P_H
-#define _GSTMM_OBJECT_P_H
+#ifndef _GSTREAMERMM_OBJECT_P_H
+#define _GSTREAMERMM_OBJECT_P_H
#include <glibmm/private/object_p.h>
@@ -33,5 +33,5 @@
} // namespace Gst
-#endif /* _GSTMM_OBJECT_P_H */
+#endif /* _GSTREAMERMM_OBJECT_P_H */
Modified: gstreamermm/trunk/gstreamer/gstreamermm/version.cc
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/version.cc (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/version.cc Tue Feb 5 05:22:30 2008
@@ -1,14 +1,14 @@
#include "version.h"
-#include <gstmmconfig.h>
+#include <gstreamermmconfig.h>
namespace Gst
{
void version(guint& major, guint& minor, guint& micro)
{
- major = GSTMM_MAJOR_VERSION;
- minor = GSTMM_MINOR_VERSION;
- micro = GSTMM_MICRO_VERSION;
+ major = GSTREAMERMM_MAJOR_VERSION;
+ minor = GSTREAMERMM_MINOR_VERSION;
+ micro = GSTREAMERMM_MICRO_VERSION;
}
}//end namespace Gst
Modified: gstreamermm/trunk/gstreamer/gstreamermm/version.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/version.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/version.h Tue Feb 5 05:22:30 2008
@@ -1,5 +1,5 @@
-#ifndef _GSTMM_VERSION_H
-#define _GSTMM_VERSION_H
+#ifndef _GSTREAMERMM_VERSION_H
+#define _GSTREAMERMM_VERSION_H
#include <glib.h>
@@ -8,5 +8,5 @@
void version(guint& major, guint& minor, guint& micro);
}//end namespace Gst
-#endif //_GSTMM_VERSION_H
+#endif //_GSTREAMERMM_VERSION_H
Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/wrap.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap.h Tue Feb 5 05:22:30 2008
@@ -1,6 +1,6 @@
// -*- c++ -*-
-#ifndef _GSTMM_WRAP_H
-#define _GSTMM_WRAP_H
+#ifndef _GSTREAMERMM_WRAP_H
+#define _GSTREAMERMM_WRAP_H
/* $Id: wrap.h 447 2007-10-03 09:51:41Z murrayc $ */
@@ -162,5 +162,5 @@
} // namespace Gst
-#endif /* _GSTMM_WRAP_H */
+#endif /* _GSTREAMERMM_WRAP_H */
Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h Tue Feb 5 05:22:30 2008
@@ -1,6 +1,6 @@
// -*- c++ -*-
-#ifndef _GSTMM_WRAP_INIT_H
-#define _GSTMM_WRAP_INIT_H
+#ifndef _GSTREAMERMM_WRAP_INIT_H
+#define _GSTREAMERMM_WRAP_INIT_H
// wrap_init.cc is generated by tools/generate_wrap_init.pl
@@ -11,6 +11,6 @@
void wrap_init();
}
-#endif //_GSTMM_WRAP_INIT_H
+#endif //_GSTREAMERMM_WRAP_INIT_H
Added: gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in Tue Feb 5 05:22:30 2008
@@ -0,0 +1,84 @@
+#ifndef _GSTREAMERMM_CONFIG_H
+#define _GSTREAMERMM_CONFIG_H 1
+
+/* version numbers */
+#undef GSTREAMERMM_MAJOR_VERSION
+#undef GSTREAMERMM_MINOR_VERSION
+#undef GSTREAMERMM_MICRO_VERSION
+
+// detect common platforms
+#if defined(_WIN32)
+// Win32 compilers have a lot of varation
+#if defined(_MSC_VER)
+#define GSTREAMERMM_MSC
+#define GSTREAMERMM_WIN32
+#define GSTREAMERMM_DLL
+#elif defined(__CYGWIN__)
+#define GSTREAMERMM_CONFIGURE
+#elif defined(__MINGW32__)
+#define GSTREAMERMM_WIN32
+#define GSTREAMERMM_CONFIGURE
+#else
+//AIX clR compiler complains about this even though it doesn't get this far:
+//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
+#endif
+#else
+#define GSTREAMERMM_CONFIGURE
+#endif /* _WIN32 */
+
+#ifdef GSTREAMERMM_CONFIGURE
+/* compiler feature tests that are used during compile time and run-time
+ by gtk-- only. tests used by gdk-- and gtk-- should go into
+ gdk--config.h.in */
+#undef GSTREAMERMM_CXX_HAVE_MUTABLE
+#undef GSTREAMERMM_CXX_HAVE_NAMESPACES
+//#undef GSTREAMERMM_CXX_GAUB
+//#undef GSTREAMERMM_CXX_AMBIGUOUS_TEMPLATES
+#undef GSTREAMERMM_HAVE_NAMESPACE_STD
+#undef GSTREAMERMM_HAVE_STD_ITERATOR_TRAITS
+#undef GSTREAMERMM_HAVE_SUN_REVERSE_ITERATOR
+#undef GSTREAMERMM_HAVE_TEMPLATE_SEQUENCE_CTORS
+#undef GSTREAMERMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
+#undef GSTREAMERMM_COMPILER_SUN_FORTE
+#undef GSTREAMERMM_DEBUG_REFCOUNTING
+#undef GSTREAMERMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
+#undef GSTREAMERMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
+#undef GSTREAMERMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC
+#undef GSTREAMERMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
+#endif
+
+#ifdef GSTREAMERMM_MSC
+ #define GSTREAMERMM_CXX_HAVE_MUTABLE 1
+ #define GSTREAMERMM_CXX_HAVE_NAMESPACES 1
+ #define GSTREAMERMM_HAVE_NAMESPACE_STD 1
+ #define GSTREAMERMM_HAVE_STD_ITERATOR_TRAITS 1
+ #define GSTREAMERMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
+ #define GSTREAMERMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
+ #define GSTREAMERMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
+ #define GSTREAMERMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
+ #define GSTREAMERMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
+ #pragma warning (disable: 4786 4355 4800 4181)
+#endif
+
+#ifndef GSTREAMERMM_HAVE_NAMESPACE_STD
+# define GSTREAMERMM_USING_STD(Symbol) namespace std { using ::Symbol; }
+#else
+# define GSTREAMERMM_USING_STD(Symbol) /* empty */
+#endif
+
+#ifdef GSTREAMERMM_DLL
+ #if defined(GSTREAMERMM_BUILD) && defined(_WINDLL)
+ /* Do not dllexport as it is handled by gendef on MSVC */
+ #define GSTREAMERMM_API
+ #elif !defined(GSTREAMERMM_BUILD)
+ #define GSTREAMERMM_API __declspec(dllimport)
+ #else
+ /* Build a static library */
+ #define GSTREAMERMM_API
+ #endif /* GSTREAMERMM_BUILD - _WINDLL */
+#else
+ #define GSTREAMERMM_API
+#endif /* GSTREAMERMM_DLL */
+
+#endif /* _GSTREAMERMM_CONFIG_H */
+
Modified: gstreamermm/trunk/tests/Makefile.am
==============================================================================
--- gstreamermm/trunk/tests/Makefile.am (original)
+++ gstreamermm/trunk/tests/Makefile.am Tue Feb 5 05:22:30 2008
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gstreamer @GSTMM_CFLAGS@
+INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gstreamer @GSTREAMERMM_CFLAGS@
LDADD=$(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la
@@ -8,50 +8,50 @@
test-structure
test_create_element_SOURCES=test-create-element.cc
-test_create_element_LDFLAGS= GSTMM_LIBS@
+test_create_element_LDFLAGS= GSTREAMERMM_LIBS@
test_pipeline_add_element_SOURCES=test-pipeline-add-element.cc
-test_pipeline_add_element_LDFLAGS= GSTMM_LIBS@
+test_pipeline_add_element_LDFLAGS= GSTREAMERMM_LIBS@
test_link_elements_SOURCES=test-link-elements.cc
-test_link_elements_LDFLAGS= GSTMM_LIBS@
+test_link_elements_LDFLAGS= GSTREAMERMM_LIBS@
test_create_bin_SOURCES=test-create-bin.cc
-test_create_bin_LDFLAGS= GSTMM_LIBS@
+test_create_bin_LDFLAGS= GSTREAMERMM_LIBS@
test_miniobject_wrap_SOURCES=test-miniobject-wrap.cc
-test_miniobject_wrap_LDFLAGS= GSTMM_LIBS@
+test_miniobject_wrap_LDFLAGS= GSTREAMERMM_LIBS@
test_message_wrap_SOURCES=test-message-wrap.cc
-test_message_wrap_LDFLAGS= GSTMM_LIBS@
+test_message_wrap_LDFLAGS= GSTREAMERMM_LIBS@
test_event_wrap_SOURCES=test-event-wrap.cc
-test_event_wrap_LDFLAGS= GSTMM_LIBS@
+test_event_wrap_LDFLAGS= GSTREAMERMM_LIBS@
test_query_wrap_SOURCES=test-query-wrap.cc
-test_query_wrap_LDFLAGS= GSTMM_LIBS@
+test_query_wrap_LDFLAGS= GSTREAMERMM_LIBS@
test_structure_SOURCES=test-structure.cc
-test_structure_LDFLAGS= GSTMM_LIBS@
+test_structure_LDFLAGS= GSTREAMERMM_LIBS@
#runtestbasic runtestlangs \
#runtestsearch runtestmimetypes \
#runtestgetbuffer
#runtestbasic_SOURCES=test-basic.cc
-#runtestbasic_LDFLAGS= GSTMM_LIBS@
+#runtestbasic_LDFLAGS= GSTREAMERMM_LIBS@
#runtestlangs_SOURCES=test-langs.cc
-#runtestlangs_LDFLAGS= GSTMM_LIBS@
+#runtestlangs_LDFLAGS= GSTREAMERMM_LIBS@
#runtestsearch_SOURCES=test-search.cc
-#runtestsearch_LDFLAGS= GSTMM_LIBS@
+#runtestsearch_LDFLAGS= GSTREAMERMM_LIBS@
#runtestmimetypes_SOURCES=test-mime-types.cc
-#runtestmimetypes_LDFLAGS= GSTMM_LIBS@
+#runtestmimetypes_LDFLAGS= GSTREAMERMM_LIBS@
#runtestgetbuffer_SOURCES=test-get-buffer.cc
-#runtestgetbuffer_LDFLAGS= GSTMM_LIBS@
+#runtestgetbuffer_LDFLAGS= GSTREAMERMM_LIBS@
Modified: gstreamermm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/Makefile.am (original)
+++ gstreamermm/trunk/tools/extra_defs_gen/Makefile.am Tue Feb 5 05:22:30 2008
@@ -1,8 +1,8 @@
# Build the generate_properties_defs utility executable.
# This is not used to build the rest of gtkmm.
-INCLUDES = $(GSTMM_CFLAGS)
-LIBS = $(GSTMM_LIBS) -lglibmm_generate_extra_defs-2.4
+INCLUDES = $(GSTREAMERMM_CFLAGS)
+LIBS = $(GSTREAMERMM_LIBS) -lglibmm_generate_extra_defs-2.4
noinst_PROGRAMS = generate_extra_defs
generate_extra_defs_SOURCES = generate_defs_gst.cc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
