diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h | |
parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h')
-rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h index cff536f4d..ffa80bd27 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h @@ -48,6 +48,7 @@ typedef struct mmr_connection mmr_connection_t; typedef struct mmr_context mmr_context_t; typedef struct mmrenderer_monitor mmrenderer_monitor_t; +typedef struct strm_dict strm_dict_t; QT_BEGIN_NAMESPACE @@ -116,6 +117,7 @@ protected: void setMmBufferStatus(const QString &bufferStatus); void setMmBufferLevel(const QString &bufferLevel); void handleMmStopped(); + void updateMetaData(const strm_dict_t *dict); // must be called from subclass dtors (calls virtual function stopMonitoring()) void destroy(); @@ -132,7 +134,6 @@ private: void closeConnection(); void attach(); void detach(); - void updateMetaData(); // All these set the specified value to the backend, but neither emit changed signals // nor change the member value. |