From 271fbfe408a9ee21e72d7c95cec46941b55e5791 Mon Sep 17 00:00:00 2001
From: mlampard-guest <none@none>
Date: Sun, 22 Mar 2009 16:55:47 +1030
Subject: change long-dead email address

---
 src/dxr3/video_out_dxr3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 3e7c9ab08..189824183 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -21,7 +21,7 @@
 /* mpeg1 encoding video out plugin for the dxr3.  
  *
  * modifications to the original dxr3 video out plugin by 
- * Mike Lampard <mike at web2u.com.au>
+ * Mike Lampard <mlampard at users.sourceforge.net>
  * this first standalone version by 
  * Harm van der Heijden <hrm at users.sourceforge.net>
  */
-- 
cgit v1.2.3


From 075a4b4d2ff96d2576993e9dab0bb1532810918e Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@iglu.org.il>
Date: Wed, 25 Mar 2009 19:28:41 +0000
Subject: Add Mimetypes to src/demuxers/demux_mod.c This patch adds mimetypes
 to src/demuxers/demux_mod.c for the file types it can handle. After this
 patch is applied, then xine_get_mime_types() reports them correctly, which
 allows Amarok 2.x to play them and probably prevents other interoperability
 problems.

Previously Amarok 2.x rejected MOD/S3M/IT/XM/etc. files that were enqueued
there when using the xine phonon backend because their mime types were not
included in those announced by xine-lib.
---
 src/demuxers/demux_mod.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c
index 073927707..c67f6e18e 100644
--- a/src/demuxers/demux_mod.c
+++ b/src/demuxers/demux_mod.c
@@ -379,7 +379,19 @@ static const char *get_extensions (demux_class_t *this_gen) {
 }
 
 static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
+  return "audio/x-mod: mod: SoundTracker/NoiseTracker/ProTracker Module;"
+         "audio/mod: mod: SoundTracker/NoiseTracker/ProTracker Module;"
+         "audio/it: it: ImpulseTracker Module;"
+         "audio/x-it: it: ImpulseTracker Module;"
+         "audio/x-stm: stm: ScreamTracker 2 Module;"
+         "audio/x-s3m: s3m: ScreamTracker 3 Module;"
+         "audio/s3m: s3m: ScreamTracker 3 Module;"
+         "application/playerpro: 669: 669 Tracker Module;"
+         "application/adrift; amf: ADRIFT Module File;"
+         "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
+         "audio/x-amf; amf: ADRIFT Module File;"
+         "audio/x-xm; xm: FastTracker II Audio;"
+         "audio/xm; xm: FastTracker II Audio;";
 }
 
 static void class_dispose (demux_class_t *this_gen) {
-- 
cgit v1.2.3