← Back to branch summary

~ubuntu-branches/ubuntu/quantal/shotwell/quantal

« back to all changes in this revision

Viewing changes to src/VideoSupport.vala

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-02-21 13:52:58 UTC
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: package-import@ubuntu.com-20120221135258-ao9jiib5qicomq7q
Tags: upstream-0.11.92
Import upstream version 0.11.92

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VideoSupport.vala
1
 
/* Copyright 2010-2011 Yorba Foundation
 
1
/* Copyright 2010-2012 Yorba Foundation
2
2
 *
3
3
 * This software is licensed under the GNU LGPL (version 2.1 or later).
4
4
 * See the COPYING file in this distribution. 
83
83
            return ImportResult.UNSUPPORTED_FORMAT;
84
84
        }
85
85
        
86
 
        TimeVal timestamp;
87
 
        info.get_modification_time(out timestamp);
 
86
        TimeVal timestamp = info.get_modification_time();
88
87
        
89
88
        // make sure params has a valid md5
90
89
        assert(params.md5 != null);
405
404
        if (videos.size == 0)
406
405
            return null;
407
406
        
408
 
                // in place export is relatively easy -- provide a fast, separate code path for it
 
407
        // in place export is relatively easy -- provide a fast, separate code path for it
409
408
        if (export_in_place) {
410
409
             ExporterUI temp_exporter = new ExporterUI(new Exporter.for_temp_file(videos,
411
410
                Scaling.for_original(), ExportFormatParameters.unmodified()));
701
700
        }
702
701
    }
703
702
 
704
 
    public override Dimensions get_dimensions() {
 
703
    public override Dimensions get_dimensions(Photo.Exception disallowed_steps = Photo.Exception.NONE) {
705
704
        return get_frame_dimensions();
706
705
    }
707
706
    
722
721
    }
723
722
    
724
723
    public void set_master_timestamp(FileInfo info) {
725
 
        TimeVal time_val;
726
 
        info.get_modification_time(out time_val);
 
724
        TimeVal time_val = info.get_modification_time();
727
725
        
728
726
        try {
729
727
            lock (backing_row) {
1073
1071
        if (video.get_filesize() != info.get_size())
1074
1072
            return;
1075
1073
        
1076
 
        TimeVal modification;
1077
 
        info.get_modification_time(out modification);
1078
 
        
1079
 
        if (video.get_timestamp() == modification.tv_sec)
 
1074
        if (video.get_timestamp() == info.get_modification_time().tv_sec)
1080
1075
            matching_master.add(video);
1081
1076
    }
1082
1077