PR1741: Replace pulse audio enums with static longs. 2011-06-16 Denis Lila <dlila@redhat.com> * Makefile.am: Add ContextEvent to the list of pulse audio classes that need javah run on them. * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java (Type): Remove and replace with... (UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED, TERMINATED): New static long variables replacing enum Type. (init_constants): New native method to initialize the above variables. (checkNativeEnumReturn): Make sure that the input is one of the longs representing the type of ContextEvent. (type): Change type from Type to long. (ContextEvent): Take a long argument, instead of a Type. (getType): Return a long, not a Type. * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java (status): Change from int to long. (native_set_sink_volume): Remove. It was unimplemented in the JNI side. (getStatus): Return long instead of int. (update): Replace int argument with long argument. Remove the switch statement. (setVolume): Remove. Unused. * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java (State): Remove and replace with... (Running, Done, Cancelled): Static longs, enumerating the possible operation states. (init_constants): New native method to initialize the above variables. (checkNativeOperationState): Make sure that the input is one of the longs representing the operation state. (native_get_state): Change return type from int to long. (getState): Change return type to long; remove switch. * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Remove the names of enums from the names of constants since most of them were changed to static longs. * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Same changes as in PulseAudioDataLine.java. * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java (State): Remove and replace with... (UNCONNECTED, CREATING, READY, FAILED, TERMINATED): New static long variables replacing enum Type. (init_constants): New native method to initialize the above variables. (checkNativeStreamState): Make sure that the input is one of the longs representing the kind of StreamState. (native_pa_stream_get_state): Change the return from int to long. (getState): Remove the switch. * pulseaudio/src/native/jni-common.h (SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM): Macro that sets one of the java static longs to the corresponding pa_constant. * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c New file. (SET_CONTEXT_ENUM): Macro that sets the ContextEvent types. (Java_org_classpath_icedtea_pulseaudio_ContextEvent_init_1constants): Implementation of ContextEvent.init_constants. * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c (context_change_callback): Change the fourth argument of GetMethodID to "(J)V" to reflect the change in the signature of EventLoop.update. * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c (SET_OP_ENUM): Macro that sets the operation types. (Java_org_classpath_icedtea_pulseaudio_Operation_init_1constants): Implementation of Operation.init_constants. (Java_org_classpath_icedtea_pulseaudio_Operation_native_1get_1state): Change return type to jlong. * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c (SET_STREAM_ENUM): Macro that sets the stream states. (Java_org_classpath_icedtea_pulseaudio_Stream_init_1constants): Implementation of Stream.init_constants. (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1get_1state): Change return type to jlong.

/* org_classpath_icedtea_pulseaudio_Operation.c
 Copyright (C) 2008 Red Hat, Inc.

 This file is part of IcedTea.

 IcedTea is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as published by
 the Free Software Foundation, version 2.

 IcedTea 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
 General Public License for more details.

 You should have received a copy of the GNU General Public License
 along with IcedTea; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 USA.

 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
 conditions of the GNU General Public License cover the whole
 combination.

 As a special exception, the copyright holders of this library give you
 permission to link this library with independent modules to produce an
 executable, regardless of the license terms of these independent
 modules, and to copy and distribute the resulting executable under
 terms of your choice, provided that you also meet, for each linked
 independent module, the terms and conditions of the license of that
 module.  An independent module is a module which is not derived from
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
 */

#include "org_classpath_icedtea_pulseaudio_Operation.h"

#include "jni-common.h"
#include <pulse/pulseaudio.h>

#define SET_OP_ENUM(env, clz, name) \
    SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM(env, clz, OPERATION, name)

/*
 * Class:     org_classpath_icedtea_pulseaudio_Operation
 * Method:    init_constants
 * Signature: ()V
 */
JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_Operation_init_1constants
  (JNIEnv *env, jclass clz) {
    SET_OP_ENUM(env, clz, RUNNING);
    SET_OP_ENUM(env, clz, DONE);
    SET_OP_ENUM(env, clz, CANCELLED);
}


/*
 * Class:     org_classpath_icedtea_pulseaudio_Operation
 * Method:    native_ref
 * Signature: ()V
 */
JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_Operation_native_1ref
(JNIEnv* env, jobject obj) {

    pa_operation* operation = (pa_operation*) getJavaPointer(env, obj, "operationPointer");
    assert(operation);
    pa_operation_ref(operation);

}

/*
 * Class:     org_classpath_icedtea_pulseaudio_Operation
 * Method:    native_unref
 * Signature: ()V
 */
JNIEXPORT void JNICALL Java_org_classpath_icedtea_pulseaudio_Operation_native_1unref
(JNIEnv* env, jobject obj) {

    pa_operation* operation = (pa_operation*) getJavaPointer(env, obj, "operationPointer");
    assert(operation);
    pa_operation_unref(operation);
}

/*
 * Class:     org_classpath_icedtea_pulseaudio_Operation
 * Method:    native_get_state
 * Signature: ()I
 */
JNIEXPORT jlong JNICALL Java_org_classpath_icedtea_pulseaudio_Operation_native_1get_1state
(JNIEnv *env, jobject obj) {

    pa_operation* operation = (pa_operation*) getJavaPointer(env, obj, "operationPointer");
    assert(operation);
    jlong state = pa_operation_get_state(operation);
    return state;
}