← Back to branch summary

~ubuntu-branches/debian/squeeze/brasero/squeeze

« back to all changes in this revision

Viewing changes to libbrasero-burn/burn-task-ctx.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2010-05-03 16:02:19 UTC
  • mfrom: (1.2.18 upstream) (9.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100503160219-m16zmh337vlv0cmw
Tags: 2.30.1-1
http://bugs.debian.org/554057
* 31_link_libice.patch: new patch. Explicitly link to libice.
  Closes: #554057.
* Drop build-dependency on libbeagle since beagle is going to be 
  removed.
* New upstream release.
* Update build-dependencies.
* Disable introspection support to avoid blocking the totem 
  transition.
* Bump shlibs to 2.30.
* 01_pkglibdir.patch, 90_relibtoolize.patch: updated for the new 
  version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libbrasero-burn/burn-task-ctx.c
227
227
{
228
228
        BraseroTaskCtxPrivate *priv;
229
229
 
230
 
        g_return_val_if_fail (tracks != NULL, BRASERO_BURN_ERR);
231
 
 
232
230
        priv = BRASERO_TASK_CTX_PRIVATE (self);
233
231
        if (!priv->current_track)
234
232
                return BRASERO_BURN_ERR;
235
233
 
236
 
        *tracks = priv->tracks;
 
234
        if (tracks)
 
235
                *tracks = priv->tracks;
 
236
 
 
237
        /* If no track has been added let the caller
 
238
         * know with BRASERO_BURN_NOT_READY */
 
239
        if (!priv->tracks)
 
240
                return BRASERO_BURN_NOT_READY;
 
241
 
237
242
        return BRASERO_BURN_OK;
238
243
}
239
244
 
311
316
        priv->session_bytes += priv->track_bytes;
312
317
        priv->track_bytes = 0;
313
318
        priv->last_written = 0;
 
319
        priv->progress = 0;
314
320
 
315
321
        if (priv->current_track)
316
322
                g_object_unref (priv->current_track);
676
682
                return BRASERO_BURN_OK;
677
683
        }
678
684
 
 
685
        if (priv->progress < progress)
 
686
                priv->progress = progress;
 
687
 
679
688
        if (!priv->timer)
680
689
                return BRASERO_BURN_OK;
681
690
 
687
696
                priv->current_elapsed = elapsed;
688
697
        }
689
698
 
690
 
        if (priv->progress < progress)
691
 
                priv->progress = progress;
692
 
 
693
699
        return BRASERO_BURN_OK;
694
700
}
695
701