Merge pull request #64 from gstreamer-java/revert-59-GDate

Revert "gst_date_time_get_type() shall not be associated with GDate"

Author: neilcsmith-net

src/org/freedesktop/gstreamer/DateTime.java

@@ -1,5 +1,4 @@
 /* 
- * Copyright (c) 2016 Christophe Lafolet
  * Copyright (c) 2010 Levente Farkas
  * 
  * This code is free software: you can redistribute it and/or modify it under 
@@ -17,20 +16,16 @@
 
 package org.freedesktop.gstreamer;
 
-import static org.freedesktop.gstreamer.lowlevel.GstDateTimeAPI.GSTDATETIME_API;
+import com.sun.jna.Pointer;
 
-import org.freedesktop.gstreamer.lowlevel.GType;
 import org.freedesktop.gstreamer.lowlevel.NativeObject;
 
-import com.sun.jna.Pointer;
+import static org.freedesktop.gstreamer.lowlevel.GstDateTimeAPI.GSTDATETIME_API;
 
 /**
  */
 public class DateTime extends NativeObject {
-	
     public static final String GTYPE_NAME = "GstDateTime";
-    public static final GType GTYPE = GSTDATETIME_API.gst_date_time_get_type();
-
 
     public static DateTime createInstanceLocalEpoch(long secs) {
     	return new DateTime(GSTDATETIME_API.gst_date_time_new_from_unix_epoch_local_time(secs), false, true);
@@ -39,7 +34,6 @@ public static DateTime createInstanceLocalEpoch(long secs) {
     public DateTime(Initializer init) {
         super(init); 
     }
-    
     public DateTime(Pointer ptr, boolean needRef, boolean ownsHandle) {
         this(initializer(ptr, needRef, ownsHandle));
     }
@@ -49,37 +43,4 @@ protected void disposeNativeHandle(Pointer ptr) {
     	GSTDATETIME_API.gst_date_time_unref(ptr);
     }
 
-    public int getYear() {
-        return GSTDATETIME_API.gst_date_time_get_year(handle());
-    }
-    
-    public int getMonth() {
-        return GSTDATETIME_API.gst_date_time_get_month(handle());
-    }
-    
-    public int getDay() {
-        return GSTDATETIME_API.gst_date_time_get_day(handle());
-    }
-
-    public int getHour() {
-        return GSTDATETIME_API.gst_date_time_get_hour(handle());
-    }
-    
-    public int getMinute() {
-        return GSTDATETIME_API.gst_date_time_get_minute(handle());
-    }
-
-    public int getSecond() {
-        return GSTDATETIME_API.gst_date_time_get_second(handle());
-    }
-
-    public int getMicrosecond() {
-        return GSTDATETIME_API.gst_date_time_get_microsecond(handle());
-    }
-
-    @Override
-    public String toString() {
-        return "" + getYear() + "-" + getMonth() + "-" + getDay() + " " + getHour() + ":" + getMinute() + ":" + getSecond() + "." + getMicrosecond();
-    }
-
 }

src/org/freedesktop/gstreamer/TagList.java

@@ -1,5 +1,4 @@
 /* 
- * Copyright (c) 2016 Christophe Lafolet
  * Copyright (c) 2014 Tom Greenwood <[email protected]>
  * Copyright (c) 2007 Wayne Meissner
  * 
@@ -21,8 +20,6 @@
 package org.freedesktop.gstreamer;
 
 import static org.freedesktop.gstreamer.lowlevel.GlibAPI.GLIB_API;
-import static org.freedesktop.gstreamer.lowlevel.GstTagAPI.GSTTAG_API;
-import static org.freedesktop.gstreamer.lowlevel.GstTagListAPI.GSTTAGLIST_API;
 
 import java.util.AbstractList;
 import java.util.HashMap;
@@ -31,12 +28,15 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.PointerByReference;
+
 import org.freedesktop.gstreamer.glib.GDate;
 import org.freedesktop.gstreamer.lowlevel.GType;
 import org.freedesktop.gstreamer.lowlevel.GstTagListAPI;
 
-import com.sun.jna.Pointer;
-import com.sun.jna.ptr.PointerByReference;
+import static org.freedesktop.gstreamer.lowlevel.GstTagAPI.GSTTAG_API;
+import static org.freedesktop.gstreamer.lowlevel.GstTagListAPI.GSTTAGLIST_API;
 
 /**
  * List of tags and values used to describe media metadata.
@@ -280,17 +280,6 @@ public Object get(TagList tl, String tag, int index) {
                     return new GDate(value.getValue(), false, true);
                 }
             });
-            put(DateTime.GTYPE, new TagGetter() {
-                public Object get(TagList tl, String tag, int index) {
-                    PointerByReference value = new PointerByReference();
-                    GSTTAGLIST_API.gst_tag_list_get_date_time_index(tl, tag, index, value);
-                    if (value.getValue() == null) {
-                        return null;
-                    }
-                    return new DateTime(value.getValue(), false, true);
-                }
-            });
-
         }};
         static private final Map<String, GType> tagTypeMap = new ConcurrentHashMap<String, GType>();
     }

src/org/freedesktop/gstreamer/glib/GDate.java

@@ -1,5 +1,4 @@
 /* 
- * Copyright (c) 2016 Christophe Lafolet
  * Copyright (c) 2007 Wayne Meissner
  * 
  * This file is part of gstreamer-java.
@@ -19,15 +18,17 @@
 
 package org.freedesktop.gstreamer.glib;
 
+import static org.freedesktop.gstreamer.lowlevel.GstDateTimeAPI.GSTDATETIME_API;
+
 import org.freedesktop.gstreamer.lowlevel.GType;
 import org.freedesktop.gstreamer.lowlevel.GlibAPI;
 import org.freedesktop.gstreamer.lowlevel.NativeObject;
 
 import com.sun.jna.Pointer;
 
 public class GDate extends NativeObject {
-	public static final String GTYPE_NAME = "GDate";
-	public static final GType GTYPE = GType.valueOf(GTYPE_NAME); 
+	// it's by desing GstDate and not GDate see gstreamer source
+	public static final String GTYPE_NAME = "GstDate";
 
     public static GDate createInstance(int day, int month, int year) {
     	return new GDate(GlibAPI.GLIB_API.g_date_new_dmy(day, month , year), false, true);
@@ -36,6 +37,8 @@ public static GDate createInstance(int julian_day) {
     	return new GDate(GlibAPI.GLIB_API.g_date_new_julian(julian_day), false, true);
     }
 
+    public static final GType GTYPE = GSTDATETIME_API.gst_date_time_get_type();
+
     public GDate(Initializer init) {
         super(init);
     }

src/org/freedesktop/gstreamer/lowlevel/GlibAPI.java

@@ -18,9 +18,7 @@
  */
 
 package org.freedesktop.gstreamer.lowlevel;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 
 import org.freedesktop.gstreamer.lowlevel.annotations.CallerOwnsReturn;
 
@@ -29,6 +27,8 @@
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.PointerByReference;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  *
@@ -106,7 +106,6 @@ int g_timeout_add_full(int priority, int interval, GSourceFunc function,
     void g_source_remove(int id);
     void g_free(Pointer ptr);
 
-//    GType g_date_get_type();
     Pointer g_date_new();
     Pointer g_date_new_dmy(int day, int month, int year);
     Pointer g_date_new_julian(int julian_day);