gnomemm r1299 - in gstreamermm/trunk: . examples/element_link examples/init examples/ogg_player examples/ogg_player_gtkmm examples/optiongroup gst tests

[murrayc svn gnome org]

Author: murrayc
Date: Sat Jan 26 10:41:20 2008
New Revision: 1299
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1299&view=rev

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

* configure.ac:
* examples/element_link/element_link.cc:
* examples/init/init.cc:
* examples/ogg_player/main.cc:
* examples/ogg_player_gtkmm/Makefile.am:
* examples/optiongroup/optiongroup.cc:
* gst/Makefile.am:
* gst/gstmm-1.0.pc.in:
* gst/gstmm.h:
* gst/gstreamermm-1.0.pc.in:
* tests/test-create-bin.cc:
* tests/test-create-element.cc:
* tests/test-event-wrap.cc:
* tests/test-link-elements.cc:
* tests/test-message-wrap.cc:
* tests/test-miniobject-wrap.cc:
* tests/test-pipeline-add-element.cc:
* tests/test-query-wrap.cc:
Rename gstmm.h to gstreamermm.h 
and gstmm-1.0.pc to gstreamermm-1.0.pc, to be more consistent.

Added:
   gstreamermm/trunk/gst/gstreamermm-1.0.pc.in
      - copied, changed from r1298, /gstreamermm/trunk/gst/gstmm-1.0.pc.in
   gstreamermm/trunk/gst/gstreamermm.h
      - copied unchanged from r1298, /gstreamermm/trunk/gst/gstmm.h
Removed:
   gstreamermm/trunk/gst/gstmm-1.0.pc.in
   gstreamermm/trunk/gst/gstmm.h
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/NEWS
   gstreamermm/trunk/configure.ac
   gstreamermm/trunk/examples/element_link/element_link.cc
   gstreamermm/trunk/examples/init/init.cc
   gstreamermm/trunk/examples/ogg_player/main.cc
   gstreamermm/trunk/examples/ogg_player_gtkmm/Makefile.am
   gstreamermm/trunk/examples/optiongroup/optiongroup.cc
   gstreamermm/trunk/gst/Makefile.am
   gstreamermm/trunk/tests/test-create-bin.cc
   gstreamermm/trunk/tests/test-create-element.cc
   gstreamermm/trunk/tests/test-event-wrap.cc
   gstreamermm/trunk/tests/test-link-elements.cc
   gstreamermm/trunk/tests/test-message-wrap.cc
   gstreamermm/trunk/tests/test-miniobject-wrap.cc
   gstreamermm/trunk/tests/test-pipeline-add-element.cc
   gstreamermm/trunk/tests/test-query-wrap.cc

Modified: gstreamermm/trunk/NEWS
==============================================================================
--- gstreamermm/trunk/NEWS	(original)
+++ gstreamermm/trunk/NEWS	Sat Jan 26 10:41:20 2008
@@ -0,0 +1,4 @@
+0.1.0:
+
+First version, with some simple examples.
+(Josà Alburquerque, Siavash Safi, Milosz Derezynski, Murray Cumming) 

Modified: gstreamermm/trunk/configure.ac
==============================================================================
--- gstreamermm/trunk/configure.ac	(original)
+++ gstreamermm/trunk/configure.ac	Sat Jan 26 10:41:20 2008
@@ -18,7 +18,7 @@
 pushdef([GSTMM_MICRO_VERSION],     [0])
 pushdef([GSTMM_EXTRA_VERSION],     [])
 pushdef([GSTMM_VERSION], GSTMM_MAJOR_VERSION.GSTMM_MINOR_VERSION.GSTMM_MICRO_VERSION[]GSTMM_EXTRA_VERSION)
-AC_INIT([gstmm], GSTMM_VERSION, [Milosz Derezynski <internalerror gmail com>, Rob Page <page rob gmail com>, Dodji Seketeli <dodji gnome org>])
+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_PREREQ(2.59)
 
@@ -36,9 +36,9 @@
 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 gstmm])
-AC_DEFINE_UNQUOTED(GSTMM_MINOR_VERSION, $GSTMM_MINOR_VERSION, [Minor version of gstmm])
-AC_DEFINE_UNQUOTED(GSTMM_MICRO_VERSION, $GSTMM_MICRO_VERSION, [Micro version of gstmm])
+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)
@@ -111,22 +111,22 @@
 AC_PROG_LIBTOOL
 
 AL_PROG_GNU_M4(AC_MSG_ERROR([dnl
-SUN m4 does not work for building gstmm. 
+SUN m4 does not work for building gstreamermm. 
 Please install GNU m4.]))
 
 AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
-SUN make does not work for building gstmm.
+SUN make does not work for building gstreamermm.
 Please install GNU make.]))
 
 
 #########################################################################
 #  Dependancy checks (gtkmm is only used by examples)
 #########################################################################
-gstmm_min_glibmm_version=2.8.0
-gstmm_min_gtkmm_version=2.10
-gstmm_min_gst_version=0.10
+gstreamermm_min_glibmm_version=2.8.0
+gstreamermm_min_gtkmm_version=2.10
+gstreamermm_min_gst_version=0.10
 
-PKG_CHECK_MODULES(GSTMM, glibmm-2.4 >= ${gstmm_min_glibmm_version} gstreamer-0.10 >= ${gstmm_min_gst_version})
+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)
 
@@ -228,7 +228,7 @@
 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 >= ${gstmm_min_gtkmm_version})
