Improved support for bluray discs.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 32381684a2eecaaa43616d5bc8ab51780d42e336)

2 files changed, 30 insertions, 22 deletions

diff --git a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
index 4b70c62e7..904d30329 100644
--- a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
+++ b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
@@ -1,5 +1,10 @@
 [Desktop Entry]
 Type=Service
+X-TDE-ServiceTypes=KFilePlugin,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/hdd_mounted,media/hdd_mounted_decrypted,media/hdd_unmounted,media/hdd_unmounted_decrypted,media/bluray_mounted,media/bluray_mounted_decrypted,media/bluray_unmounted,media/bluray_unmounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted,media/cdrom_unmounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/nfs_mounted,media/cd-r_unmounted,media/cd-r_unmounted_decrypted,media/cd-rw_unmounted,media/cd-rw_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/blurayvideo,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/svcd,media/floppy5_unmounted,media/vcd,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/gphoto2camera,media/camera_mounted,media/camera_unmounted
+X-TDE-Library=tdefile_media
+
+
+
 Name=Medium Information
 Name[af]=Medium Informasie
 Name[ar]=معلومات عن الوسيط
@@ -70,6 +75,3 @@ Name[vi]=Thông tin về Ổ lưu trữ
 Name[wa]=Informåcions sol mediom
 Name[zh_CN]=介质信息
 Name[zh_TW]=媒體資訊
-X-TDE-ServiceTypes=KFilePlugin
-X-TDE-Library=tdefile_media
-MimeType=media/audiocd;media/hdd_mounted;media/hdd_mounted_decrypted;media/blankcd;media/hdd_unmounted;media/hdd_unmounted_decrypted;media/blankdvd;media/cdrom_mounted;media/cdrom_mounted_decrypted;media/cdrom_unmounted;media/cdrom_unmounted_decrypted;media/cd-r_mounted;media/cd-r_mounted_decrypted;media/cd-rw_mounted;media/cd-rw_mounted_decrypted;media/nfs_mounted;media/cd-r_unmounted;media/cd-r_unmounted_decrypted;media/cd-rw_unmounted;media/cd-rw_unmounted_decrypted;media/nfs_unmounted;media/removable_mounted;media/removable_mounted_decrypted;media/dvd_mounted;media/dvd_mounted_decrypted;media/removable_unmounted;media/removable_unmounted_decrypted;media/dvd_unmounted;media/dvd_unmounted_decrypted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index 3d6c16cf3..145cf502a 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -49,48 +49,54 @@ KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
 	: KFilePlugin(parent, name, args)
 {
 	addMimeType( "media/audiocd" );
-	addMimeType( "media/hdd_mounted" );
-	addMimeType( "media/hdd_mounted_decrypted" );
+	addMimeType( "media/blankbluray" );
 	addMimeType( "media/blankcd" );
-	addMimeType( "media/hdd_unmounted" );
-	addMimeType( "media/hdd_unmounted_decrypted" );
 	addMimeType( "media/blankdvd" );
+	addMimeType( "media/bluray_mounted" );
+	addMimeType( "media/bluray_mounted_decrypted" );
+	addMimeType( "media/bluray_unmounted" );
+	addMimeType( "media/bluray_unmounted_decrypted" );
 	addMimeType( "media/cdrom_mounted" );
 	addMimeType( "media/cdrom_mounted_decrypted" );
 	addMimeType( "media/cdrom_unmounted" );
 	addMimeType( "media/cdrom_unmounted_decrypted" );
 	addMimeType( "media/cd-r_mounted" );
 	addMimeType( "media/cd-r_mounted_decrypted" );
-	addMimeType( "media/cd-rw_mounted" );
-	addMimeType( "media/cd-rw_mounted_decrypted" );
-	addMimeType( "media/nfs_mounted" );
 	addMimeType( "media/cd-r_unmounted" );
 	addMimeType( "media/cd-r_unmounted_decrypted" );
+	addMimeType( "media/cd-rw_mounted" );
+	addMimeType( "media/cd-rw_mounted_decrypted" );
 	addMimeType( "media/cd-rw_unmounted" );
 	addMimeType( "media/cd-rw_unmounted_decrypted" );
-	addMimeType( "media/nfs_unmounted" );
-	addMimeType( "media/removable_mounted" );
-	addMimeType( "media/removable_mounted_decrypted" );
 	addMimeType( "media/dvd_mounted" );
 	addMimeType( "media/dvd_mounted_decrypted" );
-	addMimeType( "media/removable_unmounted" );
-	addMimeType( "media/removable_unmounted_decrypted" );
 	addMimeType( "media/dvd_unmounted" );
 	addMimeType( "media/dvd_unmounted_decrypted" );
+	addMimeType( "media/hdd_mounted" );
+	addMimeType( "media/hdd_mounted_decrypted" );
+	addMimeType( "media/hdd_unmounted" );
+	addMimeType( "media/hdd_unmounted_decrypted" );
+	addMimeType( "media/removable_mounted" );
+	addMimeType( "media/removable_mounted_decrypted" );
+	addMimeType( "media/removable_unmounted" );
+	addMimeType( "media/removable_unmounted_decrypted" );
+	addMimeType( "media/nfs_mounted" );
+	addMimeType( "media/nfs_unmounted" );
 	addMimeType( "media/smb_mounted" );
-	addMimeType( "media/dvdvideo" );
 	addMimeType( "media/smb_unmounted" );
+	addMimeType( "media/floppy_mounted" );
+	addMimeType( "media/floppy_unmounted" );
 	addMimeType( "media/floppy5_mounted" );
-	addMimeType( "media/svcd" );
 	addMimeType( "media/floppy5_unmounted" );
-	addMimeType( "media/vcd" );
-	addMimeType( "media/floppy_mounted" );
 	addMimeType( "media/zip_mounted" );
-	addMimeType( "media/floppy_unmounted" );
 	addMimeType( "media/zip_unmounted" );
-	addMimeType( "media/gphoto2camera" );
+	addMimeType( "media/blurayvideo" );
+	addMimeType( "media/dvdvideo" );
+	addMimeType( "media/svcd" );
+	addMimeType( "media/vcd" );
 	addMimeType( "media/camera_mounted" );
-	addMimeType( "media/camera_unmounted" );	
+	addMimeType( "media/camera_unmounted" );
+	addMimeType( "media/gphoto2camera" );
 }
 
 bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)