aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XBMC.xcodeproj/project.pbxproj10
-rw-r--r--project/VS2010Express/XBMC.vcxproj3
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters9
-rw-r--r--xbmc/cores/dvdplayer/DVDMessage.h8
-rw-r--r--xbmc/cores/dvdplayer/DVDMessageTracker.cpp127
-rw-r--r--xbmc/cores/dvdplayer/DVDMessageTracker.h73
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayer.cpp8
-rw-r--r--xbmc/cores/dvdplayer/Makefile.in1
-rw-r--r--xbmc/cores/dvdplayer/dvd_config.h32
-rw-r--r--xbmc/cores/omxplayer/OMXPlayer.cpp8
10 files changed, 0 insertions, 279 deletions
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 1846b9b3d0..b049a8b44e 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -1506,7 +1506,6 @@
DFF0F19017528350002DA3A4 /* DVDFileInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F2EF4A0E593E0D0092C37F /* DVDFileInfo.cpp */; };
DFF0F19117528350002DA3A4 /* DVDMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15780D25F9FA00618676 /* DVDMessage.cpp */; };
DFF0F19217528350002DA3A4 /* DVDMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */; };
- DFF0F19317528350002DA3A4 /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; };
DFF0F19417528350002DA3A4 /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; };
DFF0F19517528350002DA3A4 /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; };
DFF0F19717528350002DA3A4 /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; };
@@ -2322,7 +2321,6 @@
E38E1F9F0D25F9FD00618676 /* DVDStateSerializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15740D25F9FA00618676 /* DVDStateSerializer.cpp */; };
E38E1FA10D25F9FD00618676 /* DVDMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15780D25F9FA00618676 /* DVDMessage.cpp */; };
E38E1FA20D25F9FD00618676 /* DVDMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */; };
- E38E1FA30D25F9FD00618676 /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; };
E38E1FA40D25F9FD00618676 /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; };
E38E1FA50D25F9FD00618676 /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; };
E38E1FA70D25F9FD00618676 /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; };
@@ -2787,7 +2785,6 @@
E49911F8174E5D4500741B6D /* DVDFileInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F2EF4A0E593E0D0092C37F /* DVDFileInfo.cpp */; };
E49911F9174E5D4500741B6D /* DVDMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15780D25F9FA00618676 /* DVDMessage.cpp */; };
E49911FA174E5D4500741B6D /* DVDMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */; };
- E49911FB174E5D4500741B6D /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; };
E49911FC174E5D4500741B6D /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; };
E49911FD174E5D4500741B6D /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; };
E49911FF174E5D4500741B6D /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; };
@@ -5297,8 +5294,6 @@
E38E15790D25F9FA00618676 /* DVDMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDMessage.h; sourceTree = "<group>"; };
E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDMessageQueue.cpp; sourceTree = "<group>"; };
E38E157B0D25F9FA00618676 /* DVDMessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDMessageQueue.h; sourceTree = "<group>"; };
- E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDMessageTracker.cpp; sourceTree = "<group>"; };
- E38E157D0D25F9FA00618676 /* DVDMessageTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDMessageTracker.h; sourceTree = "<group>"; };
E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDOverlayContainer.cpp; sourceTree = "<group>"; };
E38E157F0D25F9FA00618676 /* DVDOverlayContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDOverlayContainer.h; sourceTree = "<group>"; };
E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDOverlayRenderer.cpp; sourceTree = "<group>"; };
@@ -8801,8 +8796,6 @@
E38E15790D25F9FA00618676 /* DVDMessage.h */,
E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */,
E38E157B0D25F9FA00618676 /* DVDMessageQueue.h */,
- E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */,
- E38E157D0D25F9FA00618676 /* DVDMessageTracker.h */,
E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */,
E38E157F0D25F9FA00618676 /* DVDOverlayContainer.h */,
E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */,
@@ -10728,7 +10721,6 @@
E38E1F9F0D25F9FD00618676 /* DVDStateSerializer.cpp in Sources */,
E38E1FA10D25F9FD00618676 /* DVDMessage.cpp in Sources */,
E38E1FA20D25F9FD00618676 /* DVDMessageQueue.cpp in Sources */,
- E38E1FA30D25F9FD00618676 /* DVDMessageTracker.cpp in Sources */,
E38E1FA40D25F9FD00618676 /* DVDOverlayContainer.cpp in Sources */,
E38E1FA50D25F9FD00618676 /* DVDOverlayRenderer.cpp in Sources */,
E38E1FA70D25F9FD00618676 /* DVDPlayer.cpp in Sources */,
@@ -12031,7 +12023,6 @@
DFF0F19017528350002DA3A4 /* DVDFileInfo.cpp in Sources */,
DFF0F19117528350002DA3A4 /* DVDMessage.cpp in Sources */,
DFF0F19217528350002DA3A4 /* DVDMessageQueue.cpp in Sources */,
- DFF0F19317528350002DA3A4 /* DVDMessageTracker.cpp in Sources */,
DFF0F19417528350002DA3A4 /* DVDOverlayContainer.cpp in Sources */,
DFF0F19517528350002DA3A4 /* DVDOverlayRenderer.cpp in Sources */,
DFF0F19717528350002DA3A4 /* DVDPlayer.cpp in Sources */,
@@ -13235,7 +13226,6 @@
E49911F8174E5D4500741B6D /* DVDFileInfo.cpp in Sources */,
E49911F9174E5D4500741B6D /* DVDMessage.cpp in Sources */,
E49911FA174E5D4500741B6D /* DVDMessageQueue.cpp in Sources */,
- E49911FB174E5D4500741B6D /* DVDMessageTracker.cpp in Sources */,
E49911FC174E5D4500741B6D /* DVDOverlayContainer.cpp in Sources */,
E49911FD174E5D4500741B6D /* DVDOverlayRenderer.cpp in Sources */,
E49911FF174E5D4500741B6D /* DVDPlayer.cpp in Sources */,
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 055722f9a3..656f987b30 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -1447,7 +1447,6 @@
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessage.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.cpp" />
- <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageTracker.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.cpp" />
@@ -2136,7 +2135,6 @@
<ClInclude Include="..\..\xbmc\win32\WindowHelper.h" />
<ClInclude Include="..\..\xbmc\cores\DummyVideoPlayer.h" />
<ClInclude Include="..\..\xbmc\cores\IPlayer.h" />
- <ClInclude Include="..\..\xbmc\cores\dvdplayer\dvd_config.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDClock.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.h" />
@@ -2145,7 +2143,6 @@
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessage.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.h" />
- <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageTracker.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 2d2c5dc16a..dc1d943486 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -360,9 +360,6 @@
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.cpp">
<Filter>cores\dvdplayer</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageTracker.cpp">
- <Filter>cores\dvdplayer</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp">
<Filter>cores\dvdplayer</Filter>
</ClCompile>
@@ -3094,9 +3091,6 @@
<ClInclude Include="..\..\xbmc\cores\IPlayer.h">
<Filter>cores</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\cores\dvdplayer\dvd_config.h">
- <Filter>cores\dvdplayer</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h">
<Filter>cores\dvdplayer</Filter>
</ClInclude>
@@ -3121,9 +3115,6 @@
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.h">
<Filter>cores\dvdplayer</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageTracker.h">
- <Filter>cores\dvdplayer</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h">
<Filter>cores\dvdplayer</Filter>
</ClInclude>
diff --git a/xbmc/cores/dvdplayer/DVDMessage.h b/xbmc/cores/dvdplayer/DVDMessage.h
index be6603aa13..a7fbe086d6 100644
--- a/xbmc/cores/dvdplayer/DVDMessage.h
+++ b/xbmc/cores/dvdplayer/DVDMessage.h
@@ -31,7 +31,6 @@
// include as less is possible to prevent dependencies
#include "system.h"
#include "DVDDemuxers/DVDDemux.h"
-#include "DVDMessageTracker.h"
#include "DVDResource.h"
#include <assert.h>
@@ -97,17 +96,10 @@ public:
CDVDMsg(Message msg)
{
m_message = msg;
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
- g_dvdMessageTracker.Register(this);
-#endif
}
virtual ~CDVDMsg()
{
-#ifdef DVDDEBUG_MESSAGE_TRACKER
- g_dvdMessageTracker.UnRegister(this);
-#endif
}
/**
diff --git a/xbmc/cores/dvdplayer/DVDMessageTracker.cpp b/xbmc/cores/dvdplayer/DVDMessageTracker.cpp
deleted file mode 100644
index 3f3d9bc6b3..0000000000
--- a/xbmc/cores/dvdplayer/DVDMessageTracker.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "threads/SystemClock.h"
-#include "DVDMessageTracker.h"
-#include "DVDMessage.h"
-#include "threads/SingleLock.h"
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
-
-
-
-CDVDMessageTracker g_dvdMessageTracker;
-
-CDVDMessageTracker::CDVDMessageTracker() : CThread("DVDMsgTracker")
-{
- m_bInitialized = false;
- InitializeCriticalSection(&m_critSection);
-}
-
-CDVDMessageTracker::~CDVDMessageTracker()
-{
- DeInit();
- DeleteCriticalSection(&m_critSection);
-}
-
-void CDVDMessageTracker::Init()
-{
- DeInit();
-
- Create();
-}
-
-void CDVDMessageTracker::DeInit()
-{
- StopThread();
-}
-
-void CDVDMessageTracker::Register(CDVDMsg* pMsg)
-{
- if (m_bInitialized)
- {
- CSingleLock lock(m_critSection);
- m_messageList.push_back(new CDVDMessageTrackerItem(pMsg));
- }
-}
-
-void CDVDMessageTracker::UnRegister(CDVDMsg* pMsg)
-{
- CSingleLock lock(m_critSection);
-
- std::list<CDVDMessageTrackerItem*>::iterator iter = m_messageList.begin();
- while (iter != m_messageList.end())
- {
- CDVDMessageTrackerItem* pItem = *iter;
- if (pItem->m_pMsg == pMsg)
- {
- m_messageList.remove(pItem);
- delete pItem;
- break;
- }
- ++iter;
- }
-
-}
-
-void CDVDMessageTracker::OnStartup()
-{
- m_bInitialized = true;
-}
-
-void CDVDMessageTracker::Process()
-{
- while (!m_bStop)
- {
- Sleep(1000);
-
- CSingleLock lock(m_critSection);
-
- std::list<CDVDMessageTrackerItem*>::iterator iter = m_messageList.begin();
- while (!m_bStop && iter != m_messageList.end())
- {
- CDVDMessageTrackerItem* pItem = *iter;
- if ((XbmcThreads::SystemClockMillis() - pItem->m_time_created) > 60000)
- {
- if (!pItem->m_debug_logged)
- {
- CLog::Log(LOGWARNING, "CDVDMsgTracker::Process() - Msg still in system after 60 seconds.");
- CLog::Log(LOGWARNING, " Type : %d", pItem->m_pMsg->GetMessageType());
-
- pItem->m_debug_logged = true;
- }
- }
- ++iter;
- }
-
- }
-}
-
-void CDVDMessageTracker::OnExit()
-{
- m_bInitialized = false;
-
- CLog::Log(LOGWARNING, "CDVDMsgTracker::Process() - nr of messages in system : %d", m_messageList.size());
-
- m_messageList.clear();
-}
-
-#endif // DVDDEBUG_MESSAGE_TRACKER
-
diff --git a/xbmc/cores/dvdplayer/DVDMessageTracker.h b/xbmc/cores/dvdplayer/DVDMessageTracker.h
deleted file mode 100644
index 5fb099ffc5..0000000000
--- a/xbmc/cores/dvdplayer/DVDMessageTracker.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "dvd_config.h"
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
-
-#include "utils/thread.h"
-#include "threads/CriticalSection.h"
-
-class CDVDMsg;
-
-class CDVDMessageTrackerItem
-{
-public:
- CDVDMessageTrackerItem(CDVDMsg* pMsg)
- {
- m_pMsg = pMsg;
- m_debug_logged = false;
- m_time_created = CTimeUtils::GetTimeMS();
- }
-
- CDVDMsg* m_pMsg;
- bool m_debug_logged;
- unsigned int m_time_created;
-
-};
-
-class CDVDMessageTracker : private CThread
-{
-public:
- CDVDMessageTracker();
- ~CDVDMessageTracker();
-
- void Init();
- void DeInit();
-
- void Register(CDVDMsg* pMsg);
- void UnRegister(CDVDMsg* pMsg);
-
-protected:
- void OnStartup();
- void Process();
- void OnExit();
-
-private:
- bool m_bInitialized;
- std::list<CDVDMessageTrackerItem*> m_messageList;
- CCriticalSection m_critSection;
-};
-
-extern CDVDMessageTracker g_dvdMessageTracker;
-
-#endif //DVDDEBUG_MESSAGE_TRACKER
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 85b9f1c4fe..db504fc8ae 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -517,19 +517,11 @@ CDVDPlayer::CDVDPlayer(IPlayerCallback& callback)
m_HasAudio = false;
memset(&m_SpeedState, 0, sizeof(m_SpeedState));
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
- g_dvdMessageTracker.Init();
-#endif
}
CDVDPlayer::~CDVDPlayer()
{
CloseFile();
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
- g_dvdMessageTracker.DeInit();
-#endif
}
bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
diff --git a/xbmc/cores/dvdplayer/Makefile.in b/xbmc/cores/dvdplayer/Makefile.in
index 564ab4b6ca..da92fad671 100644
--- a/xbmc/cores/dvdplayer/Makefile.in
+++ b/xbmc/cores/dvdplayer/Makefile.in
@@ -6,7 +6,6 @@ SRCS += DVDDemuxSPU.cpp
SRCS += DVDFileInfo.cpp
SRCS += DVDMessage.cpp
SRCS += DVDMessageQueue.cpp
-SRCS += DVDMessageTracker.cpp
SRCS += DVDOverlayContainer.cpp
SRCS += DVDOverlayRenderer.cpp
SRCS += DVDPlayer.cpp
diff --git a/xbmc/cores/dvdplayer/dvd_config.h b/xbmc/cores/dvdplayer/dvd_config.h
deleted file mode 100644
index 394f8f78cd..0000000000
--- a/xbmc/cores/dvdplayer/dvd_config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-// do not enable these options in cvs!!
-// xbmc will crash on a non debug xbox
-
-
-// enable and use xbperfmon
-//#define DVDDEBUG_WITH_PERFORMANCE_COUNTER
-
-// enable message tracking
-//#define DVDDEBUG_MESSAGE_TRACKER
-
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
index 502df4ae38..86c22d1e70 100644
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
@@ -566,19 +566,11 @@ COMXPlayer::COMXPlayer(IPlayerCallback &callback)
m_stamp = 0.0;
memset(&m_SpeedState, 0, sizeof(m_SpeedState));
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
- g_dvdMessageTracker.Init();
-#endif
}
COMXPlayer::~COMXPlayer()
{
CloseFile();
-
-#ifdef DVDDEBUG_MESSAGE_TRACKER
- g_dvdMessageTracker.DeInit();
-#endif
}
bool COMXPlayer::OpenFile(const CFileItem &file, const CPlayerOptions &options)