← Back to branch summary

~ubuntu-branches/ubuntu/vivid/brasero/vivid-proposed

« back to all changes in this revision

Viewing changes to libbrasero-burn/brasero-track-stream.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-18 17:53:39 UTC
  • mfrom: (1.1.47 upstream) (1.4.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110518175339-so6a6fejezs5i1pc
Tags: 3.0.0-1ubuntu1
* Rebase from Debian and GNOME3 PPA. Remaining Ubuntu changes:
* debian/control:
  - Build-Depend on dh-autoreconf, libappindicator3-dev and
    liblaunchpad-integration-3.0-dev
  - Recommends: brasero-cdrkit
  - libbrasero-media3-1 Depends on dvd+rw-tools not growisofs and
    Suggests rather than Recommends gstreamer plugin packages
* debian/patches/010_lpi.patch:
  - Launchpad integration patch
* debian/patches/012_appindicator.patch:
  - Use application indicators
* debian/rules:
  - Include autoreconf.mk
* debian/watch:
  - Watch unstable releases also

Show diffs side-by-side

added added

removed removed

Lines of Context:
libbrasero-burn/brasero-track-stream.c
243
243
 * This function returns the path or the URI (if @uri is TRUE)
244
244
 * of the stream (song or video file).
245
245
 *
 
246
 * Note: this function resets any length previously set to 0.
246
247
 * Return value: a #gchar.
247
248
 **/
248
249
 
347
348
                return BRASERO_BURN_ERR;
348
349
 
349
350
        *length = BRASERO_STREAM_LENGTH (priv->start, priv->end + priv->gap);
350
 
 
351
351
        return BRASERO_BURN_OK;
352
352
}
353
353
 
356
356
                               goffset *blocks,
357
357
                               goffset *block_size)
358
358
{
359
 
        BraseroTrackStreamPrivate *priv;
360
359
        BraseroStreamFormat format;
361
360
 
362
 
        priv = BRASERO_TRACK_STREAM_PRIVATE (track);
363
 
 
364
361
        format = brasero_track_stream_get_format (BRASERO_TRACK_STREAM (track));
365
362
        if (!BRASERO_STREAM_FORMAT_HAS_VIDEO (format)) {
366
363
                if (blocks) {