[Jake2-commits] jake2/src/jake2/sound S.java,1.5.2.1,1.5.2.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jake2/jake2/src/jake2/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8896/src/jake2/sound

Modified Files:
      Tag: RST
	S.java 
Log Message:
added debug messages, fixed cooperative multiplayer bugs.

Index: S.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/S.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** S.java	16 Jan 2005 21:21:07 -0000	1.5.2.1
--- S.java	23 Jan 2005 21:31:51 -0000	1.5.2.2
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.

! This program 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; either version 2
! of the License, or (at your option) any later version.

! This program 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 this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

! */
  package jake2.sound;

--- 6,27 ----
   */
  /*
!  Copyright (C) 1997-2001 Id Software, Inc.

!  This program 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; either version 2
!  of the License, or (at your option) any later version.

!  This program 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 this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

!  */
  package jake2.sound;

***************
*** 30,33 ****
--- 30,34 ----
  import jake2.qcommon.Com;
  import jake2.qcommon.Cvar;
+ import jake2.sound.joal.JOALSoundImpl;

  import java.util.Vector;
***************
*** 37,217 ****
   */
  public class S {
- 	
- 	static Sound impl;
- 	static cvar_t s_impl;
- 	
- 	static Vector drivers = new Vector(3);
- 	 
- 	static {
- 		try {
- 			// dummy driver (no sound)
- 			Class.forName("jake2.sound.DummyDriver");
- 			try {
- 				Class.forName("org.lwjgl.openal.AL");
- 				Class.forName("jake2.sound.lwjgl.LWJGLSoundImpl");
- 			} catch (ClassNotFoundException e) {
- 				// ignore the lwjgl driver if runtime not in classpath
- 			}
- 			// prefered driver
- 			try {
- 				Class.forName("net.java.games.joal.AL");
- 				Class.forName("jake2.sound.joal.JOALSoundImpl");
- 			} catch (ClassNotFoundException e) {
- 				// ignore the joal driver if runtime not in classpath
- 			}
- 		}
- 		catch (Throwable e) {
- 		}
- 	};
- 	
- 	public static void register(Sound driver) {
- 		if (driver == null) {
- 			throw new IllegalArgumentException("Sound implementation can't be null");
- 		}
- 		if (!drivers.contains(driver)) {
- 			drivers.add(driver);
- 		}
- 	}
- 	
- 	public static void useDriver(String driverName) {
- 		Sound driver = null;
- 		int count = drivers.size();
- 		for (int i = 0; i < count; i++) {
- 			driver = (Sound) drivers.get(i);
- 			if (driver.getName().equals(driverName)) {
- 				impl = driver;
- 				return;
- 			}
- 		}
- 		// if driver not found use dummy
- 		impl = (Sound)drivers.firstElement();
- 	}
- 	
- 	public static void Init() {
- 		
- 		Com.Printf("\n------- sound initialization -------\n");

! 		cvar_t cv = Cvar.Get("s_initsound", "1", 0);
! 		if (cv.value == 0.0f) {
! 			Com.Printf("not initializing.\n");
! 			useDriver("dummy");
! 			return;			
! 		}

! 		// set the last registered driver as default
! 		String defaultDriver = "dummy";
! 		if (drivers.size() > 1){
! 			defaultDriver = ((Sound)drivers.lastElement()).getName();
! 		}
! 		
! 		s_impl = Cvar.Get("s_impl", defaultDriver, Defines.CVAR_ARCHIVE);
! 		useDriver(s_impl.string);

! 		if (impl.Init()) {
! 			// driver ok
! 			Cvar.Set("s_impl", impl.getName());
! 		} else {
! 			// fallback
! 			useDriver("dummy");
! 		}
! 		
! 		Com.Printf("\n------- use sound driver \"" + impl.getName() + "\" -------\n");
! 		StopAllSounds();
! 	}
! 	
! 	public static void Shutdown() {
! 		impl.Shutdown();
! 	}
! 	
! 	/*
! 	=====================
! 	S_BeginRegistration
! 	=====================
! 	*/
! 	public static void BeginRegistration() {
! 		impl.BeginRegistration();		
! 	}
! 	
! 	/*
! 	=====================
! 	S_RegisterSound
! 	=====================
! 	*/
! 	public static sfx_t RegisterSound(String sample) {
! 		return impl.RegisterSound(sample);
! 	}
! 	
! 	/*
! 	=====================
! 	S_EndRegistration
! 	=====================
! 	*/
! 	public static void EndRegistration() {
! 		impl.EndRegistration();
! 	}
! 	
! 	/*
! 	==================
! 	S_StartLocalSound
! 	==================
! 	*/
! 	public static void StartLocalSound(String sound) {
! 		impl.StartLocalSound(sound);		
! 	}
! 	
! 	/*
! 	====================
! 	S_StartSound

! 	Validates the parms and ques the sound up
! 	if pos is NULL, the sound will be dynamically sourced from the entity
! 	Entchannel 0 will never override a playing sound
! 	====================
! 	*/
! 	public static void StartSound(float[] origin, int entnum, int entchannel, sfx_t sfx, float fvol, float attenuation, float timeofs) {
! 		impl.StartSound(origin, entnum, entchannel, sfx, fvol, attenuation, timeofs);
! 	}

! 	/*
! 	============
! 	S_Update

! 	Called once each time through the main loop
! 	============
! 	*/
! 	public static void Update(float[] origin, float[] forward, float[] right, float[] up) {
! 		impl.Update(origin, forward, right, up);
! 	}

! 	/*
! 	============
! 	S_RawSamples
! 	 
! 	Cinematic streaming and voice over network
! 	============
! 	*/
! 	public static void RawSamples(int samples, int rate, int width, int channels, byte[] data) {
! 		impl.RawSamples(samples, rate, width, channels, data);
! 	}

! 	/*
! 	==================
! 	S_StopAllSounds
! 	==================
! 	*/
! 	public static void StopAllSounds() {
! 		impl.StopAllSounds();
! 	}
! 	
! 	public static String getDriverName() {
! 		return impl.getName();
! 	}
! 	
! 	public static String[] getDriverNames() {
! 		String[] names = new String[drivers.size()];
! 		for (int i = 0; i < names.length; i++) {
! 			names[i] = ((Sound)drivers.get(i)).getName();
! 		}
! 		return names;
! 	}
  }
