gst: Don't pass miniobjects to GST_DEBUG_OBJECT() and similar macros

[platform/upstream/gstreamer.git] / gst / glib-compat.c

diff --git a/gst/glib-compat.c b/gst/glib-compat.c
index cc6a05c..bb4c17f 100644 (file)
--- a/gst/glib-compat.c
+++ b/gst/glib-compat.c
@@ -3,26 +3,21 @@
  * Functions copied from glib 2.6 and 2.8
  *
  * Copyright 2005 David Schleef <ds@schleef.org>
- */
-
-/* gfileutils.c - File utility functions
  *
- *  Copyright 2000 Red Hat, Inc.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
@@ -41,98 +36,9 @@
 #include <unistd.h>
 #endif
 #include <sys/types.h>
-#if 0
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#ifndef G_OS_WIN32
-#include <sys/wait.h>
-#endif
-#include <fcntl.h>
-#endif
-
 
 #ifdef G_OS_WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <io.h>
 #endif /* G_OS_WIN32 */
-
-
-#ifdef G_OS_WIN32
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-#else
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-#endif
-
-
-/**
- * gst_flags_get_first_value:
- * @flags_class: a #GFlagsClass
- * @value: the value
- *
- * Returns the first GFlagsValue which is set in value.
- *
- * This version is copied from GLib 2.8.
- * In GLib 2.6, it didn't check for a flag value being NULL, hence it
- * hits an infinite loop in our flags serialize function
- *
- * Returns: the first GFlagsValue which is set in value, or NULL if none is set.
- */
-GFlagsValue *
-gst_flags_get_first_value (GFlagsClass * flags_class, guint value)
-{
-  g_return_val_if_fail (G_IS_FLAGS_CLASS (flags_class), NULL);
-
-  if (flags_class->n_values) {
-    GFlagsValue *flags_value;
-
-    if (value == 0) {
-      for (flags_value = flags_class->values; flags_value->value_name;
-          flags_value++)
-        if (flags_value->value == 0)
-          return flags_value;
-    } else {
-      for (flags_value = flags_class->values; flags_value->value_name;
-          flags_value++)
-        if (flags_value->value != 0
-            && (flags_value->value & value) == flags_value->value)
-          return flags_value;
-    }
-  }
-
-  return NULL;
-}
-
-/* Adapted from g_value_dup_object to use gst_object_ref */
-#include "gstobject.h"
-/**
- * g_value_dup_gst_object:
- * @value: the #GstObject value to dup
- *
- * Get the contents of a G_TYPE_OBJECT derived GValue, increasing its reference count.
- * This function exists because of unsafe reference counting in old glib versions.
- *
- * Returns: object content of value, should be unreferenced with gst_object_unref()
- * when no longer needed.
- */
-GObject *
-g_value_dup_gst_object (const GValue * value)
-{
-  GObject *o;
-
-  g_return_val_if_fail (G_VALUE_HOLDS_OBJECT (value), NULL);
-
-  o = value->data[0].v_pointer;
-  if (!o)
-    return NULL;
-  g_return_val_if_fail (GST_IS_OBJECT (o), NULL);
-  return gst_object_ref (o);
-}