1
=== modified file 'src/qml/player/TimeLine.qml'
2
--- src/qml/player/TimeLine.qml	2013-04-15 12:58:52 +0000
3
+++ src/qml/player/TimeLine.qml	2013-05-08 21:25:27 +0000
4
@@ -20,6 +20,7 @@
5
20
import QtQuick 2.0
20
import QtQuick 2.0
6
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
7
22
import "../sdk"
22
import "../sdk"
8
23
import "../theme"
9
23
24
10
24
Item {
25
Item {
11
25
    id: _timeLine
26
    id: _timeLine
12
@@ -40,14 +41,11 @@
13
40
    // "property alias value: _slider.value" does not work
41
    // "property alias value: _slider.value" does not work
14
41
    Binding { target: _slider; property: "value"; value: _timeLine.value }
42
    Binding { target: _slider; property: "value"; value: _timeLine.value }
15
42
43
16
43
    Component.onCompleted: {
17
44
        var result = Theme.loadTheme(Qt.resolvedUrl("../theme/theme.qmltheme"))
18
45
    }
19
46
20
47
    Slider {
44
    Slider {
21
48
        id: _slider
45
        id: _slider
22
49
46
23
50
        objectName: "TimeLine.Slider"
47
        objectName: "TimeLine.Slider"
24
48
        ItemStyle.delegate: VideoSlider {property Item item: _slider}
25
51
        anchors {
49
        anchors {
26
52
            top: parent.top
50
            top: parent.top
27
53
            bottom: parent.bottom
51
            bottom: parent.bottom
28
54
52
29
=== modified file 'src/thumbnail-provider.cpp'
30
--- src/thumbnail-provider.cpp	2013-04-04 18:55:30 +0000
31
+++ src/thumbnail-provider.cpp	2013-05-08 21:25:27 +0000
32
@@ -20,6 +20,7 @@
33
20
#include <QtCore/QStringList>
20
#include <QtCore/QStringList>
34
21
#include <QtCore/QTimer>
21
#include <QtCore/QTimer>
35
22
#include <QtCore/QMutex>
22
#include <QtCore/QMutex>
36
23
#include <QtCore/QMutexLocker>
37
23
#include <QtCore/QCoreApplication>
24
#include <QtCore/QCoreApplication>
38
24
#include <QtMultimedia/QVideoRendererControl>
25
#include <QtMultimedia/QVideoRendererControl>
39
25
#include <QtMultimedia/QMediaService>
26
#include <QtMultimedia/QMediaService>
40
@@ -30,14 +31,16 @@
41
30
      QQuickImageProvider(QQuickImageProvider::Image),
31
      QQuickImageProvider(QQuickImageProvider::Image),
42
31
      m_player(0)
32
      m_player(0)
43
32
{
33
{
45
33
    connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(applicationAboutToQuit()));
34
    connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(applicationAboutToQuit()), Qt::DirectConnection);
46
34
    createPlayer();
35
    createPlayer();
47
35
}
36
}
48
36
37
49
37
ThumbnailProvider::~ThumbnailProvider()
38
ThumbnailProvider::~ThumbnailProvider()
50
38
{
39
{
51
39
    if (m_player) {
40
    if (m_player) {
52
41
        QMutexLocker locker(&m_mutex);
53
40
        delete m_player;
42
        delete m_player;
54
43
        m_player = 0;
55
41
    }
44
    }
56
42
}
45
}
57
43
46
58
@@ -48,6 +51,7 @@
59
48
51
60
49
void ThumbnailProvider::applicationAboutToQuit()
52
void ThumbnailProvider::applicationAboutToQuit()
61
50
{
53
{
62
54
    QMutexLocker locker(&m_mutex);
63
51
    delete m_player;
55
    delete m_player;
64
52
    m_player = 0;
56
    m_player = 0;
65
53
}
57
}
66
@@ -79,6 +83,19 @@
67
79
        return QImage();        
83
        return QImage();        
68
80
    }
84
    }
69
81
85
70
86
    // check if the player exists ( the application still running )
71
87
    if (!m_player) {
72
88
        return QImage();
73
89
    }
74
90
75
91
    QMutexLocker locker(&m_mutex);
76
92
77
93
    // again check if the player exits after lock the mutex, since this function will run in a separed thread,
78
94
    // the application could be destroyed at this point and the function applicationAboutToQuit was called
79
95
    if (!m_player) {
80
96
        return QImage();
81
97
    }
82
98
83
82
    if (uri != m_player->uri()) {
99
    if (uri != m_player->uri()) {
84
83
        m_player->setUri(uri);
100
        m_player->setUri(uri);
85
84
        m_cache.clear();
101
        m_cache.clear();
86
@@ -89,7 +106,9 @@
87
89
        img = m_cache[time];
106
        img = m_cache[time];
88
90
    } else {
107
    } else {
89
91
        img = m_player->request(time, requestedSize).copy();
108
        img = m_player->request(time, requestedSize).copy();
91
92
        m_cache.insert(time, img);
109
        if (!img.isNull()) {
92
110
            m_cache.insert(time, img);
93
111
        }
94
93
    }
112
    }
95
94
113
96
95
    *size = img.size();
114
    *size = img.size();
97
96
115
98
=== modified file 'src/thumbnail-provider.h'
99
--- src/thumbnail-provider.h	2013-02-12 14:30:57 +0000
100
+++ src/thumbnail-provider.h	2013-05-08 21:25:27 +0000
101
@@ -23,6 +23,7 @@
102
23
#include <QtGui/QImage>
23
#include <QtGui/QImage>
103
24
#include <QtCore/QMap>
24
#include <QtCore/QMap>
104
25
#include <QtCore/QQueue>
25
#include <QtCore/QQueue>
105
26
#include <QtCore/QMutex>
106
26
27
107
27
class ThumbnailPipeline;
28
class ThumbnailPipeline;
108
28
29
109
@@ -42,6 +43,7 @@
110
42
    private:
43
    private:
111
43
        ThumbnailPipeline *m_player;
44
        ThumbnailPipeline *m_player;
112
44
        QMap<qint64, QImage> m_cache;
45
        QMap<qint64, QImage> m_cache;
113
46
        QMutex m_mutex;
114
45
47
115
46
        void createPlayer();
48
        void createPlayer();
116
47
        QString parseThumbnailName(const QString &id, qint64 *time) const;
49
        QString parseThumbnailName(const QString &id, qint64 *time) const;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-05-08
Tiago Salem Herrmann (community)			Approve on 2013-05-08
Gustavo Pichorim Boiko (community)		2013-05-03	Needs Information on 2013-05-08
Review via email: mp+162438@code.launchpad.net