[Jake2-commits] jake2/src/jake2/client CL_parse.java, 1.24, 1.25 CL_view.java, 1.5, 1.6 SCR.java, 1.21, 1.22 CL.java, 1.31, 1.32

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/client
In directory vz-cvs-3.sog:/tmp/cvs-serv16010/src/jake2/client

Modified Files:
	CL_parse.java CL_view.java SCR.java CL.java 
Log Message:
cdaudio mp3 player support

Index: SCR.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SCR.java	2 Mar 2008 14:56:22 -0000	1.21
--- SCR.java	8 Jul 2011 09:29:42 -0000	1.22
***************
*** 574,577 ****
--- 574,579 ----
          cl.sound_prepped = false; // don't play ambients
  
+         CDAudio.Stop ();
+ 
          if (cls.disable_screen != 0)
              return;
***************
*** 1815,1819 ****
  
          // make sure CD isn't playing music
!         //CDAudio.Stop();
  
          cl.cinematicframe = 0;
--- 1817,1821 ----
  
          // make sure CD isn't playing music
!         CDAudio.Stop();
  
          cl.cinematicframe = 0;

Index: CL_view.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_view.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CL_view.java	2 Mar 2008 14:56:22 -0000	1.5
--- CL_view.java	8 Jul 2011 09:29:42 -0000	1.6
***************
*** 30,34 ****
  import jake2.qcommon.Com;
  import jake2.sys.Sys;
! 
  import java.util.StringTokenizer;
  
--- 30,35 ----
  import jake2.qcommon.Com;
  import jake2.sys.Sys;
! import jake2.qcommon.CDAudio;
! import jake2.util.Lib;
  import java.util.StringTokenizer;
  
***************
*** 161,164 ****
--- 162,169 ----
          Globals.cl.refresh_prepped = true;
          Globals.cl.force_refdef = true; // make sure we have a valid refdef
+         
+         // start the cd track
+         CDAudio.Play(Lib.atoi(Globals.cl.configstrings[Defines.CS_CDTRACK]), true);
+ 
      }
  

Index: CL_parse.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CL_parse.java	16 Apr 2007 21:58:06 -0000	1.24
--- CL_parse.java	8 Jul 2011 09:29:42 -0000	1.25
***************
*** 513,516 ****
--- 513,520 ----
              CL_fx.SetLightstyle(i - Defines.CS_LIGHTS);
              
+         } else if (i == Defines.CS_CDTRACK) {
+         	if (Globals.cl.refresh_prepped)
+         		CDAudio.Play(Lib.atoi(Globals.cl.configstrings[Defines.CS_CDTRACK]), true);
+         	
          } else if (i >= Defines.CS_MODELS && i < Defines.CS_MODELS + Defines.MAX_MODELS) {
              if (Globals.cl.refresh_prepped) {

Index: CL.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** CL.java	7 Jul 2011 21:19:15 -0000	1.31
--- CL.java	8 Jul 2011 09:29:42 -0000	1.32
***************
*** 1581,1585 ****
          S.Update(Globals.cl.refdef.vieworg, Globals.cl.v_forward,
                  Globals.cl.v_right, Globals.cl.v_up);
! 
          // advance local effects for next frame
          CL_fx.RunDLights();
--- 1581,1587 ----
          S.Update(Globals.cl.refdef.vieworg, Globals.cl.v_forward,
                  Globals.cl.v_right, Globals.cl.v_up);
!         
!         CDAudio.Update(); //sfranzyshen
!         
          // advance local effects for next frame
          CL_fx.RunDLights();
***************
*** 1614,1618 ****
  
          WriteConfiguration();
! 
          S.Shutdown();
          IN.Shutdown();
--- 1616,1621 ----
  
          WriteConfiguration();
!         
!         CDAudio.Shutdown();
          S.Shutdown();
          IN.Shutdown();
***************
*** 1644,1647 ****
--- 1647,1651 ----
          //Globals.cls.disable_screen = 1.0f; // don't draw yet
  
+         CDAudio.Init();
          InitLocal();
          IN.Init();