totem r5028 - in trunk: . data

[hadess svn gnome org]

Author: hadess
Date: Fri Jan 18 11:47:24 2008
New Revision: 5028
URL: http://svn.gnome.org/viewvc/totem?rev=5028&view=rev

Log:
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)



Modified:
   trunk/ChangeLog
   trunk/data/desktop.sh
   trunk/data/mime-functions.sh
   trunk/data/mime-type-include.sh
   trunk/data/mime-type-list.txt

Modified: trunk/data/desktop.sh
==============================================================================
--- trunk/data/desktop.sh	(original)
+++ trunk/data/desktop.sh	Fri Jan 18 11:47:24 2008
@@ -4,7 +4,7 @@
 	printf "$i;";
 }
 
-MIMETYPES=`cat $1`
+MIMETYPES=`grep -v ^# $1`
 printf MimeType=;
 for i in $MIMETYPES ; do
 	echo_mime;

Modified: trunk/data/mime-functions.sh
==============================================================================
--- trunk/data/mime-functions.sh	(original)
+++ trunk/data/mime-functions.sh	Fri Jan 18 11:47:24 2008
@@ -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"
 }
 

Modified: trunk/data/mime-type-include.sh
==============================================================================
--- trunk/data/mime-type-include.sh	(original)
+++ trunk/data/mime-type-include.sh	Fri Jan 18 11:47:24 2008
@@ -22,7 +22,7 @@
 	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[] = {"

Modified: trunk/data/mime-type-list.txt
==============================================================================
--- trunk/data/mime-type-list.txt	(original)
+++ trunk/data/mime-type-list.txt	Fri Jan 18 11:47:24 2008
@@ -89,3 +89,9 @@
 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