Commit a3591739 authored by Leslie Zhai's avatar Leslie Zhai

Teach K3B learned to handle BD.

A patch by Thomas Schmitt!

Tested by Cristian Aravena Romero!

also took CT consultation for my brain, but the result is not too bad :)

BUG: 381074
parent 329c969b
......@@ -265,8 +265,6 @@ void K3b::Iso9660ImageWritingJob::startWriting()
mt = K3b::Device::MEDIA_WRITABLE_DVD | K3b::Device::MEDIA_WRITABLE_BD;
}
qDebug() << "Bug 381074: MediaTypes: " << mt;
// wait for the media
Device::MediaType media = waitForMedium( m_device, K3b::Device::STATE_EMPTY, mt, K3b::imageFilesize( QUrl::fromLocalFile(m_imagePath) )/2048 );
if( media == Device::MEDIA_UNKNOWN ) {
......
......@@ -701,12 +701,6 @@ bool K3b::DataJob::waitForBurnMedium()
// start with all media types supported by the writer
Device::MediaTypes m = d->doc->supportedMediaTypes() & d->doc->burner()->writeCapabilities();
qDebug() << "Bug 381074: supportedMediaTypes: "
<< d->doc->supportedMediaTypes();
qDebug() << "Bug 381074: writeCapabilities: "
<< d->doc->burner()->writeCapabilities();
// if everything goes wrong we are left with no possible media to request
if ( !m ) {
emit infoMessage( i18n( "Internal Error: No medium type fits. This project cannot be burned." ), MessageError );
......
......@@ -70,7 +70,7 @@ K3b::BurnJob* K3b::VideoDvdDoc::newBurnJob( K3b::JobHandler* hdl, QObject* paren
K3b::Device::MediaTypes K3b::VideoDvdDoc::supportedMediaTypes() const
{
return K3b::Device::MEDIA_WRITABLE_DVD;
return K3b::Device::MEDIA_WRITABLE_DVD | K3b::Device::MEDIA_WRITABLE_BD;
}
bool K3b::VideoDvdDoc::saveDocumentData(QDomElement*)
......
......@@ -248,15 +248,6 @@ void K3b::EmptyDiscWaiter::slotMediumChanged( K3b::Device::Device* dev )
// if( !mediaState.isEmpty() )
// mediaState = " (" + mediaState +")";
qDebug() << "Bug 381074: wanted: "
<< __PRETTY_FUNCTION__ << d->wantedMediaType
<< d->wantedMediaState << d->wantedMinMediaSize.lba();
qDebug() << "Bug 381074: found: "
<< __PRETTY_FUNCTION__ << medium.diskInfo().mediaType()
<< medium.diskInfo().diskState()
<< medium.actuallyRemainingSize().lba();
// /////////////////////////////////////////////////////////////
//
// BD-RE handling
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment