Replace GST_MAJORMINOR with GST_API_VERSION

14 files changed, 34 insertions, 26 deletions

diff --git a/common-modified/gtk-doc-plugins.mak b/common-modified/gtk-doc-plugins.mak
index 809f52ad..cb99f860 100644
--- a/common-modified/gtk-doc-plugins.mak
+++ b/common-modified/gtk-doc-plugins.mak
@@ -229,7 +229,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
 	@mv html/index.sgml html/index.sgml.bak
-	@$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
+	@$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
 	@rm -f html/index.sgml.bak
 	@rm -f html/$(DOC_MAIN_SGML_FILE)
 	@rm -rf html/xml
@@ -297,7 +297,7 @@ install-data-local:
 	  echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
 	  if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
 	            $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-	            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+	            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
 	  fi; \
 	  (which gtkdoc-rebase >/dev/null && \
 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
diff --git a/configure.ac b/configure.ac
index 1ac64514..807d1ed5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,9 @@ AC_DEFINE_UNQUOTED(FS_MAJORMINOR, "$FS_MAJORMINOR",
 AC_DEFINE_UNQUOTED(FS_MAJOR_MINOR, "$FS_MAJORMINOR",
   [Farstream major_minor version])
 
-GST_MAJORMINOR=1.0
-AC_SUBST(GST_MAJORMINOR)
-AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR",
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
+AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
   [GStreamer major.minor version])
 
 
@@ -253,10 +253,10 @@ AC_SUBST(GIO_UNIX_LIBS)
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ])
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ])
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ])
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ])
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ])
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ])
 AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
 dnl Check for documentation xrefs
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 937941ee..a01a0911 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -4,7 +4,7 @@
 # DOCS_ARE_INCOMPLETE_PLEASE_FIXME=yespleasedo
 
 # The name of the module, e.g. 'glib'.
-#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
+#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
 DOC_MODULE=farstream-libs
 
 # generated basefiles
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 0643ca00..9c07af31 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
 ## Process this file with automake to produce Makefile.in
 
 # The name of the module, e.g. 'glib'.
-#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
+#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
 MODULE=farstream
 DOC_MODULE=$(MODULE)-plugins
 
@@ -18,11 +18,11 @@ DOC_MODULE=$(MODULE)-plugins
 #	BUILDDIR=`pwd` && \
 #	cd $(srcdir)/tmpl && \
 #	ln -sf gstreamer-libs-unused.sgml \
-#		$$BUILDDIR/tmpl/gstreamer-libs-@GST_MAJORMINOR@-unused.sgml
+#		$$BUILDDIR/tmpl/gstreamer-libs-@GST_API_VERSION@-unused.sgml
 #	touch unused-build.stamp
 
-# these rules are added to create parallel docs using GST_MAJORMINOR
-#$(basefiles): gstreamer-libs-@GST_MAJORMINOR@%: gstreamer-libs%
+# these rules are added to create parallel docs using GST_API_VERSION
+#$(basefiles): gstreamer-libs-@GST_API_VERSION@%: gstreamer-libs%
 #	cp $< $@
 
 #CLEANFILES = $(basefiles)
diff --git a/docs/version.entities.in b/docs/version.entities.in
index 662fc76e..b980b6ed 100644
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY FS_VERSION "@VERSION@">
diff --git a/farstream.pc.in b/farstream.pc.in
index 4d712f91..c6bc6e45 100644
--- a/farstream.pc.in
+++ b/farstream.pc.in
@@ -6,7 +6,7 @@ pluginsdir=@libdir@/farstream-@FS_MAJORMINOR@
 
 Name: Farstream
 Description: Farstream base classes and utilities
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
 Libs: -L${libdir} -lfarstream-@FS_MAJORMINOR@
 Cflags: -I${includedir}
diff --git a/farstream/Makefile.am b/farstream/Makefile.am
index c41761e6..30ebb2cb 100644
--- a/farstream/Makefile.am
+++ b/farstream/Makefile.am
@@ -100,7 +100,7 @@ Farstream_@FS_MAJOR_MINOR@_gir_NAMESPACE = Farstream
 Farstream_@FS_MAJOR_MINOR@_gir_VERSION = @FS_MAJORMINOR@
 Farstream_@FS_MAJOR_MINOR@_gir_LIBS = libfarstream-@FS_MAJORMINOR@.la
 Farstream_@FS_MAJOR_MINOR@_gir_FILES = $(introspection_sources)
-Farstream_@FS_MAJOR_MINOR@_gir_INCLUDES = GObject-2.0 Gst-@GST_MAJORMINOR@
+Farstream_@FS_MAJOR_MINOR@_gir_INCLUDES = GObject-2.0 Gst-@GST_API_VERSION@
 Farstream_@FS_MAJOR_MINOR@_gir_CFLAGS = $(FS_INTERNAL_CFLAGS)
 Farstream_@FS_MAJOR_MINOR@_gir_SCANNERFLAGS = --identifier-prefix=fs_ --identifier-prefix=Fs
 
