← Back to branch summary

~ubuntu-branches/ubuntu/utopic/thumbnailer/utopic-proposed

« back to all changes in this revision

Viewing changes to src/thumbnailer.cpp

  • Committer: Package Import Robot
  • Author(s): Łukasz 'sil2100' Zemczak
  • Date: 2014-09-02 21:50:08 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20140902215008-5ub9yws95g6ebb62
Tags: 1.2+14.10.20140901.is.1.2+14.10.20140814-0ubuntu1
https://launchpad.net/bugs/1363314
Revert the last two landings. The 1.2+14.10.20140827.1 version
introduced a serious regression breaking many projects, indirectly
caused by thumbnailer using gst.  LP: #1363314.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/thumbnailer.cpp
47
47
 
48
48
public:
49
49
    ThumbnailCache cache;
50
 
    AudioImageExtractor audio;
 
50
//    AudioImageExtractor audio;
51
51
    VideoScreenshotter video;
52
52
    ImageScaler scaler;
53
53
    MediaArtCache macache;
85
85
    return fname;
86
86
}
87
87
 
88
 
string ThumbnailerPrivate::create_audio_thumbnail(const string &abspath,
89
 
        ThumbnailSize desired_size, ThumbnailPolicy /*policy*/) {
90
 
    string tnfile = cache.get_cache_file_name(abspath, desired_size);
91
 
    string tmpname = create_random_filename();
92
 
    bool extracted = false;
 
88
string ThumbnailerPrivate::create_audio_thumbnail(const string &/*abspath*/,
 
89
        ThumbnailSize /*desired_size*/, ThumbnailPolicy /*policy*/) {
 
90
    // There was a symbol clash between 1.0 and 0.10 versions of
 
91
    // GStreamer on the desktop so we need to disable in-process
 
92
    // usage of gstreamer. Re-enable this once desktop moves to
 
93
    // newer Qt multimedia that has GStreamer 1.0.
 
94
/*
93
95
    try {
94
96
        if(audio.extract(abspath, tmpname)) {
95
97
            extracted = true;
101
103
        unlink(tmpname.c_str());
102
104
        return tnfile;
103
105
    }
 
106
    */
104
107
    return "";
105
108
}
106
109
string ThumbnailerPrivate::create_generic_thumbnail(const string &abspath, ThumbnailSize desired_size) {