← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/k3b/oneiric

« back to all changes in this revision

Viewing changes to libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-03-05 18:46:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100305184632-uhnjo6k45yi6bkmu
Tags: 1.90.0~rc1-0ubuntu1
* New upstream release
  - Bump kdelibs5-dev to 4.4.1 as required, k3b uses KAuth since this version

Show diffs side-by-side

added added

removed removed

Lines of Context:
libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
101
101
                if( d->doc->importedSession() >= 0 )
102
102
                    wantedMediaState = K3b::Device::STATE_INCOMPLETE;
103
103
 
104
 
                Device::MediaType m = waitForMedia( d->doc->burner(),
105
 
                                                    wantedMediaState,
106
 
                                                    K3b::Device::MEDIA_WRITABLE );
 
104
                Device::MediaType m = waitForMedium( d->doc->burner(),
 
105
                                                     wantedMediaState,
 
106
                                                     K3b::Device::MEDIA_WRITABLE );
107
107
 
108
108
                if( m == Device::MEDIA_UNKNOWN ) {
109
109
                    cancel();
121
121
        // FIXME: not sure if it is good to always wait for a medium this early
122
122
        if( d->usedMultiSessionMode == K3b::DataDoc::CONTINUE ||
123
123
            d->usedMultiSessionMode == K3b::DataDoc::FINISH ) {
124
 
            int m = waitForMedia( d->doc->burner(),
 
124
            int m = waitForMedium( d->doc->burner(),
125
125
                                  K3b::Device::STATE_INCOMPLETE,
126
126
                                  K3b::Device::MEDIA_WRITABLE );
127
127
 
221
221
{
222
222
    K3b::Device::DiskInfo info = d->doc->burner()->diskInfo();
223
223
    K3b::Device::Toc toc = d->doc->burner()->readToc();
224
 
    
 
224
 
225
225
    if( toc.isEmpty() )
226
226
    {
227
227
        emit infoMessage( i18n("No medium inserted or an empty medium in %1. Cannot continue multisession disk.",