From 719e2a8fe5257f949dbcc326e173e7bbc50cfb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= <jonas@kirilla.com>
Date: Sun, 3 May 2009 20:26:33 +0000
Subject: [PATCH] MediaPlayer is set as the Preferred Application of the audio
 supertype. The subtype inherits the Preferred Application setting of its
 supertype and need not set a preferred application, unless another
 application is truly preferred. E.g. the MidiPlayer for midi files.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30615 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/data/beos_mime/audio/ac3        | 4 +---
 src/data/beos_mime/audio/basic      | 6 ++----
 src/data/beos_mime/audio/mp4        | 4 +---
 src/data/beos_mime/audio/mpeg       | 4 +---
 src/data/beos_mime/audio/x-aiff     | 4 +---
 src/data/beos_mime/audio/x-ape      | 4 +---
 src/data/beos_mime/audio/x-flac     | 4 +---
 src/data/beos_mime/audio/x-matroska | 4 +---
 src/data/beos_mime/audio/x-mdx      | 4 +---
 src/data/beos_mime/audio/x-musepack | 4 +---
 src/data/beos_mime/audio/x-wav      | 4 +---
 11 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/data/beos_mime/audio/ac3 b/src/data/beos_mime/audio/ac3
index 3a30b4f4b5..0ff70d5c7e 100644
--- a/src/data/beos_mime/audio/ac3
+++ b/src/data/beos_mime/audio/ac3
@@ -5,9 +5,7 @@ resource(1, "META:TYPE") "audio/ac3";
 
 resource(2, "META:S:DESC") #'MSDC' "AC3 Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "ac3",
 	"type" = "audio/ac3"
 };
diff --git a/src/data/beos_mime/audio/basic b/src/data/beos_mime/audio/basic
index 748ed14426..85ea06988c 100644
--- a/src/data/beos_mime/audio/basic
+++ b/src/data/beos_mime/audio/basic
@@ -5,12 +5,10 @@ resource(1, "META:TYPE") "audio/basic";
 
 resource(2, "META:S:DESC") #'MSDC' "Sun Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "au",
 	"extensions" = "snd",
 	"type" = "audio/basic"
 };
 
-resource(5, "META:SNIFF_RULE") "0.50 (\".snd\")";
+resource(4, "META:SNIFF_RULE") "0.50 (\".snd\")";
diff --git a/src/data/beos_mime/audio/mp4 b/src/data/beos_mime/audio/mp4
index 890ea0ffae..d3ea442df5 100644
--- a/src/data/beos_mime/audio/mp4
+++ b/src/data/beos_mime/audio/mp4
@@ -5,9 +5,7 @@ resource(1, "META:TYPE") "audio/mp4";
 
 resource(2, "META:S:DESC") #'MSDC' "MP4 Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "m4a",
 	"type" = "audio/mp4"
 };
diff --git a/src/data/beos_mime/audio/mpeg b/src/data/beos_mime/audio/mpeg
index b1c7d05147..92901b2894 100644
--- a/src/data/beos_mime/audio/mpeg
+++ b/src/data/beos_mime/audio/mpeg
@@ -7,9 +7,7 @@ resource(3, "META:L:DESC") #'MLDC' "MPEG audio file";
 
 resource(4, "META:S:DESC") #'MSDC' "MPEG audio file";
 