+PKG_CHECK_MODULES(GSTMM_EXAMPLES, gtkmm-2.4 >= ${gstreamermm_min_gtkmm_version})
 AC_SUBST(GSTMM_EXAMPLES_CFLAGS)
 AC_SUBST(GSTMM_EXAMPLES_LIBS)
 
@@ -299,7 +299,7 @@
   Makefile
 
   gst/Makefile
-  gst/gstmm-1.0.pc
+  gst/gstreamermm-1.0.pc
     gst/src/Makefile
     gst/gstmm/Makefile
       gst/gstmm/private/Makefile

Modified: gstreamermm/trunk/examples/element_link/element_link.cc
==============================================================================
--- gstreamermm/trunk/examples/element_link/element_link.cc	(original)
+++ gstreamermm/trunk/examples/element_link/element_link.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <stdexcept>
 #include <iostream>
 

Modified: gstreamermm/trunk/examples/init/init.cc
==============================================================================
--- gstreamermm/trunk/examples/init/init.cc	(original)
+++ gstreamermm/trunk/examples/init/init.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main(int argc, char** argv)

Modified: gstreamermm/trunk/examples/ogg_player/main.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player/main.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player/main.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 #include <iomanip>
 

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/Makefile.am
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/Makefile.am	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/Makefile.am	Sat Jan 26 10:41:20 2008
@@ -2,5 +2,5 @@
 
 #Build the executable, but don't install it.
 noinst_PROGRAMS = oggplayer
-oggplayer_SOURCES = main.cc PlayerWindow.cc
+oggplayer_SOURCES = main.cc PlayerWindow.cc PlayerWindow.h
 

Modified: gstreamermm/trunk/examples/optiongroup/optiongroup.cc
==============================================================================
--- gstreamermm/trunk/examples/optiongroup/optiongroup.cc	(original)
+++ gstreamermm/trunk/examples/optiongroup/optiongroup.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 Glib::OptionEntry make_entry(const Glib::ustring& long_name, const gchar& short_name, const Glib::ustring& description)

Modified: gstreamermm/trunk/gst/Makefile.am
==============================================================================
--- gstreamermm/trunk/gst/Makefile.am	(original)
+++ gstreamermm/trunk/gst/Makefile.am	Sat Jan 26 10:41:20 2008
@@ -1,14 +1,13 @@
 SUBDIRS = src gstmm
 
-EXTRA_DIST = README gstmmconfig.h.in \
-gstmm-1.0.pc.in gstmm.h
+EXTRA_DIST = README gstmmconfig.h.in gstreamermm-1.0.pc.in gstreamermm.h
 
-gstmm_includedir      = $(includedir)/gstmm-1.0
-gstmm_include_DATA  	= gstmm.h
+gstreamermm_includedir = $(includedir)/gstreamermm-1.0
+gstreamermm_include_DATA = gstreamermm.h
 
-gstmm_configdir       = $(libdir)/gstmm-1.0/include
-gstmm_config_DATA     = gstmmconfig.h
+gstreamermm_configdir       = $(libdir)/gstreamermm-1.0/include
+gstreamermm_config_DATA     = gstmmconfig.h
 
 pkgconfigdir          = $(libdir)/pkgconfig
-pkgconfig_DATA        = gstmm-1.0.pc
+pkgconfig_DATA        = gstreamermm-1.0.pc
 

Copied: gstreamermm/trunk/gst/gstreamermm-1.0.pc.in (from r1298, /gstreamermm/trunk/gst/gstmm-1.0.pc.in)
==============================================================================
--- /gstreamermm/trunk/gst/gstmm-1.0.pc.in	(original)
+++ gstreamermm/trunk/gst/gstreamermm-1.0.pc.in	Sat Jan 26 10:41:20 2008
@@ -3,7 +3,7 @@
 libdir= libdir@
 includedir= includedir@
 
-Name: gstmm
+Name: gstreamermm
 Description: C++ wrapper for GStreamer 
 Requires: glibmm-2.4 gstreamer-0.10 
 Version: @VERSION@

Modified: gstreamermm/trunk/tests/test-create-bin.cc
==============================================================================
--- gstreamermm/trunk/tests/test-create-bin.cc	(original)
+++ gstreamermm/trunk/tests/test-create-bin.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tests/test-create-element.cc
==============================================================================
--- gstreamermm/trunk/tests/test-create-element.cc	(original)
+++ gstreamermm/trunk/tests/test-create-element.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tests/test-event-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-event-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-event-wrap.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tests/test-link-elements.cc
==============================================================================
--- gstreamermm/trunk/tests/test-link-elements.cc	(original)
+++ gstreamermm/trunk/tests/test-link-elements.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tests/test-message-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-message-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-message-wrap.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <gst/gstbin.h>
 #include <gst/gsterror.h>
 #include <iostream>

Modified: gstreamermm/trunk/tests/test-miniobject-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-miniobject-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-miniobject-wrap.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <gst/gstbin.h>
 #include <gst/gsterror.h>
 #include <iostream>

Modified: gstreamermm/trunk/tests/test-pipeline-add-element.cc
==============================================================================
--- gstreamermm/trunk/tests/test-pipeline-add-element.cc	(original)
+++ gstreamermm/trunk/tests/test-pipeline-add-element.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tests/test-query-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-query-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-query-wrap.cc	Sat Jan 26 10:41:20 2008
@@ -1,4 +1,4 @@
-#include <gstmm.h>
+#include <gstreamermm.h>
 #include <iostream>
 
 int main (int argc, char* argv[])