Merge pull request #1317 from lvzhaobing/master

edit qmltypes and fix a signal connection error

Author: wang-bin

qml/QmlAV/QmlAVPlayer.h

@@ -342,7 +342,7 @@ public Q_SLOTS:
     void statusChanged();
     void mediaObjectChanged();
     void audioBackendsChanged();
-    void notifyIntervalChanged(int notifyInterval);
+    void notifyIntervalChanged();
 
 private Q_SLOTS:
     // connect to signals from player
@@ -401,7 +401,6 @@ private Q_SLOTS:
     QList<QuickAudioFilter*> m_afilters;
     QList<QuickVideoFilter*> m_vfilters;
     QStringList m_ao;
-    int m_notifyInterval;
 };
 
 #endif // QTAV_QML_AVPLAYER_H

qml/QmlAVPlayer.cpp

@@ -89,7 +89,7 @@ void QmlAVPlayer::classBegin()
     connect(mpPlayer, SIGNAL(seekableChanged()), SIGNAL(seekableChanged()));
     connect(mpPlayer, SIGNAL(seekFinished(qint64)), this, SIGNAL(seekFinished()), Qt::DirectConnection);
     connect(mpPlayer, SIGNAL(bufferProgressChanged(qreal)), SIGNAL(bufferProgressChanged()));
-    connect(mpPlayer, SIGNAL(notifyIntervalChanged()), SIGNAL(notifyIntervalChanged()));
+    connect(mpPlayer, SIGNAL(notifyIntervalChanged()), this,SIGNAL(notifyIntervalChanged()));
     connect(this, SIGNAL(channelLayoutChanged()), SLOT(applyChannelLayout()));
     // direct connection to ensure volume() in slots is correct
     connect(mpPlayer->audio(), SIGNAL(volumeChanged(qreal)), SLOT(applyVolume()), Qt::DirectConnection);

qml/plugins.qmltypes

@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.1
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
@@ -248,6 +248,7 @@ Module {
         Property { name: "videoFilters"; type: "QuickVideoFilter"; isList: true; isReadonly: true }
         Property { name: "audioBackends"; type: "QStringList" }
         Property { name: "supportedAudioBackends"; type: "QStringList"; isReadonly: true }
+        Property { name: "notifyInterval"; type: "int" }
         Signal { name: "loopCountChanged" }
         Signal { name: "videoOutChanged" }
         Signal { name: "paused" }