I'm too lazy to comment this

Original commit message from CVS:
Added the .m4 script of	Thomas Nyberg <thomas@codefactory.se>

diff --git a/gstplay/Makefile.am b/gstplay/Makefile.am
index eb4a726..93629fa 100644 (file)
--- a/gstplay/Makefile.am
+++ b/gstplay/Makefile.am
@@ -31,5 +31,7 @@ noinst_HEADERS = \
        gstplayprivate.h
 
 
+libgstmediaplay_la_LDFLAGS = -rdynamic
+
 gstmediaplay_CFLAGS = $(LIBGLADE_GNOME_CFLAGS)
 gstmediaplay_LDADD = $(GST_LIBS) $(LIBGLADE_GNOME_LIBS) libgstmediaplay.la

diff --git a/gstreamer.m4 b/gstreamer.m4
index 2497de7..c2be0a5 100644 (file)
--- a/gstreamer.m4
+++ b/gstreamer.m4
@@ -1,21 +1,179 @@
-# a macro to get the libs/cflags for gscope
-# serial 1
+dnl Configure paths for GStreamer
+dnl This was based upon the glib.m4 created by Owen Taylor 97-11-3
+dnl Changes mostly involve replacing GLIB with GStreamer
+dnl
+dnl Written by Thomas Nyberg <thomas.nyberg@codefactory.se> 2001-03-01
 
