Skip to content

Remove deprecated/discouraged usages of JNA constructs #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2018
Merged

Remove deprecated/discouraged usages of JNA constructs #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e25ea
Replace usage of Pointer#SIZE with Native#POINTER_SIZE
matthiasblaesing May 24, 2018
3de2d46
Replace deprecated usage of Pointer#getString and Pointer#setString
matthiasblaesing May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/freedesktop/gstreamer/GObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private GObjectAPI.GParamSpec[] listProperties() {
int offset = 0;
for (int i = 0; i < len.getValue(); i++) {
props[i] = new GObjectAPI.GParamSpec(ptrs.getPointer(offset));
offset += Pointer.SIZE;
offset += Native.POINTER_SIZE;
}
return props;
}
Expand Down
11 changes: 6 additions & 5 deletions src/org/freedesktop/gstreamer/Gst.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.freedesktop.gstreamer.lowlevel.NativeObject;

import com.sun.jna.Memory;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.PointerByReference;
Expand Down Expand Up @@ -84,18 +85,18 @@ public NativeArgs(String progname, String[] args) {
// Allocate some native memory to pass the args down to the native layer
//
argsCopy = new Memory[args.length + 2];
argvMemory = new Memory(argsCopy.length * Pointer.SIZE);
argvMemory = new Memory(argsCopy.length * Native.POINTER_SIZE);

//
// Insert the program name as argv[0]
//
Memory arg = new Memory(progname.getBytes().length + 4);
arg.setString(0, progname, false);
arg.setString(0, progname);
argsCopy[0] = arg;

for (int i = 0; i < args.length; i++) {
arg = new Memory(args[i].getBytes().length + 1);
arg.setString(0, args[i], false);
arg.setString(0, args[i]);
argsCopy[i + 1] = arg;
}
argvMemory.write(0, argsCopy, 0, argsCopy.length);
Expand All @@ -109,9 +110,9 @@ String[] toStringArray() {
List<String> args = new ArrayList<String>();
Pointer argv = argvRef.getValue();
for (int i = 1; i < argcRef.getValue(); i++) {
Pointer arg = argv.getPointer(i * Pointer.SIZE);
Pointer arg = argv.getPointer(i * Native.POINTER_SIZE);
if (arg != null) {
args.add(arg.getString(0, false));
args.add(arg.getString(0));
}
}
return args.toArray(new String[args.size()]);
Expand Down
2 changes: 1 addition & 1 deletion src/org/freedesktop/gstreamer/TagList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public Object get(TagList tl, String tag, int index) {
if (value[0] == null) {
return null;
}
String ret = value[0].getString(0, false);
String ret = value[0].getString(0);
GLIB_API.g_free(value[0]);
return ret;
}
Expand Down
3 changes: 2 additions & 1 deletion src/org/freedesktop/gstreamer/lowlevel/BaseSinkAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

import com.sun.jna.Callback;
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.Pointer;

/**
Expand Down Expand Up @@ -220,7 +221,7 @@ public GstBaseSinkClass(Pointer ptr) {
public RenderList render_list;

/*< private >*/
public volatile byte[] _gst_reserved = new byte[Pointer.SIZE * BaseSinkAPI.GST_PADDING_LARGE];
public volatile byte[] _gst_reserved = new byte[Native.POINTER_SIZE * BaseSinkAPI.GST_PADDING_LARGE];

@Override
protected List<String> getFieldOrder() {
Expand Down
3 changes: 2 additions & 1 deletion src/org/freedesktop/gstreamer/lowlevel/BaseSrcAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

import com.sun.jna.Callback;
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.Union;
import com.sun.jna.ptr.LongByReference;
Expand Down Expand Up @@ -229,7 +230,7 @@ public GstBaseSrcClass(Pointer ptr) {
public PrepareSeek prepare_seek_segment;

/*< private >*/
public volatile byte[] _gst_reserved = new byte[Pointer.SIZE * (GST_PADDING_LARGE - 6)];
public volatile byte[] _gst_reserved = new byte[Native.POINTER_SIZE * (GST_PADDING_LARGE - 6)];

@Override
protected List<String> getFieldOrder() {
Expand Down
3 changes: 2 additions & 1 deletion src/org/freedesktop/gstreamer/lowlevel/BaseTransformAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import com.sun.jna.Callback;
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import java.util.Arrays;
Expand Down Expand Up @@ -175,7 +176,7 @@ public GstBaseTransformClass(Pointer ptr) {
public AcceptCaps accept_caps;

/*< private >*/
public volatile byte[] _gst_reserved = new byte[Pointer.SIZE * (GST_PADDING_LARGE - 3)];
public volatile byte[] _gst_reserved = new byte[Native.POINTER_SIZE * (GST_PADDING_LARGE - 3)];

@Override
protected List<String> getFieldOrder() {
Expand Down
3 changes: 2 additions & 1 deletion src/org/freedesktop/gstreamer/lowlevel/GObjectAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import com.sun.jna.Callback;
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.NativeLong;
import com.sun.jna.Pointer;
import com.sun.jna.Structure.ByReference;
Expand Down Expand Up @@ -178,7 +179,7 @@ public static final class GObjectClass extends com.sun.jna.Structure {
public Finalize finalize;
public volatile Pointer dispatch_properties_changed;
public Notify notify;
public volatile byte[] p_dummy = new byte[8 * Pointer.SIZE];
public volatile byte[] p_dummy = new byte[8 * Native.POINTER_SIZE];

public static interface Constructor extends Callback {
public Pointer callback(GType type, int n_construct_properties,
Expand Down
3 changes: 2 additions & 1 deletion src/org/freedesktop/gstreamer/lowlevel/GTypeMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.sun.jna.FromNativeConverter;
import com.sun.jna.MethodParameterContext;
import com.sun.jna.MethodResultContext;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.StructureReadContext;
import com.sun.jna.ToNativeContext;
Expand Down Expand Up @@ -230,7 +231,7 @@ public Object fromNative(Object arg0, FromNativeContext arg1) {
}

public Class<?> nativeType() {
return Pointer.SIZE == 8 ? Long.class : Integer.class;
return Native.POINTER_SIZE == 8 ? Long.class : Integer.class;
}
};
private TypeConverter querytypeConverter = new TypeConverter() {
Expand Down
3 changes: 2 additions & 1 deletion src/org/freedesktop/gstreamer/lowlevel/GstAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.freedesktop.gstreamer.lowlevel.annotations.CallerOwnsReturn;

import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.PointerByReference;
Expand Down Expand Up @@ -87,7 +88,7 @@ public GstSegmentStruct(int flags, double rate, double applied_rate, Format form
public long duration;

/*< private >*/
public volatile byte[] _gst_reserved = new byte[(Pointer.SIZE * GST_PADDING) - (Double.SIZE / 8)];
public volatile byte[] _gst_reserved = new byte[(Native.POINTER_SIZE * GST_PADDING) - (Double.SIZE / 8)];

@Override
protected List<String> getFieldOrder() {
Expand Down
7 changes: 3 additions & 4 deletions src/org/freedesktop/gstreamer/lowlevel/GstPadTemplateAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.freedesktop.gstreamer.lowlevel;

import com.sun.jna.Native;
import org.freedesktop.gstreamer.Caps;
import org.freedesktop.gstreamer.Pad;
import org.freedesktop.gstreamer.PadDirection;
Expand All @@ -29,8 +30,6 @@

import com.sun.jna.Pointer;
import com.sun.jna.PointerType;
import java.util.Arrays;
import java.util.List;

/**
* GstPadTemplate functions
Expand Down Expand Up @@ -69,11 +68,11 @@ public String getName() {
}

public PadDirection getPadDirection() {
return PadDirection.values()[getPointer().getInt(Pointer.SIZE)];
return PadDirection.values()[getPointer().getInt(Native.POINTER_SIZE)];
}

public PadPresence getPadPresence() {
return PadPresence.values()[getPointer().getInt(Pointer.SIZE + 4)];
return PadPresence.values()[getPointer().getInt(Native.POINTER_SIZE + 4)];
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/org/freedesktop/gstreamer/lowlevel/IntPtr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
*/
package org.freedesktop.gstreamer.lowlevel;

import com.sun.jna.Pointer;
import com.sun.jna.Native;

@SuppressWarnings("serial")
public class IntPtr extends Number {
public final Number value;
public IntPtr(int value) {
this.value = Pointer.SIZE == 8 ? new Long(value) : new Integer(value);
this.value = Native.POINTER_SIZE == 8 ? new Long(value) : new Integer(value);
}

public String toString() {
Expand Down