common/m4/gst-error.m4: Disable warning of statement not reached on Forte.

Original commit message from CVS:
2006-10-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

Patch by: Josep Torre Valles <josep@fluendo.com>

* common/m4/gst-error.m4:
Disable warning of statement not reached on Forte.
* gst/gstmessage.h:
Fix warning on Forte (value doesn't fit on enumeration).
* libs/gst/base/gstbasesink.c: (gst_base_sink_chain_unlocked):
Fix warning on Forte (value doesn't fit on enumeration).
* libs/gst/net/gstnetclientclock.c: (gst_net_client_clock_thread):
DEBUG macro says it takes minimum of 2 args and so Forte
complains about the use with just 1 arg.
* plugins/elements/gstfdsink.c:
* plugins/elements/gstfdsrc.c:
* plugins/elements/gstfilesink.c:
* plugins/elements/gstfilesrc.c:
Use correct return type for the uri handler implementations.

All these fix warnings in Forte.  Fixes bug #360860.

diff --git a/ChangeLog b/ChangeLog
index 6e4cca999a568f70990ac09a3a13e4bc24265917..ad54986f4775233914f67f65f921d388fab0a0d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-10-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       Patch by: Josep Torre Valles <josep@fluendo.com>
+
+       * common/m4/gst-error.m4:
+       Disable warning of statement not reached on Forte.
+       * gst/gstmessage.h:
+       Fix warning on Forte (value doesn't fit on enumeration).
+       * libs/gst/base/gstbasesink.c: (gst_base_sink_chain_unlocked):
+       Fix warning on Forte (value doesn't fit on enumeration).
+       * libs/gst/net/gstnetclientclock.c: (gst_net_client_clock_thread):
+       DEBUG macro says it takes minimum of 2 args and so Forte
+       complains about the use with just 1 arg.
+       * plugins/elements/gstfdsink.c:
+       * plugins/elements/gstfdsrc.c:
+       * plugins/elements/gstfilesink.c:
+       * plugins/elements/gstfilesrc.c:
+       Use correct return type for the uri handler implementations.
+
+       All these fix warnings in Forte.  Fixes bug #360860.
+
 2006-10-08  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/gstelement.h:

diff --git a/common b/common
index 83b08805d0c109b6dbdcfca0a8b9659b1c556480..efcacf2625da231fbee99b68e0f5db6816cf6fad 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 83b08805d0c109b6dbdcfca0a8b9659b1c556480
+Subproject commit efcacf2625da231fbee99b68e0f5db6816cf6fad

diff --git a/gst/gstmessage.h b/gst/gstmessage.h
index 23e3f2d8a7d3029063401aaaccb53b7770b7b9cd..32fd0b1a7f07d907cdd714ee007058a5a970b2d3 100644 (file)
--- a/gst/gstmessage.h
+++ b/gst/gstmessage.h
@@ -84,7 +84,7 @@ typedef enum
   GST_MESSAGE_SEGMENT_START     = (1 << 16),
   GST_MESSAGE_SEGMENT_DONE      = (1 << 17),
   GST_MESSAGE_DURATION          = (1 << 18),
-  GST_MESSAGE_ANY               = ~0
+  GST_MESSAGE_ANY               = G_MAXINT
 } GstMessageType;
 
 #include <gst/gstminiobject.h>

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 91514e61ceed15690409c63b1909512430f06225..c3a0e664204076a7991c1a7c4d292e4686be8eb3 100644 (file)
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -1913,7 +1913,7 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
     GstBuffer * buf)
 {
   GstFlowReturn result;
-  GstClockTime start = -1, end = -1;
+  GstClockTime start = GST_CLOCK_TIME_NONE, end = GST_CLOCK_TIME_NONE;
   GstSegment *clip_segment;
 
   if (G_UNLIKELY (basesink->flushing))

diff --git a/libs/gst/net/gstnetclientclock.c b/libs/gst/net/gstnetclientclock.c
index 1742330f0e4315c6f5704039b2f705fdfdace850..90137cd3ed1bd421ea8250a340b4b8c4e9712371 100644 (file)
--- a/libs/gst/net/gstnetclientclock.c
+++ b/libs/gst/net/gstnetclientclock.c
@@ -407,7 +407,7 @@ gst_net_client_clock_thread (gpointer data)
       continue;
     } else if (ret == 0) {
       /* timed out, let's send another packet */
-      DEBUG ("timed out");
+      DEBUG ("timed out %c", 0x32);
 
       packet = gst_net_time_packet_new (NULL);
 
@@ -434,7 +434,7 @@ gst_net_client_clock_thread (gpointer data)
       if (!packet)
         goto receive_error;
 
-      DEBUG ("got packet back");
+      DEBUG ("got packet back %c", 0x32);
       DEBUG ("local_1 = %" GST_TIME_FORMAT, GST_TIME_ARGS (packet->local_time));
       DEBUG ("remote = %" GST_TIME_FORMAT, GST_TIME_ARGS (packet->remote_time));
       DEBUG ("local_2 = %" GST_TIME_FORMAT, GST_TIME_ARGS (new_local));

diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c
index 1a8e66073adb6e9b31d53c7c3ff8e2f9e2eb20c5..e9f398e3c45eb56c1b42343bc4858dc410029abe 100644 (file)
--- a/plugins/elements/gstfdsink.c
+++ b/plugins/elements/gstfdsink.c
@@ -510,7 +510,7 @@ gst_fd_sink_get_property (GObject * object, guint prop_id, GValue * value,
 
 /*** GSTURIHANDLER INTERFACE *************************************************/
 
-static guint
+static GstURIType
 gst_fd_sink_uri_get_type (void)
 {
   return GST_URI_SINK;

diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c
index 77c5bd2e447c61db4a8fba7a98b14c38948d1fe0..d3fa65555b56d8c11990844221e19f4e3f9586c2 100644 (file)
--- a/plugins/elements/gstfdsrc.c
+++ b/plugins/elements/gstfdsrc.c
@@ -447,7 +447,7 @@ could_not_stat:
 
 /*** GSTURIHANDLER INTERFACE *************************************************/
 
-static guint
+static GstURIType
 gst_fd_src_uri_get_type (void)
 {
   return GST_URI_SRC;

diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c
index e7d9f751a10e9f760689b3814b44b465a9a4d731..5637539fbaf7e04ab2d34c85732e65ece0627493 100644 (file)
--- a/plugins/elements/gstfilesink.c
+++ b/plugins/elements/gstfilesink.c
@@ -508,7 +508,7 @@ gst_file_sink_stop (GstBaseSink * basesink)
 
 /*** GSTURIHANDLER INTERFACE *************************************************/
 
-static guint
+static GstURIType
 gst_file_sink_uri_get_type (void)
 {
   return GST_URI_SINK;

diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index 5010175e0bd59a5368656028ae2a2d5daf03e35a..f450f60cffe925d1d0a2c7c5dcd6bb381f932191 100644 (file)
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -1028,7 +1028,7 @@ gst_file_src_stop (GstBaseSrc * basesrc)
 
 /*** GSTURIHANDLER INTERFACE *************************************************/
 
-static guint
+static GstURIType
 gst_file_src_uri_get_type (void)
 {
   return GST_URI_SRC;