[vlc-commits] Move MIME types in desktop file to separate file for easier maintenance

Petter Reinholdtsen git at videolan.org
Mon May 9 13:28:17 CEST 2016


vlc | branch: master | Petter Reinholdtsen <pere at hungry.com> | Sun May  8 20:27:24 2016 +0200| [d4f1aaf5e405fbb08887bc864cb5a55f18c8ed31] | committer: Jean-Baptiste Kempf

Move MIME types in desktop file to separate file for easier maintenance

Move list of supported MIME types from vlc.desktop.in to vlc.desktop.mimetypes,
with one mime type per line with the option of hash comments to associate
information with the MIME types.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d4f1aaf5e405fbb08887bc864cb5a55f18c8ed31
---

 share/Makefile.am           |    3 +-
 share/vlc.desktop.in        |    2 +-
 share/vlc.desktop.mimetypes |  137 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 98f745f..18d80b4 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -6,11 +6,12 @@ appdatadir = $(datadir)/applications
 if !HAVE_WIN32
 appdata_DATA = vlc.desktop
 endif
-EXTRA_DIST += vlc.desktop.in
+EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
 CLEANFILES += $(appdata_DATA)
 
 vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
 	$(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+	$(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; sed -ie "s,\@MIMETYPES\@,$$mimetypes,g" tmp-$@
 	$(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
 	$(AM_V_at)mv -f tmp-$@ $@
 
diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index 9961a90..4fe8fae 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -88,6 +88,6 @@ Icon=vlc
 Terminal=false
 Type=Application
 Categories=AudioVideo;Player;Recorder;
-MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;audio/ogg;video/ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-p
 layer;application/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;video/vnd.mpegurl;
+MimeType=@MIMETYPES@
 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
 Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast;
diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
new file mode 100644
index 0000000..f567458
--- /dev/null
+++ b/share/vlc.desktop.mimetypes
@@ -0,0 +1,137 @@
+# List of MIME types to announce in the desktop file, to let desktop
+# environments and browsers know which file types to pass on to VLC.
+
+# DV files
+video/dv
+
+video/mpeg
+
+video/x-mpeg
+
+video/msvideo
+
+video/quicktime
+
+video/x-anim
+
+video/x-avi
+
+video/x-ms-asf
+
+video/x-ms-wmv
+
+video/x-msvideo
+
+video/x-nsv
+
+video/x-flc
+
+video/x-fli
+
+video/x-flv
+
+video/vnd.rn-realvideo
+
+video/mp4
+
+video/mp4v-es
+
+video/mp2t
+
+application/ogg
+
+application/x-ogg
+
+video/x-ogm+ogg
+
+audio/x-vorbis+ogg
+
+audio/ogg
+
+video/ogg
+
+application/x-matroska
+
+audio/x-matroska
+
+video/x-matroska
+
+video/webm
+
+audio/webm
+
+audio/x-mp3
+
+audio/x-mpeg
+
+audio/mpeg
+
+audio/x-wav
+
+audio/x-mpegurl
+
+audio/x-scpls
+
+audio/x-m4a
+
+audio/x-ms-asf
+
+audio/x-ms-asx
+
+audio/x-ms-wax
+
+application/vnd.rn-realmedia
+
+audio/x-real-audio
+
+audio/x-pn-realaudio
+
+application/x-flac
+
+audio/x-flac
+
+application/x-shockwave-flash
+
+misc/ultravox
+
+audio/vnd.rn-realaudio
+
+audio/x-pn-aiff
+
+audio/x-pn-au
+
+audio/x-pn-wav
+
+audio/x-pn-windows-acm
+
+image/vnd.rn-realpix
+
+audio/x-pn-realaudio-plugin
+
+application/x-extension-mp4
+
+audio/mp4
+
+audio/amr
+
+audio/amr-wb
+
+x-content/video-vcd
+
+x-content/video-svcd
+
+x-content/video-dvd
+
+x-content/audio-cdda
+
+x-content/audio-player
+
+application/xspf+xml
+
+x-scheme-handler/mms
+
+x-scheme-handler/rtmp
+
+x-scheme-handler/rtsp
+
+video/vnd.mpegurl



More information about the vlc-commits mailing list