Skip to content

Commit

Permalink
Merge pull request #4862 from ace20022/fix_dvdmessagetracker
Browse files Browse the repository at this point in the history 
Remove CDVDMessageTracker
  • Loading branch information
@ace20022
ace20022 committed Jul 1, 2014
2 parents acf0a87 + 00d5bd9 commit fde760b
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 279 deletions.
10 changes: 0 additions & 10 deletions XBMC.xcodeproj/project.pbxproj
View file
Expand Up @@ -1505,7 +1505,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 */; };
Expand Down Expand Up @@ -2318,7 +2317,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 */; };
Expand Down Expand Up @@ -2780,7 +2778,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 */; };
Expand Down Expand Up @@ -5287,8 +5284,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>"; };
Expand Down Expand Up @@ -8791,8 +8786,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 */,
Expand Down Expand Up @@ -10710,7 +10703,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 */,
Expand Down Expand Up @@ -12011,7 +12003,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 */,
Expand Down Expand Up @@ -13212,7 +13203,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 */,
Expand Down
3 changes: 0 additions & 3 deletions project/VS2010Express/XBMC.vcxproj
View file
Expand Up @@ -1446,7 +1446,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" />
Expand Down Expand Up @@ -2133,7 +2132,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" />
Expand All @@ -2142,7 +2140,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" />
Expand Down
9 changes: 0 additions & 9 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Expand Up @@ -363,9 +363,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>
Expand Down Expand Up @@ -3091,9 +3088,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>
Expand All @@ -3118,9 +3112,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>
Expand Down
8 changes: 0 additions & 8 deletions xbmc/cores/dvdplayer/DVDMessage.h
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -97,17 +96,10 @@ class CDVDMsg : public IDVDResourceCounted<CDVDMsg>
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
}

/**
Expand Down
127 changes: 0 additions & 127 deletions xbmc/cores/dvdplayer/DVDMessageTracker.cpp
View file

This file was deleted.

73 changes: 0 additions & 73 deletions xbmc/cores/dvdplayer/DVDMessageTracker.h
View file

This file was deleted.

8 changes: 0 additions & 8 deletions xbmc/cores/dvdplayer/DVDPlayer.cpp
View file
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion xbmc/cores/dvdplayer/Makefile.in
View file
Expand Up @@ -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
Expand Down

0 comments on commit fde760b

Please sign in to comment.