localization/international friendlier wording

[mir.git] / source / mircoders / media / MediaHandlerMp3.java

diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java
index bc8e19c..e07c1c6 100755 (executable)
--- a/source/mircoders/media/MediaHandlerMp3.java
+++ b/source/mircoders/media/MediaHandlerMp3.java
@@ -1,11 +1,38 @@
 /*
- * put your module comment here
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir 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.
+ *
+ * Mir 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 Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
  */
 
-
 package  mircoders.media;
 
 import java.util.*;
+import java.io.StringReader;
 
 import freemarker.template.SimpleList;
 import freemarker.template.SimpleHash;
@@ -63,10 +90,10 @@ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
         //write the "meta" files
         //first the .m3u since it only contains one line
         FileUtil.write(getStoragePath()+"/"+datePath+"/"+mpegURLFile,
-                      mp3Pointer.getBytes());
+                      new StringReader(mp3Pointer), "US-ASCII");
         //now the .pls file
         FileUtil.write(getStoragePath()+"/"+datePath+"/"+playlistFile,
-                      mp3Pointer.getBytes());
+                      new StringReader(mp3Pointer), "US-ASCII");
       } catch (Exception e) {
           theLog.printError(e.toString()); 
           throw new MirMediaException(e.toString());
@@ -102,9 +129,9 @@ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
 
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
-    return "Mp3 audio";
+    return "mp3";
   }
 
 }