changeset in /hg/pulseaudio: 2009-09-08 Omair Majid <omajid at redh...
Omair Majid
omajid at redhat.com
Mon Sep 8 11:16:09 PDT 2008
changeset 239695497634 in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=239695497634
description:
2009-09-08 Omair Majid <omajid at redhat.com>
* src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
Changed type of contextPointer and mainloopPointer to byte[] from long.
(native_set_sink_volume): Changed type of first paramter to byte[] to
store a pointer reliably.
(setVolume): Likewise.
(getContextPointer): Changed return type to byte[].
(getMainLoopPointer): Likewise.
(nativeUpdateTargetPortNameList): Likewise.
(nativeUpdateSourcePortList): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/Operation.java
Changed type of operationPoiter to byte[] from long.
(Operation): Changed type of first prameter to byte[] from long. Fixed
comparisons to work with byte[].
(finalize): Fixed comparisons to work with byte[].
(addReference): Likewise.
(releaseReference): Likewise.
(isNull): Likewise.
(getState): Likewise.
* src/java/org/classpath/icedtea/pusleaudio/PulseAudioClip.java
(native_setVolume): Changed return type to byte[].
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java
(native_setVolume): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java
Changed type of contextPointer to byte[].
(native_setVolume): Changed return type to byte[].
(native_updateVolumeInfo): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
(native_setVolume): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/PulseAuiodSourcePort.java
(native_setVolume): Likewise.
(native_updateVolumeInfo): Likewise.
* src/java/org/classpath/icedtea/pulseuaiod/PulseAudioTargetDataLine.java
Changed type of streamPointer to byte[].
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
(native_setVolume): Changed return type to byte[].
(native_updateVolumeInfo): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java
Changed type of streamPointer to byte[].
* src/java/org/classpath/icedtea/pulseaudio/Stream.java
Changed type of streamPointer to byte[].
(native_pa_stream_new): Changed type of pointer paramters to byte[].
(native_pa_stream_get_context): Changed return type to byte[].
(native_pa_stream_connect_playback): Changed type of pointer parameters to
byte[].
(native_pa_stream_connect_record): Likewise.
(native_pa_stream_drain): Changed return type to byte[].
(native_pa_stream_cork): Likewise.
(native_pa_stream_flush): Likewise.
(native_pa_stream_trigger): Likewise.
(native_pa_stream_set_name): Likewise.
(native_pa_stream_set_buffer_attr): Likewise.
(native_pa_stream_update_sample_rate): Likewise.
(native_setVolume): Likewise.
(Stream): Changed type of pointer paramters to byte[] from long.
(getContextPointer): Changed return type to byte[].
(connectForPlayback): Changed parameter values to work with byte[].
(connectForRecording): Likewise.
(getStreamPointer): Changed return type to byte[].
* src/native/jni-common.c
(getJavaByteArrayField): New function. Returns the byte[] corresponding to
an object's field.
(setJavaByteArrayFiled): New function. Sets the byte[] of an object's
field.
(getLockObject): Fixed class descriptor.
(notifyWaitingOperations): Likewise.
(getJavaPointer): Use the byte[] to obtain the pointer's contents.
(setJavaPointer): Use the byte[] to set the pointer's contents.
(convertJavaLongToPointer): Removed method.
(convertJavaPointerToNative): New method. Converts a byte[] into a void*.
(convertJavaPointerToLong: Removed method.
(convertNativePointerToJava): New method. Converts a void* into a byte[].
* src/native/jni-common.h
Removed jPointer data type.
(getByteArrayField): New method.
(setByteArrayField): New method.
(convertJavaLongToPointer): Removed method.
(convertPointerToJavaLong): Likewise.
(convertJavaPointerToNative): New method.
(convertNativePointerToJava): Likewise.
* src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
(Java_org_classpath_icedtea_pulseaudio_EventLoop_nativeUpdateTargetPortNameList):
Fixed method to work with a byte[].
(Java_org_classpath_icedtea_pulseaudio_EventLoop_nativeUpdateSourcePortNameList):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1set_1sink_1volume):
Likewise.
* src/native/org_classapath_icedtea_pulseaudio_PulseAudioSourcePort.c
(Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1updateVolumeInfo):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1setVolume):
Likewise.
* src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
(Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1updateVolumeInfo):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1setVolume):
Likewise.
* src/native/org_classpath_icedtea_pulseaudio_Stream.c
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1get_1context):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1connect_1playback):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1connect_1record):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1drain):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1cork):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1flush):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1trigger):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1set_1name):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1set_1buffer_1attr):
Likewise.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1update_1sample_1rate):
Likewise.
(JNICALL Java_org_classpath_icedtea_pulseaudio_Stream_native_1setVolume):
Likewise.
diffstat:
17 files changed, 308 insertions(+), 263 deletions(-)
src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 18 -
src/java/org/classpath/icedtea/pulseaudio/Operation.java | 20 -
src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 2
src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 2
src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 6
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 2
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 4
src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 2
src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 4
src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 2
src/java/org/classpath/icedtea/pulseaudio/Stream.java | 46 +-
src/native/jni-common.c | 180 ++++------
src/native/jni-common.h | 76 +---
src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 35 +
src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 24 +
src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 25 +
src/native/org_classpath_icedtea_pulseaudio_Stream.c | 123 +++---
diffs (truncated from 1194 to 500 lines):
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Mon Sep 08 11:09:02 2008 -0400
@@ -89,7 +89,7 @@ public class EventLoop implements Runnab
private native void native_shutdown();
- private native void native_set_sink_volume(long streamPointer, int volume);
+ private native void native_set_sink_volume(byte[] streamPointer, int volume);
/*
* These fields hold pointers
@@ -97,9 +97,9 @@ public class EventLoop implements Runnab
*
*/
@SuppressWarnings("unused")
- private long contextPointer;
+ private byte[] contextPointer;
@SuppressWarnings("unused")
- private long mainloopPointer;
+ private byte[] mainloopPointer;
/*
*
@@ -230,23 +230,23 @@ public class EventLoop implements Runnab
}
- public void setVolume(long streamPointer, int volume) {
+ public void setVolume(byte[] streamPointer, int volume) {
synchronized (threadLock) {
native_set_sink_volume(streamPointer, volume);
}
}
- public long getContextPointer() {
+ public byte[] getContextPointer() {
return contextPointer;
}
- public long getMainLoopPointer() {
+ public byte[] getMainLoopPointer() {
return mainloopPointer;
}
- private native long nativeUpdateTargetPortNameList();
-
- private native long nativeUpdateSourcePortNameList();
+ private native byte[] nativeUpdateTargetPortNameList();
+
+ private native byte[] nativeUpdateSourcePortNameList();
protected synchronized List<String> updateTargetPortNameList() {
targetPortNameList = new ArrayList<String>();
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/Operation.java
--- a/src/java/org/classpath/icedtea/pulseaudio/Operation.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/Operation.java Mon Sep 08 11:09:02 2008 -0400
@@ -51,7 +51,7 @@ import java.io.IOException;
public class Operation {
- long operationPointer;
+ byte[] operationPointer;
EventLoop eventLoop;
public enum State {
@@ -77,8 +77,8 @@ public class Operation {
private native int native_get_state();
- public Operation(long operationPointer) {
- assert (operationPointer != 0);
+ public Operation(byte[] operationPointer) {
+ assert (operationPointer != null);
this.operationPointer = operationPointer;
this.eventLoop = EventLoop.getEventLoop();
}
@@ -86,34 +86,34 @@ public class Operation {
@Override
protected void finalize() throws Throwable {
// might catch operations which havent been released
- assert (operationPointer == 0);
+ assert (operationPointer == null);
super.finalize();
}
public void addReference() {
- assert (operationPointer != 0);
+ assert (operationPointer != null);
synchronized (eventLoop.threadLock) {
native_ref();
}
}
public void releaseReference() {
- assert (operationPointer != 0);
+ assert (operationPointer != null);
synchronized (eventLoop.threadLock) {
native_unref();
}
- operationPointer = 0;
+ operationPointer = null;
}
public boolean isNull() {
- if (operationPointer == 0) {
+ if (operationPointer == null) {
return true;
}
return false;
}
public State getState() {
- assert (operationPointer != 0);
+ assert (operationPointer != null);
int state;
synchronized (eventLoop.threadLock) {
state = native_get_state();
@@ -132,7 +132,7 @@ public class Operation {
}
public void waitForCompletion() {
- assert (operationPointer != 0);
+ assert (operationPointer != null);
do {
synchronized (eventLoop.threadLock) {
if (getState() == Operation.State.Done) {
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Mon Sep 08 11:09:02 2008 -0400
@@ -313,7 +313,7 @@ public class PulseAudioClip extends Puls
}
- public long native_setVolume(float value) {
+ public byte[] native_setVolume(float value) {
return stream.native_setVolume(value);
}
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java Mon Sep 08 11:09:02 2008 -0400
@@ -39,7 +39,7 @@ package org.classpath.icedtea.pulseaudio
interface PulseAudioPlaybackLine {
- long native_setVolume(float value);
+ byte[] native_setVolume(float value);
boolean isMuted();
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java Mon Sep 08 11:09:02 2008 -0400
@@ -51,7 +51,7 @@ public abstract class PulseAudioPort ext
* Variable used in native code
*/
@SuppressWarnings("unused")
- private long contextPointer;
+ private byte[] contextPointer;
@SuppressWarnings("unused")
private int channels;
@@ -78,9 +78,9 @@ public abstract class PulseAudioPort ext
System.out.println("Opened Target Port " + name);
}
- public abstract long native_setVolume(float newValue);
+ public abstract byte[] native_setVolume(float newValue);
- public abstract long native_updateVolumeInfo();
+ public abstract byte[] native_updateVolumeInfo();
public boolean isMuted() {
return muted;
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Mon Sep 08 11:09:02 2008 -0400
@@ -82,7 +82,7 @@ public class PulseAudioSourceDataLine ex
}
- public long native_setVolume(float value) {
+ public byte[] native_setVolume(float value) {
return stream.native_setVolume(value);
}
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java Mon Sep 08 11:09:02 2008 -0400
@@ -45,9 +45,9 @@ public class PulseAudioSourcePort extend
super(name, eventLoop);
}
- public native long native_setVolume(float newValue);
+ public native byte[] native_setVolume(float newValue);
- public synchronized native long native_updateVolumeInfo();
+ public synchronized native byte[] native_updateVolumeInfo();
@Override
public javax.sound.sampled.Line.Info getLineInfo() {
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Mon Sep 08 11:09:02 2008 -0400
@@ -47,7 +47,7 @@ public class PulseAudioTargetDataLine ex
private long currentFramePosition = 0;
@SuppressWarnings("unused")
- private long streamPointer;
+ private byte[] streamPointer;
public PulseAudioTargetDataLine(EventLoop eventLoop, AudioFormat[] formats,
AudioFormat defaultFormat) {
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java Mon Sep 08 11:09:02 2008 -0400
@@ -45,9 +45,9 @@ public class PulseAudioTargetPort extend
super(name, eventLoop);
}
- public native long native_setVolume(float newValue);
+ public native byte[] native_setVolume(float newValue);
- public synchronized native long native_updateVolumeInfo();
+ public synchronized native byte[] native_updateVolumeInfo();
@Override
public javax.sound.sampled.Line.Info getLineInfo() {
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java Mon Sep 08 11:09:02 2008 -0400
@@ -56,7 +56,7 @@ class PulseAudioVolumeControl extends Fl
}
@SuppressWarnings("unused")
- private long streamPointer;
+ private byte[] streamPointer;
private EventLoop eventLoop;
private PulseAudioPlaybackLine line;
diff -r c0fcd9764516 -r 239695497634 src/java/org/classpath/icedtea/pulseaudio/Stream.java
--- a/src/java/org/classpath/icedtea/pulseaudio/Stream.java Thu Sep 04 14:23:50 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/Stream.java Mon Sep 08 11:09:02 2008 -0400
@@ -96,7 +96,7 @@ public class Stream {
public static final String DEFAULT_DEVICE = null;
@SuppressWarnings("unused")
- private long streamPointer;
+ private byte[] streamPointer;
static {
try {
@@ -123,12 +123,12 @@ public class Stream {
private List<MovedListener> movedListeners;
private List<SuspendedListener> suspendedListeners;
- private native void native_pa_stream_new(long contextPointer, String name,
+ private native void native_pa_stream_new(byte[] contextPointer, String name,
String format, int sampleRate, int channels);
private native int native_pa_stream_get_state();
- private native long native_pa_stream_get_context();
+ private native byte[] native_pa_stream_get_context();
private native int native_pa_stream_get_index();
@@ -141,14 +141,14 @@ public class Stream {
private native int native_pa_stream_connect_playback(String name,
int bufferMaxLength, int bufferTargetLength,
int bufferPreBuffering, int bufferMinimumRequest,
- int bufferFragmentSize, int flags, long volumePointer,
- long sync_streamPointer);
+ int bufferFragmentSize, int flags, byte[] volumePointer,
+ byte[] sync_streamPointer);
private native int native_pa_stream_connect_record(String name,
int bufferMaxLength, int bufferTargetLength,
int bufferPreBuffering, int bufferMinimumRequest,
- int bufferFragmentSize, int flags, long volumePointer,
- long sync_streamPointer);
+ int bufferFragmentSize, int flags, byte[] volumePointer,
+ byte[] sync_streamPointer);
private native int native_pa_stream_disconnect();
@@ -166,7 +166,7 @@ public class Stream {
private native int native_pa_stream_readable_size();
- private native long native_pa_stream_drain();
+ private native byte[] native_pa_stream_drain();
/*
* pa_operation pa_stream_update_timing_info (pa_stream *p,
@@ -174,9 +174,9 @@ public class Stream {
* structure update for a stream.
*/
- private native long native_pa_stream_cork(int b);
-
- private native long native_pa_stream_flush();
+ private native byte[] native_pa_stream_cork(int b);
+
+ private native byte[] native_pa_stream_flush();
/*
* pa_operation pa_stream_prebuf (pa_stream *s, pa_stream_success_cb_t cb,
@@ -184,10 +184,10 @@ public class Stream {
* structure.
*/
- private native long native_pa_stream_trigger();
+ private native byte[] native_pa_stream_trigger();
/* returns an operationPointer */
- private native long native_pa_stream_set_name(String name);
+ private native byte[] native_pa_stream_set_name(String name);
/* Return the current playback/recording time */
private native long native_pa_stream_get_time();
@@ -209,11 +209,11 @@ public class Stream {
*/
native StreamBufferAttributes native_pa_stream_get_buffer_attr();
- native long native_pa_stream_set_buffer_attr(StreamBufferAttributes info);
-
- private native long native_pa_stream_update_sample_rate(int rate);
-
- public native long native_setVolume(float newValue);
+ native byte[] native_pa_stream_set_buffer_attr(StreamBufferAttributes info);
+
+ private native byte[] native_pa_stream_update_sample_rate(int rate);
+
+ public native byte[] native_setVolume(float newValue);
/*
* pa_operation pa_stream_proplist_update (pa_stream *s, pa_update_mode_t
@@ -229,7 +229,7 @@ public class Stream {
* pa_stream_set_monitor_stream() ebfore.
*/
- public Stream(long contextPointer, String name, Format format,
+ public Stream(byte[] contextPointer, String name, Format format,
int sampleRate, int channels) {
// System.out.println("format: " + format.toString());
@@ -380,7 +380,7 @@ public class Stream {
}
- public long getContextPointer() {
+ public byte[] getContextPointer() {
return native_pa_stream_get_context();
}
@@ -429,7 +429,7 @@ public class Stream {
bufferAttributes.getMaxLength(), bufferAttributes
.getTargetLength(), bufferAttributes.getPreBuffering(),
bufferAttributes.getMinimumRequest(), bufferAttributes
- .getFragmentSize(), 0, 0, 0);
+ .getFragmentSize(), 0, null, null);
assert (returnValue == 0);
}
@@ -444,7 +444,7 @@ public class Stream {
bufferAttributes.getMaxLength(), bufferAttributes
.getTargetLength(), bufferAttributes.getPreBuffering(),
bufferAttributes.getMinimumRequest(), bufferAttributes
- .getFragmentSize(), 0, 0, 0);
+ .getFragmentSize(), 0, null, null);
assert (returnValue == 0);
}
@@ -718,7 +718,7 @@ public class Stream {
}
- public long getStreamPointer() {
+ public byte[] getStreamPointer() {
return streamPointer;
}
diff -r c0fcd9764516 -r 239695497634 src/native/jni-common.c
--- a/src/native/jni-common.c Thu Sep 04 14:23:50 2008 -0400
+++ b/src/native/jni-common.c Mon Sep 08 11:09:02 2008 -0400
@@ -38,6 +38,7 @@
#include "jni-common.h"
#include <assert.h>
+#include <string.h>
/*
* Throw an exception by name
@@ -85,6 +86,30 @@ void setJavaLongField(JNIEnv* env, jobje
(*env)->SetLongField(env, obj, fid, value);
}
+jbyteArray getJavaByteArrayField(JNIEnv* env, jobject obj, char* name) {
+
+ jclass cls = (*env)->GetObjectClass(env, obj);
+ assert(cls);
+ jfieldID fid = (*env)->GetFieldID(env, cls, name, "[B");
+ assert(fid);
+ jbyteArray array = (*env)->GetObjectField(env, obj, fid);
+ assert(array);
+ return array;
+
+}
+
+void setJavaByteArrayField(JNIEnv* env, jobject obj, char* name,
+ jbyteArray array) {
+
+ jclass cls = (*env)->GetObjectClass(env, obj);
+ assert(cls);
+ jfieldID fid = (*env)->GetFieldID(env, cls, name, "[B");
+ assert(fid);
+
+ (*env)->SetObjectField(env, obj, fid, array);
+ return;
+}
+
void callJavaVoidMethod(JNIEnv* env, jobject obj, const char* method_name) {
jclass cls = (*env)->GetObjectClass(env, obj);
@@ -105,9 +130,10 @@ void callJavaVoidMethod(JNIEnv* env, job
}
jobject getLockObject(JNIEnv* env) {
-
+
const char* eventLoopClassName =
- "Lorg/classpath/icedtea/pulseaudio/EventLoop;";
+ "org/classpath/icedtea/pulseaudio/EventLoop";
+
jclass eventLoopClass = (*env)->FindClass(env, eventLoopClassName);
assert(eventLoopClass);
@@ -135,7 +161,7 @@ void notifyWaitingOperations(JNIEnv* env
(*env)->MonitorEnter(env, lockObject);
- jclass objectClass = (*env)->FindClass(env, "Ljava/lang/Object;");
+ jclass objectClass = (*env)->FindClass(env, "java/lang/Object");
assert(objectClass);
jmethodID notifyAllID = (*env)->GetMethodID(env, objectClass, "notifyAll", "()V");
assert(notifyAllID);
@@ -146,93 +172,65 @@ void notifyWaitingOperations(JNIEnv* env
}
-/*
- *
- *
- * The functions below are going to cause headaches when porting
- *
- *
- */
-
void* getJavaPointer(JNIEnv* env, jobject obj, char* name) {
- /*
- * on a 64 bit machine, the value of the long is 64 bits, which should be the pointer
- * size and everything should be ok
- *
- * So the problem is 32 bit architectures:
- *
- * A reference snippet
- *
- int a_int = 0x1020;
- long a_long = 0x102030;
- long long a_long_long = 0x1020304150607080;
- printf("size of int: %d\nsize of long: %d\nsize of long long: %d\n",
- sizeof(int), sizeof(long), sizeof(long long));
- printf("int to long long: %X -> %llX\n", a_int, (long long) a_int);
- printf("long long to int: %llX -> %X\n", a_long_long, (int)a_long_long);
-
- * this shows that long long -> int does a bitwise mask to get the lower order bits only
- * this is a guess at how it works:
- *
- * raw data in register is 0x 10203040 50607080
- * 32 bits 32 bits
- *
- * we are interested in the 50607080 part of data
- *
- * Big endian:
- * 10 <-- Pointer < 32bit pointer (for an int)
- * 20 <
- * 30 <
- * 40 <
- * 50
- * 60
- * 70
- * 80
- * (for big endian, will need to do masking and shifting)
- *
- *
- * Little Endian
- * 80 <-- Pointer < 32bit pointer (for an int)
More information about the distro-pkg-dev
mailing list