[Cores] Order init lists correctly.

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
index ebcbcfb..e12a4e0 100644 (file)
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -113,19 +113,19 @@ static BOOL CALLBACK DSEnumCallback(LPGUID lpGuid, LPCTSTR lpcstrDescription, LP
 }
 
 CAESinkDirectSound::CAESinkDirectSound() :
-  m_initialized   (false),
-  m_isDirtyDS     (false),
   m_pBuffer       (NULL ),
   m_pDSound       (NULL ),
-  m_BufferOffset  (0    ),
-  m_CacheLen      (0    ),
-  m_dwChunkSize   (0    ),
-  m_dwBufferLen   (0    ),
-  m_BufferTimeouts(0    ),
   m_AvgBytesPerSec(0    ),
+  m_dwChunkSize   (0    ),
   m_dwFrameSize   (0    ),
+  m_dwBufferLen   (0    ),
+  m_BufferOffset  (0    ),
+  m_CacheLen      (0    ),
   m_LastCacheCheck(0    ),
-  m_running       (false)
+  m_BufferTimeouts(0    ),
+  m_running       (false),
+  m_initialized   (false),
+  m_isDirtyDS     (false)
 {
   m_channelLayout.Reset();
 }

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
index 9ca471d..8f82cec 100644 (file)
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
@@ -176,21 +176,21 @@ CStdStringA localWideToUtf(LPCWSTR wstr)
 }
 
 CAESinkWASAPI::CAESinkWASAPI() :
-  m_pAudioClient(NULL),
-  m_pRenderClient(NULL),
   m_needDataEvent(0),
   m_pDevice(NULL),
-  m_initialized(false),
-  m_running(false),
+  m_pAudioClient(NULL),
+  m_pRenderClient(NULL),
   m_encodedFormat(AE_FMT_INVALID),
   m_encodedChannels(0),
   m_encodedSampleRate(0),
-  m_uiBufferLen(0),
-  m_avgTimeWaiting(50),
-  m_isDirty(false),
   sinkReqFormat(AE_FMT_INVALID),
   sinkRetFormat(AE_FMT_INVALID),
+  m_running(false),
+  m_initialized(false),
   m_isSuspended(false),