-dnl AM_PATH_GSTREAMER([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test to see if timestamp is installed, and define GSTREAMER_CFLAGS, LIBS
+dnl AM_PATH_GSTREAMER([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GStreamer, and define GSTREAMER_CFLAGS and GSTREAMER_LIBS
 dnl
 AC_DEFUN(AM_PATH_GSTREAMER,
-[dnl
-dnl Get the cflags and libraries for the GtkScope widget
-dnl
-AC_ARG_WITH(gscope-prefix,
-[  --with-gscope-prefix=PFX Prefix where GtkScope is installed],
-GSTREAMER_PREFIX="$withval")
-
-AC_CHECK_LIB(gscope,gtk_scope_new,
-  AC_MSG_RESULT(yes),
-  AC_MSG_RESULT(no),"$GSTREAMER_PREFIX $LIBS")
-AC_SUBST(GSTREAMER_CFLAGS)
-AC_SUBST(GSTREAMER_LIBS)
-AC_SUBST(HAVE_GSTREAMER)
+[
+dnl
+dnl Get command-line stuff
+dnl
+       AC_ARG_WITH(gstreamer-prefix,[  --with-gstreamer-prefix=PFX   Prefix where GStreamer is installed (optional)],
+               gstreamer_config_prefix="$withval", gstreamer_config_prefix="")
+       AC_ARG_WITH(gstreamer-exec-prefix,[  --with-gstreamer-exec-prefix=PFX Exec prefix where GStreamer is installed (optional)],
+               gstreamer_config_exec_prefix="$withval", gstreamer_config_exec_prefix="")
+       AC_ARG_ENABLE(gstreamer-test, [  --disable-gstreamer-test       Do not try and run a test GStreamer-program],   
+               , enable_gstreamer_test=yes)
+
+       if test "x$gstreamer_config_prefix" != "x"; then
+               gstreamer_config_args="$gstreamer_config_args --prefix=$gstreamer_config_prefix" ;
+
+               if test "x${GSTREAMER_CONFIG+set}" != "xset" ; then
+                       GSTREAMER_CONFIG="$glib_config_prefix/bin/gstreamer-config" 
+               fi
+       fi
+       if test "x$gstreamer_config_exec_prefix" != "x"; then
+               gstreamer_config_args="$gstreamer_config_args --exec-prefix=$gstreamer_config_exec_prefix" ;
+
+               if test "x${GSTREAMER_CONFIG+set}" != "xset" ; then
+                       GSTREAMER_CONFIG="$glib_config_exec_prefix/bin/gstreamer-config"
+               fi      
+       fi
+
+       AC_PATH_PROG(GSTREAMER_CONFIG, gstreamer-config, no)
+
+       if test "x$1" == "x" ; then
+               min_gstreamer_version="0.0.1" 
+       else
+               min_gstreamer_version="$1"
+       fi
+
+dnl
+dnl Check to make sure version wanted is better than the existing version
+dnl
+       AC_MSG_CHECKING(for GStreamer-version >= $min_gstreamer_version)
+       no_gstreamer=""
+
+       if test "x$GSTREAMER_CONFIG" = "xno" ; then
+               no_gstreamer=yes
+       else
+               GSTREAMER_CFLAGS=`$GSTREAMER_CONFIG $gstreamer_config_args --cflags`
+               GSTREAMER_LIBS=`$GSTREAMER_CONFIG $gstreamer_config_args --libs`
+
+               gstreamer_config_major_version=`$GSTREAMER_CONFIG $gstreamer_config_args --version | \
+                                               sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+               gstreamer_config_minor_version=`$GSTREAMER_CONFIG $gstreamer_config_args --version | \
+                                               sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+               gstreamer_config_micro_version=`$GSTREAMER_CONFIG $gstreamer_config_args --version | \
+                                               sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+               if test "x$enable_gstreamer_test" = "xyes" ; then
+                       ac_save_CFLAGS="$CFLAGS"
+                       ac_save_LIBS="$LIBS"
+                       CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
+                       LIBS="$GSTREAMER_LIBS $LIBS"
+dnl
+dnl Try and run a program linked with libs
+dnl
+AC_TRY_RUN([
+#include <gst/gst.h>
+#include <stdio.h>
+#include <string.h>
+int 
+main ()
+{
+       int major, minor, micro;
+       char *tmp_version;
+
+       system("touch conf.gstreamertest");
+
+       tmp_version = strdup("$min_gstreamer_version");
+       if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+               printf("%s, bad version string\n", "$min_gstreamer_version");
+               return 1;
+       }       
+
+       if (($gstreamer_config_major_version > major) ||
+               (($gstreamer_config_major_version == major) && ($gstreamer_config_minor_version > minor)) ||
+               (($gstreamer_config_major_version == major) && ($gstreamer_config_minor_version == minor) && 
+               ($gstreamer_config_micro_version >= micro))) {
+               return 0;
+       } else {
+               printf("\n*** An old version of GStreamer(%d.%d.%d) was found.\n", 
+                       $gstreamer_config_major_version, $gstreamer_config_minor_version, 
+                       $gstreamer_config_micro_version);
+
+               printf("*** You need a version of GStreamer newer than %d.%d.%d.\n", major, minor, micro);
+       
+       }
+
+       return 1;
+               
+}
+],, no_gstreamer=yes, [echo $ac_n "cross compiling; assuming OK... $ac_c"])
+                       CFLAGS="$ac_save_CFLAGS"
+                       LIBS="$ac_save_LIBS"
+               fi
+       fi
+       if test "x$no_gstreamer" = "x" ; then
+               AC_MSG_RESULT(yes)
+               ifelse([$2], , :, [$2])
+       else
+dnl
+dnl Something went wrong, looks like GStreamer was not found
+dnl
+               if test "$GSTREAMER_CONFIG" = "no" ; then
+                       echo "*** The gstreamer-config script installed by GStreamer could not be found"
+                       echo "*** If GStreamer was installed in PREFIX, make sure PREFIX/bin is in"
+                       echo "*** your path, or set the GSTREAMER_CONFIG environment variable to the"
+                       echo "*** full path to gstreamer-config."
+               else
+                       if test -f conf.gstreamertest ; then
+                               :
+                       else
+                               echo "*** Could not run GStreamer test program, checking why..."
+                               CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
+                               LIBS="$LIBS $GSTREAMER_LIBS"
+AC_TRY_LINK([
+#include <gst/gst.h>
+#include <stdio.h>
+], 
+[ 
+gst_init(NULL, NULL); 
+return 0; 
+],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GStreamer or finding the wrong"
+          echo "*** version of GStreamer. If it is not finding GStreamer, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GStreamer was incorrectly installed"
+          echo "*** or that you have moved GStreamer since it was installed. In the latter case, you"
+          echo "*** may want to edit the gstremaer-config script: $GSTREAMER_CONFIG" ])
+                               CFLAGS="$ac_save_CFLAGS"
+                               LIBS="$ac_save_LIBS"
+                      fi
+               fi
+               GSTREAMER_CFLAGS=""
+               GSTREAMER_LIBS=""
+               ifelse([$3], , :, [$3])
+       fi
+
+dnl
+dnl Define our flags and libs
+dnl
+       AC_SUBST(GSTREAMER_CFLAGS)
+       AC_SUBST(GSTREAMER_LIBS)
+       rm -f conf.gstreamertest
 ])
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/test/videotest.c b/test/videotest.c
index 3bd4ad7..6171491 100644 (file)
--- a/test/videotest.c
+++ b/test/videotest.c
@@ -38,7 +38,7 @@ int main(int argc,char *argv[]) {
   g_return_if_fail(videosinkfactory != NULL);
 
   src = gst_elementfactory_create(srcfactory,"src");
-  //gtk_object_set(GTK_OBJECT(src),"format",3,NULL);
+  gtk_object_set(GTK_OBJECT(src),"format",3,NULL);
   gtk_object_set(GTK_OBJECT(src),"width",320,"height",240,NULL);
 
   videosink = gst_elementfactory_create(videosinkfactory,"videosink");
@@ -96,6 +96,8 @@ int main(int argc,char *argv[]) {
 
   gst_element_set_state(GST_ELEMENT(bin),GST_STATE_PLAYING);
 
+  gtk_object_set(GTK_OBJECT(src),"bright",32000,"contrast", 32000,NULL);
+
   //gtk_object_set(GTK_OBJECT(src),"tune",133250,NULL);
   g_idle_add(idle_func,bin);