gnomemm r1659 - in gstreamermm/trunk: . gstreamer/src gstreamerbase/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Fri Aug  1 18:09:13 2008
New Revision: 1659
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1659&view=rev

Log:
2008-08-01  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamerbase/src/audioclock.ccg:
	* gstreamerbase/src/Makefile_list_of_hg.am_fragment: Added
	audioclock.hg to list of *.hg files and modified GstBase::AudioClock
	cosntructor to include few lines in gst_audio_clock_new() since bug
	#545782 seems like a bit more trouble than including the lines.

	* gstreamer/src/generate-docs.sh:
	* gstreamer/src/generate-enums.sh:
	* gstreamer/src/generate-extra-defs.sh:
	* gstreamer/src/generate-methods.sh:
	* gstreamerbase/src/generate-docs.sh:
	* gstreamerbase/src/generate-enums.sh:
	* gstreamerbase/src/generate-extra-defs.sh:
	* gstreamerbase/src/generate-methods.sh: Modified these scripts to
	provide error messages.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/generate-docs.sh
   gstreamermm/trunk/gstreamer/src/generate-enums.sh
   gstreamermm/trunk/gstreamer/src/generate-extra-defs.sh
   gstreamermm/trunk/gstreamer/src/generate-methods.sh
   gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamerbase/src/audioclock.ccg
   gstreamermm/trunk/gstreamerbase/src/generate-docs.sh
   gstreamermm/trunk/gstreamerbase/src/generate-enums.sh
   gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh
   gstreamermm/trunk/gstreamerbase/src/generate-methods.sh

Modified: gstreamermm/trunk/gstreamer/src/generate-docs.sh
==============================================================================
--- gstreamermm/trunk/gstreamer/src/generate-docs.sh	(original)
+++ gstreamermm/trunk/gstreamer/src/generate-docs.sh	Fri Aug  1 18:09:13 2008
@@ -4,6 +4,11 @@
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
 # jhbuild sources.
 
+if [ -z "$JHBUILD_SOURCES" -o ! -x "`which docextract_to_xml.py`" ]; then
+  echo "JHBUILD_SOURCES must contain path to jhbuild sources and docextract_to_xml.py needs to be executable and in PATH."
+  exit 1;
+fi
+
 PREFIX=$JHBUILD_SOURCES 
 
 PARAMS="-s $PREFIX/gstreamer/gst/ -s $PREFIX/gstreamer/docs/gst/tmpl -s $PREFIX/gstreamer/docs/libs/tmpl"

Modified: gstreamermm/trunk/gstreamer/src/generate-enums.sh
==============================================================================
--- gstreamermm/trunk/gstreamer/src/generate-enums.sh	(original)
+++ gstreamermm/trunk/gstreamer/src/generate-enums.sh	Fri Aug  1 18:09:13 2008
@@ -4,6 +4,11 @@
 # JHBUILD_PREFIX should be defined to contain the path to the prefix (install)
 # directory of jhbuild.
 
