From 9ba5e6cfe66c1ecafb405f6688cbfa9d89987b2d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Sat, 24 May 2003 10:41:58 +0000
Subject: [PATCH] UNITS -> DEFAULT

Original commit message from CVS:
UNITS -> DEFAULT
---
 ext/sidplay/gstsiddec.cc        | 12 +++---------
 gst-libs/gst/video/video.c      |  2 +-
 gst/monkeyaudio/gstmonkeydec.cc |  6 +-----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index 4caf21e6d5..1e94235654 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -476,13 +476,11 @@ gst_siddec_src_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
   switch (src_format) {
     case GST_FORMAT_BYTES:
       switch (*dest_format) {
-        case GST_FORMAT_UNITS:
+        case GST_FORMAT_DEFAULT:
           if (bytes_per_sample == 0)
             return FALSE;
           *dest_value = src_value / bytes_per_sample;
           break;
-        case GST_FORMAT_DEFAULT:
-          *dest_format = GST_FORMAT_TIME;
         case GST_FORMAT_TIME:
         {
            gint byterate = bytes_per_sample * siddec->config->frequency;
@@ -496,13 +494,11 @@ gst_siddec_src_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
            res = FALSE;
       }
       break;
-    case GST_FORMAT_UNITS:
+    case GST_FORMAT_DEFAULT:
       switch (*dest_format) {
         case GST_FORMAT_BYTES:
           *dest_value = src_value * bytes_per_sample;
           break;
-        case GST_FORMAT_DEFAULT:
-          *dest_format = GST_FORMAT_TIME;
         case GST_FORMAT_TIME:
           if (siddec->config->frequency == 0)
             return FALSE;
@@ -514,12 +510,10 @@ gst_siddec_src_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
       break;
     case GST_FORMAT_TIME:
       switch (*dest_format) {
-        case GST_FORMAT_DEFAULT:
-          *dest_format = GST_FORMAT_BYTES;
         case GST_FORMAT_BYTES:
           scale = bytes_per_sample;
           /* fallthrough */
-        case GST_FORMAT_UNITS:
+        case GST_FORMAT_DEFAULT:
           *dest_value = src_value * scale * siddec->config->frequency / GST_SECOND;
           break;
         default:
diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c
index 7c8b4852cf..a265c5e6bd 100644
--- a/gst-libs/gst/video/video.c
+++ b/gst-libs/gst/video/video.c
@@ -27,7 +27,7 @@
 gdouble
 gst_video_frame_rate (GstPad *pad)
 {
-  GstFormat dest_format = GST_FORMAT_UNITS;
+  GstFormat dest_format = GST_FORMAT_DEFAULT;
   gint64 dest_value = 0;
   gdouble fps;
 
diff --git a/gst/monkeyaudio/gstmonkeydec.cc b/gst/monkeyaudio/gstmonkeydec.cc
index daf60b00db..cf489c118e 100644
--- a/gst/monkeyaudio/gstmonkeydec.cc
+++ b/gst/monkeyaudio/gstmonkeydec.cc
@@ -138,7 +138,7 @@ gst_monkeydec_get_formats (GstPad *pad)
 {
   static const GstFormat src_formats[] = {
 /*    GST_FORMAT_BYTES,
-    GST_FORMAT_UNITS,*/
+    GST_FORMAT_DEFAULT,*/
     GST_FORMAT_TIME,
     (GstFormat)0
   };
@@ -177,8 +177,6 @@ gst_monkeydec_src_query (GstPad *pad, GstQueryType type,
   switch (type) {
     case GST_QUERY_TOTAL:
       switch (*format) {
-        case GST_FORMAT_DEFAULT:
-            *format = GST_FORMAT_TIME;
         case GST_FORMAT_TIME:
             *value = monkeydec->decomp->GetInfo (APE_DECOMPRESS_LENGTH_MS) * 1000000LL;
             break;
@@ -189,8 +187,6 @@ gst_monkeydec_src_query (GstPad *pad, GstQueryType type,
       break;
     case GST_QUERY_POSITION:
       switch (*format) {
-         case GST_FORMAT_DEFAULT:
-           *format = GST_FORMAT_TIME;
          default:
            *value = monkeydec->decomp->GetInfo (APE_DECOMPRESS_CURRENT_MS) * 1000000LL;  
            break;