aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kodi.xcodeproj/project.pbxproj10
-rw-r--r--project/VS2010Express/XBMC.vcxproj4
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters8
-rw-r--r--xbmc/cores/AudioEngine/AESinkFactory.cpp1
-rw-r--r--xbmc/cores/AudioEngine/Makefile.in1
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkProfiler.cpp77
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkProfiler.h45
7 files changed, 2 insertions, 144 deletions
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index bf49f6402f..373d1a5697 100644
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -3657,9 +3657,6 @@
F5CC234718150277006B5E91 /* AESinkNULL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC234518150277006B5E91 /* AESinkNULL.cpp */; };
F5CC234818150277006B5E91 /* AESinkNULL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC234518150277006B5E91 /* AESinkNULL.cpp */; };
F5CC234918150277006B5E91 /* AESinkNULL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC234518150277006B5E91 /* AESinkNULL.cpp */; };
- F5CC238818150768006B5E91 /* AESinkProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC238618150768006B5E91 /* AESinkProfiler.cpp */; };
- F5CC238918150768006B5E91 /* AESinkProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC238618150768006B5E91 /* AESinkProfiler.cpp */; };
- F5CC238A18150768006B5E91 /* AESinkProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC238618150768006B5E91 /* AESinkProfiler.cpp */; };
F5CEE60913D3C89700225F72 /* DVDOverlayCodecTX3G.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CEE60713D3C89700225F72 /* DVDOverlayCodecTX3G.cpp */; };
F5D8D732102BB3B1004A11AB /* OverlayRendererGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8D72F102BB3B1004A11AB /* OverlayRendererGL.cpp */; };
F5D8D733102BB3B1004A11AB /* OverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8D731102BB3B1004A11AB /* OverlayRenderer.cpp */; };
@@ -6211,8 +6208,6 @@
F5CC230B18150118006B5E91 /* AESinkFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AESinkFactory.h; sourceTree = "<group>"; };
F5CC234518150277006B5E91 /* AESinkNULL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AESinkNULL.cpp; path = Sinks/AESinkNULL.cpp; sourceTree = "<group>"; };
F5CC234618150277006B5E91 /* AESinkNULL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AESinkNULL.h; path = Sinks/AESinkNULL.h; sourceTree = "<group>"; };
- F5CC238618150768006B5E91 /* AESinkProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AESinkProfiler.cpp; path = Sinks/AESinkProfiler.cpp; sourceTree = "<group>"; };
- F5CC238718150768006B5E91 /* AESinkProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AESinkProfiler.h; path = Sinks/AESinkProfiler.h; sourceTree = "<group>"; };
F5CEE60713D3C89700225F72 /* DVDOverlayCodecTX3G.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDOverlayCodecTX3G.cpp; sourceTree = "<group>"; };
F5CEE60813D3C89700225F72 /* DVDOverlayCodecTX3G.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDOverlayCodecTX3G.h; sourceTree = "<group>"; };
F5D8D72E102BB3B1004A11AB /* OverlayRendererGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayRendererGL.h; sourceTree = "<group>"; };
@@ -10184,8 +10179,6 @@
F5CC228A1814F7E9006B5E91 /* AESinkDARWINOSX.h */,
F5CC234518150277006B5E91 /* AESinkNULL.cpp */,
F5CC234618150277006B5E91 /* AESinkNULL.h */,
- F5CC238618150768006B5E91 /* AESinkProfiler.cpp */,
- F5CC238718150768006B5E91 /* AESinkProfiler.h */,
);
name = Sinks;
sourceTree = "<group>";
@@ -11614,7 +11607,6 @@
F5CC2305181500B1006B5E91 /* EndianSwap.cpp in Sources */,
F5CC230E18150118006B5E91 /* AESinkFactory.cpp in Sources */,
F5CC234918150277006B5E91 /* AESinkNULL.cpp in Sources */,
- F5CC238A18150768006B5E91 /* AESinkProfiler.cpp in Sources */,
7C8AE84E189DE3CD00C33786 /* CoreAudioChannelLayout.cpp in Sources */,
7C8AE84F189DE3CD00C33786 /* CoreAudioDevice.cpp in Sources */,
7C8AE850189DE3CD00C33786 /* CoreAudioHardware.cpp in Sources */,
@@ -12815,7 +12807,6 @@
F5CC2304181500B1006B5E91 /* EndianSwap.cpp in Sources */,
F5CC230D18150118006B5E91 /* AESinkFactory.cpp in Sources */,
F5CC234818150277006B5E91 /* AESinkNULL.cpp in Sources */,
- F5CC238918150768006B5E91 /* AESinkProfiler.cpp in Sources */,
DF374B2518AC2BA20076B514 /* CoreAudioHelpers.cpp in Sources */,
7CF0504D190A1D7200222135 /* FFmpeg.cpp in Sources */,
7CF05058191195DA00222135 /* MediaType.cpp in Sources */,
@@ -14008,7 +13999,6 @@
F5CC2303181500B1006B5E91 /* EndianSwap.cpp in Sources */,
F5CC230C18150118006B5E91 /* AESinkFactory.cpp in Sources */,
F5CC234718150277006B5E91 /* AESinkNULL.cpp in Sources */,
- F5CC238818150768006B5E91 /* AESinkProfiler.cpp in Sources */,
DF374B2418AC2BA20076B514 /* CoreAudioHelpers.cpp in Sources */,
7CF0504C190A1D7200222135 /* FFmpeg.cpp in Sources */,
7CF05057191195DA00222135 /* MediaType.cpp in Sources */,
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index c29fb2f17b..92a7ae2587 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -207,7 +207,6 @@
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.cpp" />
- <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkProfiler.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEBitstreamPacker.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEBuffer.cpp" />
@@ -832,7 +831,6 @@
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\ThreadedAE.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.h" />
- <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkProfiler.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEBitstreamPacker.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEBuffer.h" />
@@ -2554,4 +2552,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project> \ No newline at end of file
+</Project>
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index dbb9b9d41f..7e225f16e8 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -2277,9 +2277,6 @@
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.cpp">
<Filter>cores\AudioEngine\Sinks</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkProfiler.cpp">
- <Filter>cores\AudioEngine\Sinks</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.cpp">
<Filter>cores\AudioEngine\Sinks</Filter>
</ClCompile>
@@ -5321,9 +5318,6 @@
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.h">
<Filter>cores\AudioEngine\Sinks</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkProfiler.h">
- <Filter>cores\AudioEngine\Sinks</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.h">
<Filter>cores\AudioEngine\Sinks</Filter>
</ClInclude>
@@ -6079,4 +6073,4 @@
<Filter>interfaces\swig</Filter>
</None>
</ItemGroup>
-</Project> \ No newline at end of file
+</Project>
diff --git a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp
index 715b4f113a..619b417e5f 100644
--- a/xbmc/cores/AudioEngine/AESinkFactory.cpp
+++ b/xbmc/cores/AudioEngine/AESinkFactory.cpp
@@ -43,7 +43,6 @@
#else
#pragma message("NOTICE: No audio sink for target platform. Audio output will not be available.")
#endif
-#include "Sinks/AESinkProfiler.h"
#include "Sinks/AESinkNULL.h"
#include "settings/AdvancedSettings.h"
diff --git a/xbmc/cores/AudioEngine/Makefile.in b/xbmc/cores/AudioEngine/Makefile.in
index efb44cc387..8491050434 100644
--- a/xbmc/cores/AudioEngine/Makefile.in
+++ b/xbmc/cores/AudioEngine/Makefile.in
@@ -22,7 +22,6 @@ SRCS = AEFactory.cpp
SRCS += AESinkFactory.cpp
SRCS += Sinks/AESinkNULL.cpp
-SRCS += Sinks/AESinkProfiler.cpp
SRCS += Sinks/AESinkPi.cpp
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkProfiler.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkProfiler.cpp
deleted file mode 100644
index 2b70b8ecc6..0000000000
--- a/xbmc/cores/AudioEngine/Sinks/AESinkProfiler.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2010-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 "system.h"
-
-#include <stdint.h>
-#include <limits.h>
-
-#include "cores/AudioEngine/Sinks/AESinkProfiler.h"
-#include "cores/AudioEngine/Utils/AEUtil.h"
-#include "utils/log.h"
-#include "utils/TimeUtils.h"
-
-CAESinkProfiler::CAESinkProfiler()
-{
-}
-
-CAESinkProfiler::~CAESinkProfiler()
-{
-}
-
-bool CAESinkProfiler::Initialize(AEAudioFormat &format, std::string &device)
-{
- if (AE_IS_RAW(format.m_dataFormat))
- return false;
-
- format.m_sampleRate = 192000;
- format.m_channelLayout = AE_CH_LAYOUT_7_1;
- format.m_dataFormat = AE_FMT_S32LE;
- format.m_frames = 30720;
- format.m_frameSamples = format.m_channelLayout.Count();
- format.m_frameSize = format.m_frameSamples * sizeof(float);
- return true;
-}
-
-void CAESinkProfiler::Deinitialize()
-{
-}
-
-void CAESinkProfiler::GetDelay(AEDelayStatus& status)
-{
- status.SetDelay(0);
-}
-
-unsigned int CAESinkProfiler::AddPackets(uint8_t **data, unsigned int frames, unsigned int offset)
-{
- int64_t ts = CurrentHostCounter();
- CLog::Log(LOGDEBUG, "CAESinkProfiler::AddPackets - latency %f ms", (float)(ts - m_ts) / 1000000.0f);
- m_ts = ts;
- return frames;
-}
-
-void CAESinkProfiler::Drain()
-{
-}
-
-void CAESinkProfiler::EnumerateDevices (AEDeviceList &devices, bool passthrough)
-{
- devices.push_back(AEDevice("Profiler", "Profiler"));
-}
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkProfiler.h b/xbmc/cores/AudioEngine/Sinks/AESinkProfiler.h
deleted file mode 100644
index 284b80356e..0000000000
--- a/xbmc/cores/AudioEngine/Sinks/AESinkProfiler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-/*
- * Copyright (C) 2010-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 "system.h"
-
-#include "cores/AudioEngine/Interfaces/AESink.h"
-#include <stdint.h>
-
-class CAESinkProfiler : public IAESink
-{
-public:
- virtual const char *GetName() { return "Profiler"; }
-
- CAESinkProfiler();
- virtual ~CAESinkProfiler();
-
- virtual bool Initialize (AEAudioFormat &format, std::string &device);
- virtual void Deinitialize();
-
- virtual void GetDelay (AEDelayStatus& status);
- virtual double GetCacheTotal () { return 0.0; }
- virtual unsigned int AddPackets (uint8_t **data, unsigned int frames, unsigned int offset);
- virtual void Drain ();
- static void EnumerateDevices(AEDeviceList &devices, bool passthrough);
-private:
- int64_t m_ts;
-};
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-21 15:28:39 +0000