[Galleon-commits] galleon/src/org/lnicholls/galleon/media MediaRefreshThread.java,1.10,1.11 Mp3File.java,1.17,1.18 Mp3Url.java,1.6,1.7

[Leon N. <ja...@us...>]

Update of /cvsroot/galleon/galleon/src/org/lnicholls/galleon/media
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20823/src/org/lnicholls/galleon/media

Modified Files:
	MediaRefreshThread.java Mp3File.java Mp3Url.java 
Log Message:
1.9.1

Index: MediaRefreshThread.java
===================================================================
RCS file: /cvsroot/galleon/galleon/src/org/lnicholls/galleon/media/MediaRefreshThread.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MediaRefreshThread.java	13 Nov 2005 17:14:14 -0000	1.10
--- MediaRefreshThread.java	19 Nov 2005 15:33:29 -0000	1.11
***************
*** 67,71 ****
              Tools.logMemory("refresh1");
          long startTime = System.currentTimeMillis();
-         int counter = 0;
          // Update existing records and add new records
          FileGatherer.gatherDirectory(new File(pathInfo.mPath), pathInfo.mFilter, true,
--- 67,70 ----
***************
*** 87,90 ****
--- 86,90 ----
                                  	
                                  	List list = AudioManager.findByPath(file.getCanonicalPath());
+                                 	Thread.yield();
                                      
                                      if (list.size() > 0) {
***************
*** 113,117 ****
                                      }
                                  }
!                                 if (mCounter%100==0)
               	         		   System.gc();
                                  Thread.sleep(50); // give the CPU some breathing time
--- 113,117 ----
                                      }
                                  }
!                                 if (++mCounter%100==0)
               	         		   System.gc();
                                  Thread.sleep(50); // give the CPU some breathing time

Index: Mp3File.java
===================================================================
RCS file: /cvsroot/galleon/galleon/src/org/lnicholls/galleon/media/Mp3File.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Mp3File.java	13 Nov 2005 17:14:14 -0000	1.17
--- Mp3File.java	19 Nov 2005 15:33:29 -0000	1.18
***************
*** 334,338 ****
  		}
  
- 		/*
  		try {
  			secondPass(file, audio);
--- 334,337 ----
***************
*** 340,344 ****
  			Tools.logException(Mp3File.class, ex, filename);
  		}
- 		*/
  
  		try {
--- 339,342 ----

Index: Mp3Url.java
===================================================================
RCS file: /cvsroot/galleon/galleon/src/org/lnicholls/galleon/media/Mp3Url.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Mp3Url.java	22 Oct 2005 14:19:36 -0000	1.6
--- Mp3Url.java	19 Nov 2005 15:33:29 -0000	1.7
***************
*** 84,88 ****
  	                        return input;
                          }
!                         catch (Exception ex)
                          {
                          	Tools.logException(Mp3Url.class, ex, mPath);        	
--- 84,88 ----
  	                        return input;
                          }
!                         catch (Throwable ex)
                          {
                          	Tools.logException(Mp3Url.class, ex, mPath);        	
***************
*** 96,102 ****
                  log.debug("getStream: audio=" + audio.getPath());
  
!                 TimedThread timedThread = new TimedThread(audio.getPath(), application);
!                 TimedCallable timedCallable = new TimedCallable(timedThread, 1000 * 10);
!                 InputStream mp3Stream = (InputStream) timedCallable.call();
  
                  if (mp3Stream != null)
--- 96,124 ----
                  log.debug("getStream: audio=" + audio.getPath());
  
!                 InputStream mp3Stream = null;
!                 try
!                 {
!                 	TimedThread timedThread = new TimedThread(audio.getPath(), application);
!                 	TimedCallable timedCallable = new TimedCallable(timedThread, 1000 * 5);
!                 	mp3Stream = (InputStream) timedCallable.call();
!                 }
!                 catch (EDU.oswego.cs.dl.util.concurrent.TimeoutException ex)
!                 {
!                 	try
!                 	{
! 	                	URL url = new URL(audio.getPath());
! 	                    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
! 	                    conn.setRequestProperty("Icy-Metadata", "1");
! 	                    conn.setRequestProperty("User-Agent", "WinampMPEG/5.0");
! 	                    conn.setRequestProperty("Accept", "audio/mpeg");
! 	                    conn.setInstanceFollowRedirects(true);
! 	                    
! 	                    mp3Stream = conn.getInputStream();
!                     }
!                     catch (Throwable ex2)
!                     {
!                     	Tools.logException(Mp3Url.class, ex, audio.getPath());        	
!                     }
!                 }
  
                  if (mp3Stream != null)