repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[deb_libcec.git]
/
src
/
LibCecSharp
/
CecSharpTypes.h
diff --git
a/src/LibCecSharp/CecSharpTypes.h
b/src/LibCecSharp/CecSharpTypes.h
index c5247965e618ccaa448c03ac7a5860737d14adb2..0ba3c0481e55922a2a7353c1fe3a338bc2f7febc 100644
(file)
--- a/
src/LibCecSharp/CecSharpTypes.h
+++ b/
src/LibCecSharp/CecSharpTypes.h
@@
-254,14
+254,22
@@
namespace CecSharp
public enum class CecVendorId
{
public enum class CecVendorId
{
- Samsung = 0x00F0,
- LG = 0xE091,
- Panasonic = 0x8045,
- Pioneer = 0xE036,
- Onkyo = 0x09B0,
- Yamaha = 0xA0DE,
- Philips = 0x903E,
+ Samsung = 0x00
00
F0,
+ LG = 0x
00
E091,
+ Panasonic = 0x
00
8045,
+ Pioneer = 0x
00
E036,
+ Onkyo = 0x0
00
9B0,
+ Yamaha = 0x
00
A0DE,
+ Philips = 0x
00
903E,
Sony = 0x080046,
Sony = 0x080046,
+ Toshiba = 0x000039,
+ Akai = 0x0020C7,
+ Benq = 0x8065E9,
+ Daewoo = 0x009053,
+ Grundig = 0x00D0D5,
+ Medion = 0x000CB8,
+ Sharp = 0x08001F,
+ Vizio = 0x6B746D,
Unknown = 0
};
Unknown = 0
};
@@
-360,7
+368,9
@@
namespace CecSharp
Version1_6_2 = 0x1602,
Version1_6_3 = 0x1603,
Version1_7_0 = 0x1700,
Version1_6_2 = 0x1602,
Version1_6_3 = 0x1603,
Version1_7_0 = 0x1700,
- Version1_7_1 = 0x1701
+ Version1_7_1 = 0x1701,
+ Version1_7_2 = 0x1702,
+ Version1_8_0 = 0x1800
};
public enum class CecServerVersion
};
public enum class CecServerVersion
@@
-375,7
+385,9
@@
namespace CecSharp
Version1_6_2 = 0x1602,
Version1_6_3 = 0x1603,
Version1_7_0 = 0x1700,
Version1_6_2 = 0x1602,
Version1_6_3 = 0x1603,
Version1_7_0 = 0x1700,
- Version1_7_1 = 0x1701
+ Version1_7_1 = 0x1701,
+ Version1_7_2 = 0x1702,
+ Version1_8_0 = 0x1800
};
public ref class CecAdapter
};
public ref class CecAdapter
@@
-415,6
+427,7
@@
namespace CecSharp
void Clear(void)
{
void Clear(void)
{
+ Primary = CecLogicalAddress::Unknown;
for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
Addresses[iPtr] = CecLogicalAddress::Unknown;
}
for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
Addresses[iPtr] = CecLogicalAddress::Unknown;
}
@@
-427,6
+440,8
@@
namespace CecSharp
void Set(CecLogicalAddress iAddress)
{
Addresses[(unsigned int)iAddress] = iAddress;
void Set(CecLogicalAddress iAddress)
{
Addresses[(unsigned int)iAddress] = iAddress;
+ if (Primary == CecLogicalAddress::Unknown)
+ Primary = iAddress;
}
property CecLogicalAddress Primary;
}
property CecLogicalAddress Primary;