From f97b03672bafb9c6f4f4e88e8944aa7552fed7b8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Mon, 21 Mar 2005 17:34:02 +0000
Subject: [PATCH] gdp: Next big merge.

Original commit message from CVS:
Next big merge.
Added GstBus for mainloop integration.
Added GstMessage for sending notifications on the bus.
Added GstTask as an abstraction for pipeline entry points.
Removed GstThread.
Removed Schedulers.
Simplified GstQueue for multithreaded core.
Made _link threadsafe, removed old capsnego.
Added STREAM_LOCK and PREROLL_LOCK in GstPad.
Added pad blocking functions.
Reworked scheduling functions in GstPad to prepare for
scheduling updates soon.
Moved events out of data stream.
Simplified GstEvent types.
Added return values to push/pull.
Removed clocking from GstElement.
Added prototypes for state change function for next merge.
Removed iterate from bins and state change management.
Fixed some elements, disabled others for now.
Fixed -inspect and -launch.
Added check for GstBus.
---
 gst/gdp/dataprotocol.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c
index b271883c37..0ae75af0f0 100644
--- a/gst/gdp/dataprotocol.c
+++ b/gst/gdp/dataprotocol.c
@@ -324,22 +324,12 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags,
       return FALSE;
     case GST_EVENT_EOS:
     case GST_EVENT_FLUSH:
-    case GST_EVENT_EMPTY:
     case GST_EVENT_DISCONTINUOUS:
       GST_WRITE_UINT64_BE (h + 8, GST_EVENT_TIMESTAMP (event));
       pl_length = 0;
       *payload = NULL;
       break;
     case GST_EVENT_SEEK:
-      pl_length = 4 + 8 + 4;
-      *payload = g_malloc0 (pl_length);
-      GST_WRITE_UINT32_BE (*payload, (guint32) GST_EVENT_SEEK_TYPE (event));
-      GST_WRITE_UINT64_BE (*payload + 4,
-          (guint64) GST_EVENT_SEEK_OFFSET (event));
-      GST_WRITE_UINT32_BE (*payload + 12,
-          (guint32) GST_EVENT_SEEK_ACCURACY (event));
-      break;
-    case GST_EVENT_SEEK_SEGMENT:
       pl_length = 4 + 8 + 8 + 4;
       *payload = g_malloc0 (pl_length);
       GST_WRITE_UINT32_BE (*payload, (guint32) GST_EVENT_SEEK_TYPE (event));
@@ -351,12 +341,8 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags,
           (guint32) GST_EVENT_SEEK_ACCURACY (event));
       break;
     case GST_EVENT_QOS:
-    case GST_EVENT_SEGMENT_DONE:
     case GST_EVENT_SIZE:
     case GST_EVENT_RATE:
-    case GST_EVENT_FILLER:
-    case GST_EVENT_TS_OFFSET:
-    case GST_EVENT_INTERRUPT:
     case GST_EVENT_NAVIGATION:
     case GST_EVENT_TAG:
       g_warning ("Unhandled event type %d, ignoring", GST_EVENT_TYPE (event));
@@ -489,26 +475,11 @@ gst_dp_event_from_packet (guint header_length, const guint8 * header,
       return FALSE;
     case GST_EVENT_EOS:
     case GST_EVENT_FLUSH:
-    case GST_EVENT_EMPTY:
     case GST_EVENT_DISCONTINUOUS:
       event = gst_event_new (type);
       GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header);
       break;
     case GST_EVENT_SEEK:
-    {
-      GstSeekType type;
-      gint64 offset;
-      GstSeekAccuracy accuracy;
-
-      type = (GstSeekType) GST_READ_UINT32_BE (payload);
-      offset = (gint64) GST_READ_UINT64_BE (payload + 4);
-      accuracy = (GstSeekAccuracy) GST_READ_UINT32_BE (payload + 12);
-      event = gst_event_new_seek (type, offset);
-      GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header);
-      GST_EVENT_SEEK_ACCURACY (event) = accuracy;
-      break;
-    }
-    case GST_EVENT_SEEK_SEGMENT:
     {
       GstSeekType type;
       gint64 offset, endoffset;
@@ -524,12 +495,8 @@ gst_dp_event_from_packet (guint header_length, const guint8 * header,
       break;
     }
     case GST_EVENT_QOS:
-    case GST_EVENT_SEGMENT_DONE:
     case GST_EVENT_SIZE:
     case GST_EVENT_RATE:
-    case GST_EVENT_FILLER:
-    case GST_EVENT_TS_OFFSET:
-    case GST_EVENT_INTERRUPT:
     case GST_EVENT_NAVIGATION:
     case GST_EVENT_TAG:
       g_warning ("Unhandled event type %d, ignoring", GST_EVENT_TYPE (event));