Re: Mpeg mime types patch

[Seth Nickell <snickell stanford edu>]

Looks fine, please commit (assuming you have run check-mime.pl, of
course ;-)

-seth

On Sun, 2002-09-29 at 11:09, Marco Pesenti Gritti wrote:
> Hi,
> 
> Here is the patch I sent to desktop-devel with some changes suggested by
> hadess and dobey.
> 
> It does:
> - Rename audio/x-mpeg description from "MP3 Audio" to "MPEG audio" in
> gnome-vfs.keys.in
> - Add audio/mpeg to gnome-vfs.keys.in (a copy of audio/x-mpeg)
> - Update gnome-vfs.applications to use also audio/mpeg
> - Add new audio/mpeg mime type to gnome-vfs.mime for mp1 extension
> 
> Please let me know if I can commit it or if there is something wrong.
> 
> Thanks
> 
> Marco
> 
> ----
> 

> ? autom4te.cache
> Index: gnome-vfs.applications
> ===================================================================
> RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.applications,v
> retrieving revision 1.51
> diff -u -r1.51 gnome-vfs.applications
> --- gnome-vfs.applications	5 Sep 2002 01:39:32 -0000	1.51
> +++ gnome-vfs.applications	29 Sep 2002 18:02:14 -0000
> @@ -101,7 +101,7 @@
>  	expects_uris=true
>  	requires_terminal=false
>  	supported_uri_schemes=http,file
> -	mime_types=audio/x-mp3,audio/x-mpeg,application/x-ogg,audio/x-wav
> +	mime_types=audio/x-mp3,audio/x-mpeg,application/x-ogg,audio/x-wav,audio/mpeg
>  
>  freeamp-no-uris
>  	command=freeamp
> @@ -343,7 +343,7 @@
>  	expects_uris=non-file
>  	requires_terminal=false
>  	supported_uri_schemes=http,ftp,file
> -	mime_types=audio/x-mp3,audio/x-mpeg
> +	mime_types=audio/x-mp3,audio/x-mpeg,audio/mpeg
>  
>  mtv
>  	command=mtv
> @@ -523,7 +523,7 @@
>  	expects_uris=true
>  	requires_terminal=false
>  	supported_uri_schemes=http,ftp,file
> -	mime_types=audio/x-mp3,audio/x-mpeg,application/x-ogg,audio/x-wav,audio/x-riff
> +	mime_types=audio/x-mp3,audio/x-mpeg,application/x-ogg,audio/x-wav,audio/x-riff,audio/mpeg
>  
>  xmms-no-uris
>  	command=xmms
> @@ -539,7 +539,7 @@
>  	can_open_multiple_files=true
>  	expects_uris=false
>  	requires_terminal=false
> -	mime_types=video/x-msvideo,video/x-ms-asf,video/mpeg,audio/x-mp3,audio/ac3,audio/x-wav
> +	mime_types=video/x-msvideo,video/x-ms-asf,video/mpeg,audio/x-mp3,audio/ac3,audio/x-wav,audio/mpeg
>  
>  xpdf
>  	command=xpdf
> Index: gnome-vfs.keys.in
> ===================================================================
> RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.keys.in,v
> retrieving revision 1.65
> diff -u -r1.65 gnome-vfs.keys.in
> --- gnome-vfs.keys.in	20 Aug 2002 08:39:37 -0000	1.65
> +++ gnome-vfs.keys.in	29 Sep 2002 18:02:23 -0000
> @@ -940,6 +940,16 @@
>  	icon_filename=gnome-audio
>  	_category=Audio
>  
> +# also audio/x-mpeg
> +audio/mpeg
> +	_description=MPEG audio
> +	icon_filename=i-music
> +	default_action_type=application
> +	short_list_application_ids_for_novice_user_level=xmms,freeamp,mpg123
> +	short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mpg123
> +	short_list_application_ids_for_advanced_user_level=xmms,freeamp,mpg123
> +	_category=Audio
> +
>  audio/prs.sid
>  	_description=Commodore 64 Audio
>  	icon_filename=i-music
> @@ -985,7 +995,6 @@
>  	short_list_application_ids_for_advanced_user_level=soundtracker
>  	_category=Audio
>  
> -# also audio/x-mpeg
>  audio/x-mp3
>  	_description=MP3 audio
>  	icon_filename=i-music
> @@ -1004,9 +1013,9 @@
>  	short_list_application_ids_for_advanced_user_level=xmms-no-uris,freeamp-no-uris
>  	_category=Audio
>  
> -# also audio/x-mp3
> +# also audio/mpeg
>  audio/x-mpeg
> -	_description=MP3 audio
> +	_description=MPEG audio
>  	icon_filename=i-music
>  	default_action_type=application
>  	short_list_application_ids_for_novice_user_level=xmms,freeamp,mpg123
> Index: gnome-vfs.mime
> ===================================================================
> RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.mime,v
> retrieving revision 1.45
> diff -u -r1.45 gnome-vfs.mime
> --- gnome-vfs.mime	20 Aug 2002 08:39:37 -0000	1.45
> +++ gnome-vfs.mime	29 Sep 2002 18:02:25 -0000
> @@ -356,6 +356,9 @@
>  audio/basic
>  	ext: snd
>  
> +audio/mpeg
> +	ext: mp1
> +
>  audio/prs.sid
>  	ext: sid psid
>