From e2ff394bc2cded654137d9cedfab760362a7a450 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Sat, 3 Mar 2012 14:44:45 -0800 Subject: j3dcore: remove the unused SoundRenderer class...never seems to be used Signed-off-by: Harvey Harrison --- src/classes/share/javax/media/j3d/J3dDebug.java | 1 - .../share/javax/media/j3d/SoundRenderer.java | 92 ---------------------- src/classes/share/javax/media/j3d/View.java | 4 - 3 files changed, 97 deletions(-) delete mode 100644 src/classes/share/javax/media/j3d/SoundRenderer.java (limited to 'src/classes/share') diff --git a/src/classes/share/javax/media/j3d/J3dDebug.java b/src/classes/share/javax/media/j3d/J3dDebug.java index bc8f06e..860edad 100644 --- a/src/classes/share/javax/media/j3d/J3dDebug.java +++ b/src/classes/share/javax/media/j3d/J3dDebug.java @@ -317,7 +317,6 @@ class J3dDebug { static final int sharedGroupRetained = !devPhase?NO_DEBUG:NO_DEBUG; static final int sound = !devPhase?NO_DEBUG:NO_DEBUG; static final int soundException = !devPhase?NO_DEBUG:NO_DEBUG; - static final int soundRenderer = !devPhase?NO_DEBUG:NO_DEBUG; static final int soundRetained = !devPhase?NO_DEBUG:NO_DEBUG; static final int soundScheduler = !devPhase?NO_DEBUG:NO_DEBUG; static final int soundStructure = !devPhase?NO_DEBUG:NO_DEBUG; diff --git a/src/classes/share/javax/media/j3d/SoundRenderer.java b/src/classes/share/javax/media/j3d/SoundRenderer.java deleted file mode 100644 index b8368dd..0000000 --- a/src/classes/share/javax/media/j3d/SoundRenderer.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * $RCSfile$ - * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code 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 - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision$ - * $Date$ - * $State$ - */ - -package javax.media.j3d; - - -class SoundRenderer extends Object { - - SoundRenderer() { - } - - void activate(SoundRetained sound, SoundscapeRetained ss) { - AuralAttributesRetained aa = ss.attributes.mirrorAa; - - if (sound instanceof BackgroundSoundRetained) { - System.err.println("Activating BackgroundSoundRetained"); - } else if (sound instanceof ConeSoundRetained) { - System.err.println("Activating ConeSoundRetained"); - } else if (sound instanceof PointSoundRetained) { - System.err.println("Activating PointSoundRetained"); - } - if (ss != null) - System.err.println("Soundscape is " + ss); - else - System.err.println("Soundscape is null"); - - if (aa != null) - System.err.println("AuralAttributes is " + aa); - else - System.err.println("AuralAttributes is null"); - } - - void update(SoundRetained sound, SoundscapeRetained ss) { - AuralAttributesRetained aa = ss.attributes.mirrorAa; - - if (false) { - if (sound instanceof BackgroundSoundRetained) { - System.err.println("Updating BackgroundSoundRetained"); - } else if (sound instanceof ConeSoundRetained) { - System.err.println("Updating ConeSoundRetained"); - } else if (sound instanceof PointSoundRetained) { - System.err.println("Updating PointSoundRetained"); - } - System.err.println("Soundscape is " + ss); - } - } - - void deactivate(SoundRetained sound) { - if (false) { - if (sound instanceof BackgroundSoundRetained) { - System.err.println("Deactivating BackgroundSoundRetained"); - } else if (sound instanceof ConeSoundRetained) { - System.err.println("Deactivating ConeSoundRetained"); - } else if (sound instanceof PointSoundRetained) { - System.err.println("Deactivating PointSoundRetained"); - } - } - } - - public String toString() { - return ""; - } - -} diff --git a/src/classes/share/javax/media/j3d/View.java b/src/classes/share/javax/media/j3d/View.java index b7841dc..1447ff5 100644 --- a/src/classes/share/javax/media/j3d/View.java +++ b/src/classes/share/javax/media/j3d/View.java @@ -716,9 +716,6 @@ private Vector canvases = new Vector(3); // This is the SoundScheduler associated with this view. SoundScheduler soundScheduler = null; - // This is the thread associated with this view. - SoundRenderer soundRenderer = new SoundRenderer(); - // AudioDevice enumerator current position // AudioDeviceEnumerator allAudioEnumerator = null; @@ -3333,7 +3330,6 @@ private ArrayList> canvasList = new ArrayList