+  m_isDirty(false),
+  m_uiBufferLen(0),
+  m_avgTimeWaiting(50),
   m_sinkLatency(0.0)
 {
   m_channelLayout.Reset();

diff --git a/xbmc/cores/DllLoader/DllLoader-linux.cpp b/xbmc/cores/DllLoader/DllLoader-linux.cpp
index aaceb20..bcc203d 100644 (file)
--- a/xbmc/cores/DllLoader/DllLoader-linux.cpp
+++ b/xbmc/cores/DllLoader/DllLoader-linux.cpp
@@ -32,12 +32,12 @@ CoffLoader::CoffLoader() :
   SymTable          (NULL ),
   StringTable       (NULL ),
   SectionData       (NULL ),
+  EntryAddress      (0    ),
   NumberOfSymbols   (0    ),
   SizeOfStringTable (0    ),
   NumOfDirectories  (0    ),
   NumOfSections     (0    ),
-  FileHeaderOffset  (0    ),
-  EntryAddress      (0    ),
+  FileHeaderOffset  (0    )
 {
 }
 

diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp
index 280c0c0..14c3084 100644 (file)
--- a/xbmc/cores/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp
@@ -65,8 +65,8 @@ class CRetakeLock
 {
 public:
   CRetakeLock(CSharedSection &section, bool immidiate = true, CCriticalSection &owned = g_graphicsContext)
-    : m_owned(owned ),
-      m_lock (NULL  )
+    : m_lock (NULL  ),
+      m_owned(owned )
   {
     m_count = m_owned.exit();
     m_lock  = new T(section);

diff --git a/xbmc/cores/amlplayer/AMLPlayer.cpp b/xbmc/cores/amlplayer/AMLPlayer.cpp
index 8ba79ac..8529548 100644 (file)
--- a/xbmc/cores/amlplayer/AMLPlayer.cpp
+++ b/xbmc/cores/amlplayer/AMLPlayer.cpp
@@ -501,45 +501,45 @@ void CAMLSubTitleThread::Process(void)
 CAMLPlayer::CAMLPlayer(IPlayerCallback &callback)
   : IPlayer(callback),
   CThread                 ("CAMLPlayer" ),
+  m_cpu                   (0            ),
+  m_speed                 (0            ),
+  m_paused                (false        ),
+  m_bAbortRequest         (false        ),
   m_ready                 (true         ),
+  m_audio_index           (0            ),
+  m_audio_count           (0            ),
   m_audio_delay           (0            ),
   m_audio_passthrough_ac3 (false        ),
   m_audio_passthrough_dts (false        ),
+  m_audio_mute            (false        ),
+  m_audio_volume          (0.0f         ),
+  m_video_index           (0            ),
+  m_video_count           (0            ),
   m_video_width           (0            ),
   m_video_height          (0            ),
   m_video_fps_numerator   (0            ),
   m_video_fps_denominator (0            ),
+  m_subtitle_index        (0            ),
+  m_subtitle_count        (0            ),
+  m_subtitle_show         (false        ),
   m_subtitle_delay        (0            ),
   m_subtitle_thread       (NULL         ),
   m_chapter_index         (0            ),
   m_chapter_count         (0            ),
   m_show_mainvideo        (0            ),
+  m_view_mode             (0            ),
   m_zoom                  (0            ),
   m_contrast              (0            ),
-  m_brightness            (0            ),
-  m_subtitle_index        (0            ),
-  m_subtitle_count        (0            ),
-  m_subtitle_show         (false        ),
-  m_audio_index           (0            ),
-  m_audio_count           (0            ),
-  m_audio_mute            (false        ),
-  m_audio_volume          (0.0f         ),
-  m_video_index           (0            ),
-  m_video_count           (0            ),
-  m_cpu                   (0            ),
-  m_view_mode             (0            )
+  m_brightness            (0            )
 {
   m_dll = new DllLibAmplayer;
   m_dll->Load();
   m_pid = -1;
-  m_speed = 0;
-  m_paused = false;
 #if defined(_DEBUG)
   m_log_level = 5;
 #else
   m_log_level = 3;
 #endif
-  m_bAbortRequest = false;
 
   // for external subtitles
   m_dvdOverlayContainer = new CDVDOverlayContainer;

diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
index 7089fcf..7eb0679 100644 (file)
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
@@ -96,6 +96,7 @@ COMXAudio::COMXAudio() :
   m_Pause           (false  ),
   m_CanPause        (false  ),
   m_CurrentVolume   (0      ),
+  m_drc             (0      ),
   m_Passthrough     (false  ),
   m_HWDecode        (false  ),
   m_BytesPerSec     (0      ),
@@ -111,10 +112,9 @@ COMXAudio::COMXAudio() :
   m_eEncoding       (OMX_AUDIO_CodingPCM),
   m_extradata       (NULL   ),
   m_extrasize       (0      ),
+  m_vizBufferSamples(0      ),
   m_last_pts        (DVD_NOPTS_VALUE),
-  m_omx_render      (NULL   ),
-  m_drc             (0      ),
-  m_vizBufferSamples(0      )
+  m_omx_render      (NULL   )
 {
   m_vizBufferSize   = m_vizRemapBufferSize = VIS_PACKET_SIZE * sizeof(float);
   m_vizRemapBuffer  = (uint8_t *)_aligned_malloc(m_vizRemapBufferSize,16);

diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
index 26506b1..29ca861 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -69,8 +69,8 @@ OMXPlayerVideo::OMXPlayerVideo(OMXClock *av_clock,
                                CDVDMessageQueue& parent)
 : CThread("COMXPlayerVideo")
 , m_messageQueue("video")
-, m_messageParent(parent)
 , m_codecname("")
+, m_messageParent(parent)
 {
   m_av_clock              = av_clock;
   m_pOverlayContainer     = pOverlayContainer;