From ae995b68ce19f7434269802e5eb9333d75049987 Mon Sep 17 00:00:00 2001
From: Christian Stromme <christian.stromme@qt.io>
Date: Thu, 8 Sep 2016 00:20:06 +0200
Subject: Reduce size of QMediaPlayerPrivate

Rearranged the data members to reduce the object size
(-16 bytes on 64 bit systems).

Change-Id: I0f285fafc42633fff42eba1ddc68c6f9bee2cec8
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
---
 src/multimedia/playback/qmediaplayer.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/multimedia/playback/qmediaplayer.cpp')

diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index d349654ff..98c2cf8c6 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -94,7 +94,6 @@ static void qRegisterMediaPlayerMetaTypes()
 
 Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlayerMetaTypes)
 
-
 #define MAX_NESTED_PLAYLISTS 16
 
 class QMediaPlayerPrivate : public QMediaObjectPrivate
@@ -106,38 +105,39 @@ public:
         : provider(0)
         , control(0)
         , audioRoleControl(0)
+        , playlist(0)
+        , networkAccessControl(0)
         , state(QMediaPlayer::StoppedState)
         , status(QMediaPlayer::UnknownMediaStatus)
         , error(QMediaPlayer::NoError)
         , ignoreNextStatusChange(-1)
-        , playlist(0)
-        , networkAccessControl(0)
-        , hasStreamPlaybackFeature(false)
         , nestedPlaylists(0)
+        , hasStreamPlaybackFeature(false)
     {}
 
     QMediaServiceProvider *provider;
     QMediaPlayerControl* control;
     QAudioRoleControl *audioRoleControl;
-    QMediaPlayer::State state;
-    QMediaPlayer::MediaStatus status;
-    QMediaPlayer::Error error;
     QString errorString;
-    int ignoreNextStatusChange;
 
     QPointer<QObject> videoOutput;
     QMediaPlaylist *playlist;
     QMediaNetworkAccessControl *networkAccessControl;
     QVideoSurfaceOutput surfaceOutput;
-    bool hasStreamPlaybackFeature;
     QMediaContent qrcMedia;
     QScopedPointer<QFile> qrcFile;
 
     QMediaContent rootMedia;
     QMediaContent pendingPlaylist;
+    QMediaPlayer::State state;
+    QMediaPlayer::MediaStatus status;
+    QMediaPlayer::Error error;
+    int ignoreNextStatusChange;
+    int nestedPlaylists;
+    bool hasStreamPlaybackFeature;
+
     QMediaPlaylist *parentPlaylist(QMediaPlaylist *pls);
     bool isInChain(QUrl url);
-    int nestedPlaylists;
 
     void setMedia(const QMediaContent &media, QIODevice *stream = 0);
 
-- 
cgit v1.2.3