TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix blank DVD/BD/HDDVD media mimetypes

Browse Source 
This relates to Bug 1371
pull/2/head
Timothy Pearson 11 years ago
parent 119d2fdb65
commit 226c78e59b
1 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File

34
tdeioslave/media/mediamanager/tdehardwarebackend.cpp
Unescape Escape View File

@ -154,12 +154,6 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
) {
//
}
/* We also don't display devices that underlie other devices;
/* e.g. the raw partition of a device mapper volume
*/
else if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
//
}
else {
// Create medium
Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
@ -564,7 +558,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDR)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank DVD-R");
}
@ -573,7 +567,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRW)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank DVD-RW");
}
@ -582,7 +576,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRDL)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank Dual Layer DVD-R");
}
@ -591,7 +585,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRWDL)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank Dual Layer DVD-RW");
}
@ -600,7 +594,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSR)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank DVD+R");
}
@ -609,7 +603,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRW)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank DVD+RW");
}
@ -618,7 +612,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRDL)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank Dual Layer DVD+R");
}
@ -627,7 +621,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRWDL)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
mimeType = "media/blankdvd";
medium->unmountableState("");
diskLabel = i18n("Blank Dual Layer DVD+RW");
}
@ -636,7 +630,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDROM)) {
mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd" + MOUNT_SUFFIX;
mimeType = "media/blankbd";
medium->unmountableState("");
diskLabel = i18n("Blank BD-ROM");
}
@ -645,7 +639,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDR)) {
mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd" + MOUNT_SUFFIX;
mimeType = "media/blankbd";
medium->unmountableState("");
diskLabel = i18n("Blank BD-R");
}
@ -654,7 +648,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDRW)) {
mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd" + MOUNT_SUFFIX;
mimeType = "media/blankbd";
medium->unmountableState("");
diskLabel = i18n("Blank BD-RW");
}
@ -663,7 +657,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM)) {
mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd" + MOUNT_SUFFIX;
mimeType = "media/blankhddvd";
medium->unmountableState("");
diskLabel = i18n("Blank HDDVD-ROM");
}
@ -672,7 +666,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR)) {
mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd" + MOUNT_SUFFIX;
mimeType = "media/blankhddvd";
medium->unmountableState("");
diskLabel = i18n("Blank HDDVD-R");
}
@ -681,7 +675,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW)) {
mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd" + MOUNT_SUFFIX;
mimeType = "media/blankhddvd";
medium->unmountableState("");
diskLabel = i18n("Blank HDDVD-RW");
}

Write Preview
Loading…
Cancel
Save