+if [ -z "$JHBUILD_PREFIX" -o ! -x "`which enum.pl`" ]; then
+  echo "JHBUILD_PREFIX must contain path to jhbuild prefix and enum.pl needs to be executable and in PATH."
+  exit 1;
+fi
+
 PREFIX=$JHBUILD_PREFIX
 
 enum.pl $PREFIX/include/gstreamer-0.10/gst/*.h $PREFIX/include/gstreamer-0.10/gst/{base,controller,dataprotocol,net,check}/*.h > gst_enums.defs

Modified: gstreamermm/trunk/gstreamer/src/generate-extra-defs.sh
==============================================================================
--- gstreamermm/trunk/gstreamer/src/generate-extra-defs.sh	(original)
+++ gstreamermm/trunk/gstreamer/src/generate-extra-defs.sh	Fri Aug  1 18:09:13 2008
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Note that script assumes it is run in gstreamermm/gstreamer/src directory.
+# Note that script assumes it resides in the gstreamermm/gstreamer/src
+# directory.
 
 DIR=`dirname "$0"`
 

Modified: gstreamermm/trunk/gstreamer/src/generate-methods.sh
==============================================================================
--- gstreamermm/trunk/gstreamer/src/generate-methods.sh	(original)
+++ gstreamermm/trunk/gstreamer/src/generate-methods.sh	Fri Aug  1 18:09:13 2008
@@ -4,6 +4,11 @@
 # JHBUILD_PREFIX should be defined to contain the path to the prefix (install)
 # directory of jhbuild.
 
+if [ -z "$JHBUILD_PREFIX" -o ! -x "`which h2def.py`" ]; then
+  echo "JHBUILD_PREFIX must contain path to jhbuild prefix and h2def.py needs to be executable and in PATH."
+  exit 1;
+fi
+
 PREFIX=$JHBUILD_PREFIX
 
 h2def.py $PREFIX/include/gstreamer-0.10/gst/*.h $PREFIX/include/gstreamer-0.10/gst/{base,controller,dataprotocol,net,check}/*.h > gst_methods.defs

Modified: gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment	Fri Aug  1 18:09:13 2008
@@ -4,9 +4,7 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = colorbalance.hg colorbalancechannel.hg xoverlay.hg
-
-#TODO: Add audioclock.hg when bug #545782 is resolved.
+files_general_hg = audioclock.hg colorbalance.hg colorbalancechannel.hg xoverlay.hg
 
 files_general_deprecated_hg =
 

Modified: gstreamermm/trunk/gstreamerbase/src/audioclock.ccg
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/audioclock.ccg	(original)
+++ gstreamermm/trunk/gstreamerbase/src/audioclock.ccg	Fri Aug  1 18:09:13 2008
@@ -50,7 +50,13 @@
   : _CONSTRUCT("name", name.c_str())
 {
   slot = new SlotGetTime(time_slot);
-  gst_audio_clock_construct(gobj(), &AudioClock_GetTime_gstreamermm_callback, (void*) &slot);
+
+  //The following lines are taken verbatim from gst_audio_clock_new() after the
+  //call to g_object_new() because it seems that bug #545782 will not be
+  //accepted.
+
+  gobj()->func = &AudioClock_GetTime_gstreamermm_callback;
+  gobj()->user_data = &slot;
 }
 
 AudioClock::~AudioClock()

Modified: gstreamermm/trunk/gstreamerbase/src/generate-docs.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-docs.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-docs.sh	Fri Aug  1 18:09:13 2008
@@ -4,6 +4,11 @@
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
 # jhbuild sources.
 
+if [ -z "$JHBUILD_SOURCES" -o ! -x "`which docextract_to_xml.py`" ]; then
+  echo "JHBUILD_SOURCES must contain path to jhbuild sources and docextract_to_xml.py needs to be executable and in PATH."
+  exit 1;
+fi
+
 PREFIX=$JHBUILD_SOURCES
 
 PARAMS="-s $PREFIX/gst-plugins-base/docs/libs/tmpl"

Modified: gstreamermm/trunk/gstreamerbase/src/generate-enums.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-enums.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-enums.sh	Fri Aug  1 18:09:13 2008
@@ -4,6 +4,11 @@
 # JHBUILD_PREFIX should be defined to contain the path to the prefix (install)
 # directory of jhbuild.
 
+if [ -z "$JHBUILD_PREFIX" -o ! -x "`which enum.pl`" ]; then
+  echo "JHBUILD_PREFIX must contain path to jhbuild prefix and enum.pl needs to be executable and in PATH."
+  exit 1;
+fi
+
 PREFIX=$JHBUILD_PREFIX
 
 enum.pl $PREFIX/include/gstreamer-0.10/gst/{audio,cdda,fft,floatcast,interfaces,netbuffer,riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h > gstbase_enums.defs

Modified: gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-extra-defs.sh	Fri Aug  1 18:09:13 2008
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Note that script assumes it is run in gstreamermm/gstreamerbase/src directory.
+# Note that script assumes it resides in gstreamermm/gstreamerbase/src
+# directory.
 
 DIR=`dirname "$0"`
 

Modified: gstreamermm/trunk/gstreamerbase/src/generate-methods.sh
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/generate-methods.sh	(original)
+++ gstreamermm/trunk/gstreamerbase/src/generate-methods.sh	Fri Aug  1 18:09:13 2008
@@ -4,6 +4,11 @@
 # JHBUILD_PREFIX should be defined to contain the path to the prefix (install)
 # directory of jhbuild.
 
+if [ -z "$JHBUILD_PREFIX" -o ! -x "`which h2def.py`" ]; then
+  echo "JHBUILD_PREFIX must contain path to jhbuild prefix and h2def.py needs to be executable and in PATH."
+  exit 1;
+fi
+
 PREFIX=$JHBUILD_PREFIX
 
 h2def.py $PREFIX/include/gstreamer-0.10/gst/{audio,cdda,fft,floatcast,interfaces,netbuffer,riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h > gstbase_methods.defs