diff --git a/gst/fsmsnconference/fs-msn-stream.c b/gst/fsmsnconference/fs-msn-stream.c
index e7ecd637..40ee5e96 100644
--- a/gst/fsmsnconference/fs-msn-stream.c
+++ b/gst/fsmsnconference/fs-msn-stream.c
@@ -58,6 +58,9 @@
 
 #include <gst/gst.h>
 
+#include <gst/base/gstbasesrc.h>
+
+
 #include "fs-msn-connection.h"
 
 
@@ -555,9 +558,14 @@ _connected (
   }
 
   if (self->priv->conference->max_direction == FS_DIRECTION_RECV)
+  {
     fdelem = gst_bin_get_by_name (GST_BIN (codecbin), "fdsrc");
+    gst_base_src_set_format (GST_BASE_SRC (fdelem), GST_FORMAT_TIME);
+  }
   else
+  {
     fdelem = gst_bin_get_by_name (GST_BIN (codecbin), "fdsink");
+  }
 
   if (!fdelem)
   {
diff --git a/gst/fsrtcpfilter/Makefile.am b/gst/fsrtcpfilter/Makefile.am
index 913b460a..6dacb2e5 100644
--- a/gst/fsrtcpfilter/Makefile.am
+++ b/gst/fsrtcpfilter/Makefile.am
@@ -12,7 +12,7 @@ libfsrtcpfilter_la_CFLAGS = \
 libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libfsrtcpfilter_la_LIBADD = \
 	$(FS_LIBS) \
-	-lgstrtp-@GST_MAJORMINOR@ \
+	-lgstrtp-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS)
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index 37d1901f..124a9196 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -66,7 +66,7 @@ libfsrtpconference_la_LIBADD = \
 	$(FS_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS) \
-	-lgstrtp-@GST_MAJORMINOR@ \
+	-lgstrtp-@GST_API_VERSION@ \
 	-lm
 
 libfsrtpconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.c b/gst/fsrtpconference/fs-rtp-codec-cache.c
index 5b76fd57..be09a62e 100644
--- a/gst/fsrtpconference/fs-rtp-codec-cache.c
+++ b/gst/fsrtpconference/fs-rtp-codec-cache.c
@@ -68,9 +68,9 @@ static gboolean codecs_cache_valid (gchar *cache_path) {
   registry_xml_path = g_strdup (g_getenv ("GST_REGISTRY"));
   if (registry_xml_path == NULL) {
     registry_bin_path = g_build_filename (g_get_home_dir (),
-        ".gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".bin", NULL);
+        ".gstreamer-" GST_API_VERSION, "registry." HOST_CPU ".bin", NULL);
     registry_xml_path = g_build_filename (g_get_home_dir (),
-        ".gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".xml", NULL);
+        ".gstreamer-" GST_API_VERSION, "registry." HOST_CPU ".xml", NULL);
   } else {
     registry_bin_path = g_strdup (registry_xml_path);
   }
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 800291cb..69f74f79 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -150,14 +150,14 @@ rtp_codecs_SOURCES = \
 	rtp/codecs.c
 
 rtp_sendcodecs_CFLAGS = $(AM_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-rtp_sendcodecs_LDADD = $(LDADD) -lgstrtp-@GST_MAJORMINOR@
+rtp_sendcodecs_LDADD = $(LDADD) -lgstrtp-@GST_API_VERSION@
 rtp_sendcodecs_SOURCES = \
 	rtp/generic.c \
 	rtp/generic.h \
 	rtp/sendcodecs.c
 
 rtp_recvcodecs_CFLAGS = $(AM_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-rtp_recvcodecs_LDADD = $(LDADD) -lgstrtp-@GST_MAJORMINOR@
+rtp_recvcodecs_LDADD = $(LDADD) -lgstrtp-@GST_API_VERSION@
 
 msn_conference_CFLAGS = $(AM_CFLAGS)
 msn_conference_SOURCES = \
@@ -171,4 +171,4 @@ utils_binadded_SOURCES = \
 
 elements_rtcpfilter_CFLAGS = $(AM_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 elements_rtcpfilter_SOURCES = elements/rtcpfilter.c
-elements_rtcpfilter_LDADD = $(LDADD) -lgstrtp-@GST_MAJORMINOR@
+elements_rtcpfilter_LDADD = $(LDADD) -lgstrtp-@GST_API_VERSION@
diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am
index f418a7d9..e24392f9 100644
--- a/tests/rtp/Makefile.am
+++ b/tests/rtp/Makefile.am
@@ -17,4 +17,4 @@ LDADD = \
 	$(GST_CHECK_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS) \
-	-lgstrtp-@GST_MAJORMINOR@
+	-lgstrtp-@GST_API_VERSION@
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 41051de8..1556d743 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -31,7 +31,7 @@ librawudp_transmitter_la_LIBADD = \
 	$(NICE_LIBS) \
 	$(GUPNP_LIBS) \
 	$(GIO_LIBS) \
-	-lgstnet-@GST_MAJORMINOR@
+	-lgstnet-@GST_API_VERSION@
 
 noinst_HEADERS = \
 	fs-rawudp-transmitter.h \