← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/cdrtools/burn-cdrecord.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2014-11-07 11:33:39 UTC
  • mfrom: (1.1.58) (1.2.28 sid)
  • Revision ID: package-import@ubuntu.com-20141107113339-2fu5oyykg0myne57
Tags: 3.11.4-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control{.in}:
    + Build-Depends on libappindicator3-dev and libunity-dev.
    + Don't {Build-}Depends on Tracker.
    + brasero Recommends: brasero-cdrkit.
    + libbrasero-media3-1 Depend on dvd+rw-tools and
      Suggest rather than Recommend gstreamer plugins & cdrdao
    + Also suggest gstreamer fluendo mp3 plugin
    + Have brasero-cdrkit Suggest, not Recommend, dvdauthor as it isn't
      in main.
  - debian/patches/012_appindicator.patch,
    debian/libbrasero-media3-1.symbols:
    + Use application indicators.
  - debian/patches/013_unity_launcher_progress:
    + Display burn progress in Brasero's Unity launcher icon.
  - debian/rules:
    + Don't build search (requires Tracker) but build Unity support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cdrtools/burn-cdrecord.c
424
424
                            GError **error)
425
425
{
426
426
        gint fd;
427
 
        int isrc;
428
427
        int errsv;
429
428
        gint size;
430
429
        gchar *path;
503
502
                goto error;
504
503
 
505
504
        /* ISRC */
506
 
        isrc = brasero_track_tag_lookup_int (BRASERO_TRACK (track), BRASERO_TRACK_STREAM_ISRC_TAG);
507
 
        if (isrc > 0)
508
 
                string = g_strdup_printf ("ISRC=\t%i\n", isrc);
 
505
        info = brasero_track_tag_lookup_string (BRASERO_TRACK (track), BRASERO_TRACK_STREAM_ISRC_TAG);
 
506
        if (info)
 
507
                string = g_strdup_printf ("ISRC=\t%s\n", info);
509
508
        else
510
509
                string = g_strdup ("ISRC=\t\n");
511
510
        size = strlen (string);