summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosep Torre Valles <josep@fluendo.com>2006-10-09 09:32:29 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2006-10-09 09:32:29 +0000
commit2f32e21d72de4946f8f4bdeff0fabbc27f808019 (patch)
tree297820be4101fc51744eeef9c7d862ad3c93b78b
parent0ca5590961783291957ef6f57e58f5b3d9806e4f (diff)
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.
-rw-r--r--ChangeLog21
m---------common0
-rw-r--r--gst/gstmessage.h2
-rw-r--r--libs/gst/base/gstbasesink.c2
-rw-r--r--libs/gst/net/gstnetclientclock.c4
-rw-r--r--plugins/elements/gstfdsink.c2
-rw-r--r--plugins/elements/gstfdsrc.c2
-rw-r--r--plugins/elements/gstfilesink.c2
-rw-r--r--plugins/elements/gstfilesrc.c2
9 files changed, 29 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e4cca999..ad54986f4 100644
--- 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
-Subproject 83b08805d0c109b6dbdcfca0a8b9659b1c55648
+Subproject efcacf2625da231fbee99b68e0f5db6816cf6fa
diff --git a/gst/gstmessage.h b/gst/gstmessage.h
index 23e3f2d8a..32fd0b1a7 100644
--- 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 91514e61c..c3a0e6642 100644
--- 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 1742330f0..90137cd3e 100644
--- 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 1a8e66073..e9f398e3c 100644
--- 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 77c5bd2e4..d3fa65555 100644
--- 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 e7d9f751a..5637539fb 100644
--- 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 5010175e0..f450f60cf 100644
--- 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;