From 725d9805584b311f295769aa47fa49ae0a1598e1 Mon Sep 17 00:00:00 2001
From: mh <mh>
Date: Sun, 2 Jun 2002 16:56:26 +0000
Subject: [PATCH] if the Media handler does not have a media description, use
 the mime-type as the description

---
 source/mir/media/MirMedia.java                    | 2 +-
 source/mircoders/entity/EntityUploadedMedia.java  | 2 +-
 source/mircoders/media/MediaHandlerGeneric.java   | 4 ++--
 source/mircoders/media/MediaHandlerImages.java    | 2 +-
 source/mircoders/media/MediaHandlerMp3.java       | 2 +-
 source/mircoders/media/MediaHandlerRealAudio.java | 2 +-
 source/mircoders/media/MediaHandlerRealVideo.java | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/mir/media/MirMedia.java b/source/mir/media/MirMedia.java
index e9535d2e..d72871c9 100755
--- a/source/mir/media/MirMedia.java
+++ b/source/mir/media/MirMedia.java
@@ -206,7 +206,7 @@ public interface  MirMedia{
    * media type is.
    * @return String
    */
-  public abstract String getDescr ();
+  public abstract String getDescr (Entity mediaTypeEnt);
 
 }
 
diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index a0924891..5724e716 100755
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -147,7 +147,7 @@ public class EntityUploadedMedia extends Entity {
     try {
       mediaType = getMediaType();
       mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getDescr();
+      return mediaHandler.getDescr(mediaType);
     }
     catch (Exception ex) {
       theLog.printWarning("-- getDescr: could not fetch data "
diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index d75686b6..7cb409ec 100755
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -161,9 +161,9 @@ public class MediaHandlerGeneric implements MirMedia
       return false;
     }
 
-    public String getDescr()
+    public String getDescr( Entity mediaType)
     {
-      return "";
+      return mediaType.getValue("mime_type");
     }
 
 }
diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java
index aa3fd0b2..012c21e3 100755
--- a/source/mircoders/media/MediaHandlerImages.java
+++ b/source/mircoders/media/MediaHandlerImages.java
@@ -171,7 +171,7 @@ public abstract class MediaHandlerImages implements MirMedia
     return true;
   } 
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "";
   }
diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java
index bc8e19c7..497e1e78 100755
--- a/source/mircoders/media/MediaHandlerMp3.java
+++ b/source/mircoders/media/MediaHandlerMp3.java
@@ -102,7 +102,7 @@ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
 
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "Mp3 audio";
   }
diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java
index 6d442ad6..bb330f80 100755
--- a/source/mircoders/media/MediaHandlerRealAudio.java
+++ b/source/mircoders/media/MediaHandlerRealAudio.java
@@ -84,7 +84,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
     return MirConfig.getProp("Producer.RealMedia.Path");
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "RealMedia Audio";
   }
diff --git a/source/mircoders/media/MediaHandlerRealVideo.java b/source/mircoders/media/MediaHandlerRealVideo.java
index 75d74356..27f80259 100755
--- a/source/mircoders/media/MediaHandlerRealVideo.java
+++ b/source/mircoders/media/MediaHandlerRealVideo.java
@@ -84,7 +84,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements
     return MirConfig.getProp("Producer.RealMedia.Path");
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "RealMedia Video";
   }
-- 
2.11.0