diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-01-18 11:47:24 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2008-01-18 11:47:24 +0000 |
| commit | 0a8d0aa14d398863b6b911be427ec9ab86abb578 (patch) | |
| tree | a61539f05e3f0f85c761b43d7a2920275900fab9 /data | |
| parent | 2797496614a65464186d12dac2841457b14eac3c (diff) | |
| download | totem-0a8d0aa14d398863b6b911be427ec9ab86abb578.tar.gz | |
Add support for the new x-content/ types, fix FLAC being missing from the
2008-01-18 Bastien Nocera <hadess@hadess.net>
* data/desktop.sh:
* data/mime-functions.sh:
* data/mime-type-include.sh:
* data/mime-type-list.txt: Add support for the new
x-content/ types, fix FLAC being missing from the
audio types, allow comments to be added to the
mime-types list (Closes: #510323)
svn path=/trunk/; revision=5028
Diffstat (limited to 'data')
| -rwxr-xr-x | data/desktop.sh | 2 | ||||
| -rw-r--r-- | data/mime-functions.sh | 5 | ||||
| -rwxr-xr-x | data/mime-type-include.sh | 2 | ||||
| -rw-r--r-- | data/mime-type-list.txt | 6 |
4 files changed, 11 insertions, 4 deletions
diff --git a/data/desktop.sh b/data/desktop.sh index dd37e370b..741b845a1 100755 --- a/data/desktop.sh +++ b/data/desktop.sh @@ -4,7 +4,7 @@ echo_mime () { printf "$i;"; } -MIMETYPES=`cat $1` +MIMETYPES=`grep -v ^# $1` printf MimeType=; for i in $MIMETYPES ; do echo_mime; diff --git a/data/mime-functions.sh b/data/mime-functions.sh index 24f4ded87..29136be18 100644 --- a/data/mime-functions.sh +++ b/data/mime-functions.sh @@ -2,12 +2,13 @@ get_audio_mimetypes () { - MIMETYPES=`cat $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio"` + MIMETYPES=`grep -v ^# $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio"` + MIMEYPES="$MIMETYPES application/x-flac" } get_video_mimetypes () { - MIMETYPES=`cat $1 | grep -v audio | grep -v "application/x-flac"` + MIMETYPES=`grep -v ^# $1 | grep -v x-content/ | grep -v audio | grep -v "application/x-flac"` MIMETYPES="$MIMETYPES audio/x-pn-realaudio" } diff --git a/data/mime-type-include.sh b/data/mime-type-include.sh index 72da21c5f..34e5fb359 100755 --- a/data/mime-type-include.sh +++ b/data/mime-type-include.sh @@ -22,7 +22,7 @@ if [ x"$1" = "x--nautilus" ] ; then exit 0 fi -MIMETYPES=`cat $1` +MIMETYPES=`grep -v ^# $1 | grep -v x-content/` echo "/* generated with mime-types-include.sh, don't edit */" echo "char *mime_types[] = {" diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt index f272c4c33..7245d211d 100644 --- a/data/mime-type-list.txt +++ b/data/mime-type-list.txt @@ -89,3 +89,9 @@ video/x-ms-wvx video/x-nsv video/x-ogm+ogg video/x-theora+ogg +x-content/video-dvd +x-content/video-vcd +x-content/video-svcd +# No support for those yet +#x-content/video-blueray +#x-content/video-hddvd |