← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to src/brasero-audio-disc.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-11-26 16:20:01 UTC
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: james.westby@ubuntu.com-20091126162001-5iw2jzxdx8l31okz
Tags: upstream-2.29.2
Import upstream version 2.29.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-audio-disc.c
43
43
#include "brasero-io.h"
44
44
#include "brasero-notify.h"
45
45
 
 
46
#include "brasero-units.h"
 
47
 
46
48
#include "brasero-tags.h"
47
49
#include "brasero-track-stream-cfg.h"
48
50
#include "brasero-session-cfg.h"
217
219
        PROP_REJECT_FILE,
218
220
};
219
221
 
220
 
/* 1 sec = 75 sectors, len is in nanosecond */
221
 
#define BRASERO_SECTORS_TO_TIME(sectors)        (gint64) (sectors * GST_SECOND / 75)
222
222
#define COL_KEY "column_key"
223
223
 
224
224
#define BRASERO_AUDIO_DISC_CONTEXT              1000
541
541
        
542
542
        brasero_audio_disc_reset_real (cobj);
543
543
 
544
 
        g_free (cobj->priv->add_dir);
545
 
        g_free (cobj->priv->add_playlist);
 
544
        brasero_io_job_base_free (cobj->priv->add_dir);
 
545
        brasero_io_job_base_free (cobj->priv->add_playlist);
546
546
        cobj->priv->add_dir = NULL;
547
547
        cobj->priv->add_playlist = NULL;
548
548
 
614
614
        brasero_track_stream_set_boundaries (BRASERO_TRACK_STREAM (track),
615
615
                                             start,
616
616
                                             end,
617
 
                                             BRASERO_SECTORS_TO_TIME (gap_sectors));
 
617
                                             BRASERO_SECTORS_TO_DURATION (gap_sectors));
618
618
 
619
619
        session = brasero_video_tree_model_get_session (BRASERO_VIDEO_TREE_MODEL (store));
620
620
        if (pos > 0) {
801
801
                                      GError *error)
802
802
{
803
803
        gchar *primary;
804
 
        gchar *name = NULL;
805
 
 
806
 
        BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
 
804
        gchar *name;
 
805
        GFile *file;
 
806
 
 
807
        file = g_file_new_for_uri (uri);
 
808
        name = g_file_get_basename (file);
 
809
        g_object_unref (file);
 
810
 
807
811
        primary = g_strdup_printf (_("\"%s\" could not be opened."), name);
808
812
        brasero_app_alert (brasero_app_get_default (),
809
813
                           primary,
984
988
                        g_free (uri);
985
989
                }
986
990
        }
987
 
        brasero_status_free (status);
 
991
        g_object_unref (status);
988
992
 
989
993
        if (should_use_dts
990
994
        &&  brasero_burn_session_tag_lookup (BRASERO_BURN_SESSION (session), BRASERO_SESSION_STREAM_AUDIO_FORMAT, NULL) != BRASERO_BURN_OK)
1650
1654
        brasero_track_stream_set_boundaries (BRASERO_TRACK_STREAM (track),
1651
1655
                                                                      start,
1652
1656
                                                                      end,
1653
 
                                                                      BRASERO_SECTORS_TO_TIME (gap));
 
1657
                                                                      BRASERO_SECTORS_TO_DURATION (gap));
1654
1658
 
1655
1659
        if (title)
1656
1660
                brasero_track_tag_add_string (BRASERO_TRACK (track),
1672
1676
                                           BRASERO_TRACK_STREAM_ISRC_TAG,
1673
1677
                                           isrc);
1674
1678
 
1675
 
        if (end - start + BRASERO_SECTORS_TO_TIME (gap) < BRASERO_MIN_STREAM_LENGTH)
 
1679
        if (end - start + BRASERO_SECTORS_TO_DURATION (gap) < BRASERO_MIN_STREAM_LENGTH)
1676
1680
                brasero_audio_disc_short_track_dialog (disc);
1677
1681
 
1678
1682
        g_free (title);