"fixed" usage of generics

This commit is contained in:
Brian Matzon 2010-05-25 06:01:34 +00:00
parent b65bd6a333
commit a3db874472
1 changed files with 36 additions and 25 deletions

View File

@ -33,6 +33,9 @@ package org.lwjgl.test.openal;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
@ -148,7 +151,7 @@ public class OpenALInfo {
ALC10.alcGetInteger(device, EFX10.ALC_EFX_MAJOR_VERSION, major); ALC10.alcGetInteger(device, EFX10.ALC_EFX_MAJOR_VERSION, major);
ALC10.alcGetInteger(device, EFX10.ALC_EFX_MINOR_VERSION, minor); ALC10.alcGetInteger(device, EFX10.ALC_EFX_MINOR_VERSION, minor);
if(ALC10.alcGetError(device) == ALC10.ALC_NO_ERROR) { if(ALC10.alcGetError(device) == ALC10.ALC_NO_ERROR) {
System.out.println(String.format("EFX version: %d.%d",major.get(), minor.get())); System.out.println("EFX version: " + major.get() + "." + minor.get());
} }
ALC10.alcGetInteger(device, EFX10.ALC_MAX_AUXILIARY_SENDS, sends); ALC10.alcGetInteger(device, EFX10.ALC_MAX_AUXILIARY_SENDS, sends);
@ -157,36 +160,44 @@ public class OpenALInfo {
} }
System.out.println("Supported filters: "); System.out.println("Supported filters: ");
HashMap<String, Integer> filters = new HashMap<String, Integer>(); HashMap filters = new HashMap();
filters.put("Low-pass", EFX10.AL_FILTER_LOWPASS); filters.put("Low-pass", new Integer(EFX10.AL_FILTER_LOWPASS));
filters.put("High-pass", EFX10.AL_FILTER_HIGHPASS); filters.put("High-pass", new Integer(EFX10.AL_FILTER_HIGHPASS));
filters.put("Band-pass", EFX10.AL_FILTER_BANDPASS); filters.put("Band-pass", new Integer(EFX10.AL_FILTER_BANDPASS));
for(Entry<String, Integer> entry : filters.entrySet()) { Set entries = filters.entrySet();
if(EFXUtil.isFilterSupported(entry.getValue())) { for(Iterator i = entries.iterator(); i.hasNext();) {
System.out.println(" " + entry.getKey()); Map.Entry entry = (Entry) i.next();
int value = ((Integer)entry.getValue()).intValue();
String key = (String) entry.getKey();
if(EFXUtil.isFilterSupported(value)) {
System.out.println(" " + key);
} }
} }
System.out.println("Supported effects: "); System.out.println("Supported effects: ");
HashMap<String, Integer> effects = new HashMap<String, Integer>(); HashMap effects = new HashMap();
effects.put("EAX Reverb", EFX10.AL_EFFECT_EAXREVERB); effects.put("EAX Reverb", new Integer(EFX10.AL_EFFECT_EAXREVERB));
effects.put("Reverb", EFX10.AL_EFFECT_REVERB); effects.put("Reverb", new Integer(EFX10.AL_EFFECT_REVERB));
effects.put("Chorus", EFX10.AL_EFFECT_CHORUS); effects.put("Chorus", new Integer(EFX10.AL_EFFECT_CHORUS));
effects.put("Distortion", EFX10.AL_EFFECT_DISTORTION); effects.put("Distortion", new Integer(EFX10.AL_EFFECT_DISTORTION));
effects.put("Echo", EFX10.AL_EFFECT_ECHO); effects.put("Echo", new Integer(EFX10.AL_EFFECT_ECHO));
effects.put("Flanger", EFX10.AL_EFFECT_FLANGER); effects.put("Flanger", new Integer(EFX10.AL_EFFECT_FLANGER));
effects.put("Frequency Shifter", EFX10.AL_EFFECT_FREQUENCY_SHIFTER); effects.put("Frequency Shifter", new Integer(EFX10.AL_EFFECT_FREQUENCY_SHIFTER));
effects.put("Vocal Morpher", EFX10.AL_EFFECT_VOCAL_MORPHER); effects.put("Vocal Morpher", new Integer(EFX10.AL_EFFECT_VOCAL_MORPHER));
effects.put("Pitch Shifter", EFX10.AL_EFFECT_PITCH_SHIFTER); effects.put("Pitch Shifter", new Integer(EFX10.AL_EFFECT_PITCH_SHIFTER));
effects.put("Ring Modulator", EFX10.AL_EFFECT_RING_MODULATOR); effects.put("Ring Modulator", new Integer(EFX10.AL_EFFECT_RING_MODULATOR));
effects.put("Autowah", EFX10.AL_EFFECT_AUTOWAH); effects.put("Autowah", new Integer(EFX10.AL_EFFECT_AUTOWAH));
effects.put("Compressor", EFX10.AL_EFFECT_COMPRESSOR); effects.put("Compressor", new Integer(EFX10.AL_EFFECT_COMPRESSOR));
effects.put("Equalizer", EFX10.AL_EFFECT_EQUALIZER); effects.put("Equalizer", new Integer(EFX10.AL_EFFECT_EQUALIZER));
for(Entry<String, Integer> entry : effects.entrySet()) { entries = filters.entrySet();
if(EFXUtil.isEffectSupported(entry.getValue())) { for(Iterator i = entries.iterator(); i.hasNext();) {
System.out.println(" " + entry.getKey()); Map.Entry entry = (Entry) i.next();
int value = ((Integer)entry.getValue()).intValue();
String key = (String) entry.getKey();
if(EFXUtil.isEffectSupported(value)) {
System.out.println(" " + key);
} }
} }
} }