[Arianne-commits] stendhal/src/games/stendhal/client/sound ClipRunner.java, 1.13, 1.14 AmbientSound.java, 1.24, 1.25 SoundSystem.java, 1.44, 1.45 SoundCycle.java, 1.18, 1.19

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/sound
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11483/src/games/stendhal/client/sound

Modified Files:
	ClipRunner.java AmbientSound.java SoundSystem.java 
	SoundCycle.java 
Log Message:
stop using marauroa.Logger class use Log4J directly instead
still uses init() from marauroa

Index: SoundSystem.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/sound/SoundSystem.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** SoundSystem.java	9 Sep 2007 14:52:41 -0000	1.44
--- SoundSystem.java	1 Nov 2007 23:32:56 -0000	1.45
***************
*** 52,57 ****
  import javax.sound.sampled.Mixer.Info;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  
  /**
--- 52,57 ----
  import javax.sound.sampled.Mixer.Info;
  
! 
! import org.apache.log4j.Logger;
  
  /**
***************
*** 101,105 ****
  
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(SoundSystem.class);
  
  	/** expected location of the sound definition file (classloader). */
--- 101,105 ----
  
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(SoundSystem.class);
  
  	/** expected location of the sound definition file (classloader). */

Index: ClipRunner.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/sound/ClipRunner.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ClipRunner.java	9 Sep 2007 14:52:41 -0000	1.13
--- ClipRunner.java	1 Nov 2007 23:32:56 -0000	1.14
***************
*** 26,31 ****
  import javax.sound.sampled.LineListener;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  
  /**
--- 26,31 ----
  import javax.sound.sampled.LineListener;
  
! 
! import org.apache.log4j.Logger;
  
  /**
***************
*** 38,42 ****
  
  	/** the logger */
! 	private static final Logger logger = Log4J.getLogger(ClipRunner.class);
  
  	/** name of this clip */
--- 38,42 ----
  
  	/** the logger */
! 	private static final Logger logger = Logger.getLogger(ClipRunner.class);
  
  	/** name of this clip */

Index: AmbientSound.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/sound/AmbientSound.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** AmbientSound.java	9 Sep 2007 14:52:41 -0000	1.24
--- AmbientSound.java	1 Nov 2007 23:32:56 -0000	1.25
***************
*** 24,29 ****
  import javax.sound.sampled.FloatControl;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  
  /**
--- 24,29 ----
  import javax.sound.sampled.FloatControl;
  
! 
! import org.apache.log4j.Logger;
  
  /**
***************
*** 38,42 ****
  
  	/** the logger instance. */
! 	private static final Logger logger = Log4J.getLogger(AmbientSound.class);
  
  	private List<LoopSoundInfo> loopSounds = new ArrayList<LoopSoundInfo>();
--- 38,42 ----
  
  	/** the logger instance. */
! 	private static final Logger logger = Logger.getLogger(AmbientSound.class);
  
  	private List<LoopSoundInfo> loopSounds = new ArrayList<LoopSoundInfo>();

Index: SoundCycle.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/sound/SoundCycle.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SoundCycle.java	9 Sep 2007 14:52:41 -0000	1.18
--- SoundCycle.java	1 Nov 2007 23:32:56 -0000	1.19
***************
*** 20,25 ****
  import javax.sound.sampled.DataLine;
  
! import marauroa.common.Log4J;
! import marauroa.common.Logger;
  import marauroa.common.game.RPObject.ID;
  
--- 20,25 ----
  import javax.sound.sampled.DataLine;
  
! 
! import org.apache.log4j.Logger;
  import marauroa.common.game.RPObject.ID;
  
***************
*** 37,41 ****
  
  	/** the logger */
! 	private static final Logger logger = Log4J.getLogger(SoundCycle.class);
  
  	private byte[] ID_Token;
--- 37,41 ----
  
  	/** the logger */
! 	private static final Logger logger = Logger.getLogger(SoundCycle.class);
  
  	private byte[] ID_Token;