\ No newline at end of file
--- 38,223 ----
   */
  public class S {

!     static Sound impl;

!     static cvar_t s_impl;

!     static Vector drivers = new Vector(3);

!     static {
!         try {
!             Com.Println("registering sound drivers...");
!             // dummy driver (no sound)
!             try {
!                 Class.forName("jake2.sound.DummyDriver");

!             } catch (Exception e) {               
!                 Com.Println("" + e.getStackTrace());
!                 // ignore the lwjgl driver if runtime not in classpath
!             }
!             try {
!                 Class.forName("org.lwjgl.openal.AL");
!                 Class.forName("jake2.sound.lwjgl.LWJGLSoundImpl");                
!             } catch (Throwable e) {
!                 e.printStackTrace();
!                 Com.Println("" + e.getStackTrace());
!                 // ignore the lwjgl driver if runtime not in classpath
!             }
!             // prefered driver
!             try {
!                 System.out.println("loading joal...");
!                 Class.forName("net.java.games.joal.AL");
!                 Class.forName("jake2.sound.joal.JOALSoundImpl");
!             } catch (Throwable e) {
!                 // ignore the joal driver if runtime not in classpath
!             }
!         } catch (Throwable e) {
!         }
!     };

!     public static void register(Sound driver) {
!         if (driver == null) {
!             throw new IllegalArgumentException(
!                     "Sound implementation can't be null");
!         }
!         if (!drivers.contains(driver)) {
!             drivers.add(driver);
!         }
!     }

!     public static void useDriver(String driverName) {
!         Sound driver = null;
!         int count = drivers.size();
!         for (int i = 0; i < count; i++) {
!             driver = (Sound) drivers.get(i);
!             if (driver.getName().equals(driverName)) {
!                 impl = driver;
!                 return;
!             }
!         }
!         // if driver not found use dummy
!         impl = (Sound) drivers.firstElement();
!     }

!     public static void Init() {
! 
!         Com.Printf("\n------- sound initialization -------\n");
!         Com.Println("Initializing JOAL.. ");
! 
!         cvar_t cv = Cvar.Get("s_initsound", "1", 0);
!         if (cv.value == 0.0f) {
!             Com.Printf("not initializing.\n");
!             useDriver("dummy");
!             return;
!         }
! 
!         // set the last registered driver as default
!         String defaultDriver = "dummy";
!         if (drivers.size() > 1) {
!             defaultDriver = ((Sound) drivers.lastElement()).getName();
!         }
! 
!         s_impl = Cvar.Get("s_impl", defaultDriver, Defines.CVAR_ARCHIVE);
! 
!         s_impl.string = "joal";
!         Com.Println("trying to open sound driver:" + s_impl.string);
!         useDriver(s_impl.string);
! 
!         if (impl.Init()) {
!             // driver ok
!             Cvar.Set("s_impl", impl.getName());
!         } else {
!             // fallback
!             Com.Println("falling back to dummy driver.");
!             useDriver("dummy");
!         }
! 
!         Com.Printf("\n------- use sound driver \"" + impl.getName()
!                 + "\" -------\n");
!         StopAllSounds();
!     }
! 
!     public static void Shutdown() {
!         impl.Shutdown();
!     }
! 
!     /*
!      * ===================== S_BeginRegistration =====================
!      */
!     public static void BeginRegistration() {
!         impl.BeginRegistration();
!     }
! 
!     /*
!      * ===================== S_RegisterSound =====================
!      */
!     public static sfx_t RegisterSound(String sample) {
!         return impl.RegisterSound(sample);
!     }
! 
!     /*
!      * ===================== S_EndRegistration =====================
!      */
!     public static void EndRegistration() {
!         impl.EndRegistration();
!     }
! 
!     /*
!      * ================== S_StartLocalSound ==================
!      */
!     public static void StartLocalSound(String sound) {
!         impl.StartLocalSound(sound);
!     }
! 
!     /*
!      * ==================== S_StartSound
!      * 
!      * Validates the parms and ques the sound up if pos is NULL, the sound will
!      * be dynamically sourced from the entity Entchannel 0 will never override a
!      * playing sound ====================
!      */
!     public static void StartSound(float[] origin, int entnum, int entchannel,
!             sfx_t sfx, float fvol, float attenuation, float timeofs) {
!         impl.StartSound(origin, entnum, entchannel, sfx, fvol, attenuation,
!                 timeofs);
!     }
! 
!     /*
!      * ============ S_Update
!      * 
!      * Called once each time through the main loop ============
!      */
!     public static void Update(float[] origin, float[] forward, float[] right,
!             float[] up) {
!         impl.Update(origin, forward, right, up);
!     }
! 
!     /*
!      * ============ S_RawSamples
!      * 
!      * Cinematic streaming and voice over network ============
!      */
!     public static void RawSamples(int samples, int rate, int width,
!             int channels, byte[] data) {
!         impl.RawSamples(samples, rate, width, channels, data);
!     }
! 
!     /*
!      * ================== S_StopAllSounds ==================
!      */
!     public static void StopAllSounds() {
!         impl.StopAllSounds();
!     }
! 
!     public static String getDriverName() {
!         return impl.getName();
!     }
! 
!     public static String[] getDriverNames() {
!         String[] names = new String[drivers.size()];
!         for (int i = 0; i < names.length; i++) {
!             names[i] = ((Sound) drivers.get(i)).getName();
!         }
!         return names;
!     }
  }
\ No newline at end of file