banshee r4885 - trunk/banshee/data/desktop-files

[abock svn gnome org]

Author: abock
Date: Thu Jan  8 02:05:53 2009
New Revision: 4885
URL: http://svn.gnome.org/viewvc/banshee?rev=4885&view=rev

Log:
Added a desktop file for media players, removed the one for playlists, fixed up the update script a bit to keep the input mime file so fresh and so clean.

Added:
   trunk/banshee/data/desktop-files/banshee-1-media-player.desktop.in.in
Removed:
   trunk/banshee/data/desktop-files/banshee-1-playlist.desktop.in.in
   trunk/banshee/data/desktop-files/banshee-1-playlist.desktop.mime
Modified:
   trunk/banshee/data/desktop-files/Makefile.am
   trunk/banshee/data/desktop-files/banshee-1-audiocd.desktop.in.in
   trunk/banshee/data/desktop-files/banshee-1.desktop.mime
   trunk/banshee/data/desktop-files/update-desktop-file.sh

Modified: trunk/banshee/data/desktop-files/Makefile.am
==============================================================================
--- trunk/banshee/data/desktop-files/Makefile.am	(original)
+++ trunk/banshee/data/desktop-files/Makefile.am	Thu Jan  8 02:05:53 2009
@@ -5,8 +5,14 @@
 DESKTOP_FRAMEWORK_DEPS = common.desktop update-desktop-file.sh
 DESKTOP_MIME_DEPS = $(wildcard *.desktop.mime)
 
+if ENABLE_RELEASE
+UPDATE_MIME_FILES = no
+else
+UPDATE_MIME_FILES = yes
+endif
+
 %.desktop.in: %.desktop.in.in $(DESKTOP_FRAMEWORK_DEPS) $(DESKTOP_MIME_DEPS)
-	./update-desktop-file.sh "$<" "$(VERSION)" > "$@"
+	./update-desktop-file.sh "$<" "$(VERSION)" "$(UPDATE_MIME_FILES)" > "$@"
 
 @INTLTOOL_DESKTOP_RULE@
 

Modified: trunk/banshee/data/desktop-files/banshee-1-audiocd.desktop.in.in
==============================================================================
--- trunk/banshee/data/desktop-files/banshee-1-audiocd.desktop.in.in	(original)
+++ trunk/banshee/data/desktop-files/banshee-1-audiocd.desktop.in.in	Thu Jan  8 02:05:53 2009
@@ -1,3 +1,3 @@
-Exec=banshee-1 --redirect-log --audio-cd %U
+Exec=banshee-1 --redirect-log --play --device=%U
 NoDisplay=true
 MimeType=x-content/audio-cdda

Added: trunk/banshee/data/desktop-files/banshee-1-media-player.desktop.in.in
==============================================================================
--- (empty file)
+++ trunk/banshee/data/desktop-files/banshee-1-media-player.desktop.in.in	Thu Jan  8 02:05:53 2009
@@ -0,0 +1,3 @@
+Exec=banshee-1 --redirect-log --device=%U
+NoDisplay=true
+MimeType=x-content/audio-player

Modified: trunk/banshee/data/desktop-files/banshee-1.desktop.mime
==============================================================================
--- trunk/banshee/data/desktop-files/banshee-1.desktop.mime	(original)
+++ trunk/banshee/data/desktop-files/banshee-1.desktop.mime	Thu Jan  8 02:05:53 2009
@@ -35,12 +35,12 @@
 application/x-quicktime-media-link
 application/x-quicktimeplayer
 application/x-shorten
-application/x-troff-msvideo
 application/xspf+xml
+application/x-troff-msvideo
 audio/3gpp
+audio/ac3
 audio/AMR
 audio/AMR-WB
-audio/ac3
 audio/ape
 audio/avi
 audio/basic
@@ -122,13 +122,12 @@
 video/x-mpeg
 video/x-mpg
 video/x-ms-asf
+video/x-msvideo
 video/x-ms-wm
 video/x-ms-wmv
 video/x-ms-wmx
 video/x-ms-wvx
-video/x-msvideo
 video/x-nsv
 video/x-ogm+ogg
 video/x-theora
 video/x-theora+ogg
-x-content/audio-player

Modified: trunk/banshee/data/desktop-files/update-desktop-file.sh
==============================================================================
--- trunk/banshee/data/desktop-files/update-desktop-file.sh	(original)
+++ trunk/banshee/data/desktop-files/update-desktop-file.sh	Thu Jan  8 02:05:53 2009
@@ -2,6 +2,7 @@
 
 DESKTOP_SOURCE="$1"
 VERSION="$2"
+UPDATE_MIME_FILE="$3"
 MIMETYPES_FILE="$(basename "$DESKTOP_SOURCE" .in.in).mime"
 
 echo "[Desktop Entry]"
@@ -17,5 +18,11 @@
 	)
 
 	echo "MimeType=$MIMETYPES"
+
+	if [[ "$UPDATE_MIME_FILE" == "yes" ]]; then
+		(grep -E '^[[:space:]]*#' "$MIMETYPES_FILE";
+			echo "$MIMETYPES" | sed 's,;,\n,g') > "$MIMETYPES_FILE".tmp
+		mv "$MIMETYPES_FILE".tmp "$MIMETYPES_FILE"
+	fi
 fi