-resource(5, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(6, "META:EXTENS") message(234) {
+resource(5, "META:EXTENS") message(234) {
 	"extensions" = "mp2",
 	"extensions" = "MP2",
 	"extensions" = "mp3",
diff --git a/src/data/beos_mime/audio/x-aiff b/src/data/beos_mime/audio/x-aiff
index 3e92c2ca95..4eeae76983 100644
--- a/src/data/beos_mime/audio/x-aiff
+++ b/src/data/beos_mime/audio/x-aiff
@@ -5,9 +5,7 @@ resource(1, "META:TYPE") "audio/x-aiff";
 
 resource(2, "META:S:DESC") #'MSDC' "AIFF Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "aif",
 	"extensions" = "aiff",
 	"extensions" = "aifc",
diff --git a/src/data/beos_mime/audio/x-ape b/src/data/beos_mime/audio/x-ape
index 99fd1dc1c0..8f8cf8eda5 100644
--- a/src/data/beos_mime/audio/x-ape
+++ b/src/data/beos_mime/audio/x-ape
@@ -7,9 +7,7 @@ resource(2, "META:S:DESC") #'MSDC' "APE (Monkey's Audio) Sound File";
 
 resource(3, "META:L:DESC") #'MLDC' "Lossless Compressed APE (Monkey's Audio) Sound File";
 
-resource(4, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(5, "META:EXTENS") message(234) {
+resource(4, "META:EXTENS") message(234) {
 	"extensions" = "ape",
 	"type" = "audio/x-ape"
 };
diff --git a/src/data/beos_mime/audio/x-flac b/src/data/beos_mime/audio/x-flac
index 337fb24397..65c6cf0ddc 100644
--- a/src/data/beos_mime/audio/x-flac
+++ b/src/data/beos_mime/audio/x-flac
@@ -5,9 +5,7 @@ resource(1, "META:TYPE") "audio/x-flac";
 
 resource(2, "META:S:DESC") #'MSDC' "FLAC Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "fla",
 	"extensions" = "flac",
 	"type" = "audio/x-flac"
diff --git a/src/data/beos_mime/audio/x-matroska b/src/data/beos_mime/audio/x-matroska
index b6ba5d16c8..de375a5eae 100644
--- a/src/data/beos_mime/audio/x-matroska
+++ b/src/data/beos_mime/audio/x-matroska
@@ -8,9 +8,7 @@ resource(1, "META:TYPE") "audio/x-matroska";
 
 resource(3, "META:S:DESC") #'MSDC' "Matroska Audio";
 
-resource(4, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(5, "META:EXTENS") message(234) {
+resource(4, "META:EXTENS") message(234) {
 	"extensions" = "mka",
 	"type" = "audio/x-matroska"
 };
diff --git a/src/data/beos_mime/audio/x-mdx b/src/data/beos_mime/audio/x-mdx
index e05c951e86..1ae47d6554 100644
--- a/src/data/beos_mime/audio/x-mdx
+++ b/src/data/beos_mime/audio/x-mdx
@@ -7,9 +7,7 @@ resource(2, "META:S:DESC") #'MSDC' "MDX Sound File";
 
 resource(3, "META:L:DESC") #'MLDC' "SHARP X68000 MDX (Music Data for mXdrv) Sound File";
 
-resource(4, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(5, "META:EXTENS") message(234) {
+resource(4, "META:EXTENS") message(234) {
 	"extensions" = "mdx",
 	"type" = "audio/x-mdx"
 };
diff --git a/src/data/beos_mime/audio/x-musepack b/src/data/beos_mime/audio/x-musepack
index a689e90e32..da3ecadb6a 100644
--- a/src/data/beos_mime/audio/x-musepack
+++ b/src/data/beos_mime/audio/x-musepack
@@ -5,9 +5,7 @@ resource(1, "META:TYPE") "audio/x-musepack";
 
 resource(2, "META:S:DESC") #'MSDC' "Musepack Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "mpc",
 	"extensions" = "mpp",
 	"extensions" = "mp+",
diff --git a/src/data/beos_mime/audio/x-wav b/src/data/beos_mime/audio/x-wav
index 78e425898e..b5a4cffcce 100644
--- a/src/data/beos_mime/audio/x-wav
+++ b/src/data/beos_mime/audio/x-wav
@@ -5,9 +5,7 @@ resource(1, "META:TYPE") "audio/x-wav";
 
 resource(2, "META:S:DESC") #'MSDC' "WAVE Sound File";
 
-resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
-
-resource(4, "META:EXTENS") message(234) {
+resource(3, "META:EXTENS") message(234) {
 	"extensions" = "wav",
 	"type" = "audio/x-wav"
 };