[Arianne-commits] stendhal/src/games/stendhal/client/soundreview SoundFileMap.java, 1.6, 1.7 SoundFileReader.java, 1.9, 1.10 SoundMaster.java, 1.9, 1.10

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

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

Modified Files:
	SoundFileMap.java SoundFileReader.java SoundMaster.java 
Log Message:
bringing head into sync with version 0.59

Index: SoundFileReader.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/soundreview/SoundFileReader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SoundFileReader.java	14 Apr 2007 17:33:30 -0000	1.9
--- SoundFileReader.java	15 Apr 2007 20:34:19 -0000	1.10
***************
*** 11,14 ****
--- 11,16 ----
  import java.util.Properties;
  
+ import marauroa.common.Log4J;
+ 
  public class SoundFileReader {
  
***************
*** 65,69 ****
  		}
  		try {
! 			in1 =  getResourceStream(url);
  
  			prop.load(in1);
--- 67,71 ----
  		}
  		try {
! 			in1 = getResourceStream(url);
  
  			prop.load(in1);
***************
*** 78,84 ****
  		byte[] data;
  		
! 		String filename = SoundFileReader.soundprops.getProperty("soundbase") + soundname;
! 		String url = putTogetherSoundUrl(soundname);
! 		System.out.println(url);
  		InputStream in;
  		ByteArrayOutputStream bout;
--- 80,88 ----
  		byte[] data;
  		
! 		String soundbase = SoundFileReader.soundprops.getProperty("soundbase");
! 		if (!soundbase.endsWith("/")) {
! 			soundbase = soundbase + "/";
! 		}
! 		String filename = soundbase + soundname;
  		InputStream in;
  		ByteArrayOutputStream bout;
***************
*** 90,94 ****
  			in.close();
  		} catch (IOException e) {
! 			e.printStackTrace();
  			return null;
  		}
--- 94,98 ----
  			in.close();
  		} catch (IOException e) {
! 			Log4J.getLogger(SoundFileReader.class).error("could not open soundfile " + filename);
  			return null;
  		}
***************
*** 98,106 ****
  	}
  
- 	String putTogetherSoundUrl(String soundname) {
- 		String url = SoundFileReader.soundprops.getProperty("soundbase")  + soundname;
- 		return url;
- 	}
- 
  	/**
  	 * Transfers the contents of the input stream to the output stream until the
--- 102,105 ----

Index: SoundFileMap.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/soundreview/SoundFileMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SoundFileMap.java	14 Apr 2007 14:54:21 -0000	1.6
--- SoundFileMap.java	15 Apr 2007 20:34:19 -0000	1.7
***************
*** 42,47 ****
          	if (byteArray!=null)
          	put((String) key, byteArray);
! 
!         		System.out.println("SoungdFileMAp " +key+ "found in filesystem");
          }
  		return byteArray;
--- 42,47 ----
          	if (byteArray!=null)
          	put((String) key, byteArray);
! //        	else
! //        		System.out.println(key+ "not found in filesystem");
          }
  		return byteArray;

Index: SoundMaster.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/soundreview/SoundMaster.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SoundMaster.java	14 Apr 2007 14:33:13 -0000	1.9
--- SoundMaster.java	15 Apr 2007 20:34:19 -0000	1.10
***************
*** 16,19 ****
--- 16,20 ----
  private static SoundFileMap sfm=null;
  	private static Cliplistener cliplisten=null;
+ 	private static boolean isMute;
  
  	public void run() {
***************
*** 46,49 ****
--- 47,51 ----
  	}
  	public static  AudioClip play(String soundName, boolean shallLoop) {
+ 		if(isMute) return null;
  		if (soundName == null) {
  	        return  null;
***************
*** 54,58 ****
  		o = sfm.get(soundName);
  		if (o == null) {
! 			System.out.println("sound " + soundName+" was not got from sfm");
  	        return null;
          }
--- 56,60 ----
  		o = sfm.get(soundName);
  		if (o == null) {
! 			//TODO: handle System.out.println("sound " + soundName+" was not got from sfm");
  	        return null;
          }
***************
*** 95,102 ****
              }
  			if (event.getType().equals(LineEvent.Type.CLOSE)) {
- 	            
              }
  			if (event.getType().equals(LineEvent.Type.STOP)) {
! 
              }
  			
--- 97,103 ----
              }
  			if (event.getType().equals(LineEvent.Type.CLOSE)) {
              }
  			if (event.getType().equals(LineEvent.Type.STOP)) {
! 				event.getLine().close();
              }
  			
***************
*** 126,128 ****
--- 127,133 ----
  		
  	}
+ 	public static void setMute(boolean on) {
+ 		isMute=on;
+ 		
+ 	}
  }