Permalink
Browse files

[AE] Move AEDeviceType to separate header and add new device types

  • Loading branch information...
1 parent e530bbb commit f917e2cf6461fd62dc0b7505d3d143d81a37aece @Karlson2k committed Oct 18, 2012
@@ -1009,6 +1009,7 @@
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEChannelInfo.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEConvert.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.h" />
+ <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceType.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEPackIEC61937.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AERemap.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.h" />
@@ -5737,9 +5737,14 @@
<ClInclude Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.h">
<Filter>dialogs</Filter>
</ClInclude>
+
+
<ClInclude Include="..\..\xbmc\interfaces\json-rpc\PVROperations.h">
<Filter>interfaces\json-rpc</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceType.h">
+ <Filter>cores\AudioEngine\Utils</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
@@ -5771,4 +5776,4 @@
<Filter>interfaces\swig</Filter>
</None>
</ItemGroup>
-</Project>
+</Project>
@@ -56,10 +56,13 @@ std::string CAEDeviceInfo::DeviceTypeToString(enum AEDeviceType deviceType)
{
switch (deviceType)
{
- case AE_DEVTYPE_PCM : return "AE_DEVTYPE_PCM" ; break;
- case AE_DEVTYPE_IEC958: return "AE_DEVTYPE_IEC958"; break;
- case AE_DEVTYPE_HDMI : return "AE_DEVTYPE_HDMI" ; break;
- case AE_DEVTYPE_DP : return "AE_DEVTYPE_DP" ; break;
+ case AE_DEVTYPE_UNKNOWN : return "AE_DEVTYPE_UNKNOWN" ; break;
+ case AE_DEVTYPE_PCM : return "AE_DEVTYPE_PCM" ; break;
+ case AE_DEVTYPE_DIGITALOUT: return "AE_DEVTYPE_DIGITALOUT"; break;
+ case AE_DEVTYPE_IEC958 : return "AE_DEVTYPE_IEC958" ; break;
+ case AE_DEVTYPE_HDMI : return "AE_DEVTYPE_HDMI" ; break;
+ case AE_DEVTYPE_DP : return "AE_DEVTYPE_DP" ; break;
+ case AE_DEVTYPE_NETWORK : return "AE_DEVTYPE_NETWORK" ; break;
}
return "INVALID";
}
@@ -23,17 +23,11 @@
#include <vector>
#include "AEAudioFormat.h"
#include "Utils/AEChannelInfo.h"
+#include "Utils/AEDeviceType.h"
typedef std::vector<unsigned int > AESampleRateList;
typedef std::vector<enum AEDataFormat> AEDataFormatList;
-enum AEDeviceType {
- AE_DEVTYPE_PCM,
- AE_DEVTYPE_IEC958,
- AE_DEVTYPE_HDMI,
- AE_DEVTYPE_DP
-};
-
/**
* This classt provides the details of what the audio output hardware is capable of
*/
@@ -0,0 +1,32 @@
+#pragma once
+/*
+ * Copyright (C) 2012 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/>.
+ *
+ */
+
+enum AEDeviceType
+{
+ AE_DEVTYPE_UNKNOWN, /* Unknown or undetermined device */
+ AE_DEVTYPE_PCM, /* PCM-only capable device, usually audio with analog output */
+ AE_DEVTYPE_DIGITALOUT, /* Some digital output */
+ AE_DEVTYPE_IEC958, /* IEC958 (S/PDIF) output */
+ AE_DEVTYPE_HDMI, /* HDMI output */
+ AE_DEVTYPE_DP, /* DisplayPort output */
+ AE_DEVTYPE_NETWORK /* Networked audio output */
+};
+

0 comments on commit f917e2c

Please sign in to comment.