repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c561468
)
cec: add optional strLib parameter to LoadLibCec(), so the location of the shared...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 13 Oct 2011 22:09:37 +0000
(
00:09
+0200)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 13 Oct 2011 22:13:27 +0000
(
00:13
+0200)
include/cecloader.h
patch
|
blob
|
blame
|
history
diff --git
a/include/cecloader.h
b/include/cecloader.h
index 9316befcfae81355bdcb47e3216665e04b2f1515..7ae8b4984f9d9ae825dc1dfffecc97273e2d7e8c 100644
(file)
--- a/
include/cecloader.h
+++ b/
include/cecloader.h
@@
-39,16
+39,15
@@
HINSTANCE g_libCEC = NULL;
HINSTANCE g_libCEC = NULL;
-CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS)
+CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS
, const char *strLib = NULL
)
{
{
- typedef void* (__cdecl*_CreateLibCec)(const char *, uint8_t, uint16_t);
- _CreateLibCec CreateLibCec;
-
if (!g_libCEC)
if (!g_libCEC)
- g_libCEC = LoadLibrary("libcec.dll");
+ g_libCEC = LoadLibrary(
strLib ? strLib :
"libcec.dll");
if (!g_libCEC)
return NULL;
if (!g_libCEC)
return NULL;
+ typedef void* (__cdecl*_CreateLibCec)(const char *, uint8_t, uint16_t);
+ _CreateLibCec CreateLibCec;
CreateLibCec = (_CreateLibCec) (GetProcAddress(g_libCEC, "CECCreate"));
if (!CreateLibCec)
return NULL;
CreateLibCec = (_CreateLibCec) (GetProcAddress(g_libCEC, "CECCreate"));
if (!CreateLibCec)
return NULL;
@@
-73,28
+72,27
@@
void UnloadLibCec(CEC::ICECAdapter *device)
void *g_libCEC = NULL;
void *g_libCEC = NULL;
-CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS)
+CEC::ICECAdapter *LoadLibCec(const char *strName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS
, const char *strLib = NULL
)
{
{
- typedef void* _CreateLibCec(const char *, uint8_t, uint16_t);
-
if (!g_libCEC)
{
#if defined(__APPLE__)
if (!g_libCEC)
{
#if defined(__APPLE__)
- g_libCEC = dlopen("libcec.dylib", RTLD_LAZY);
+ g_libCEC = dlopen(
strLib ? strLib :
"libcec.dylib", RTLD_LAZY);
#else
#else
- g_libCEC = dlopen("libcec.so", RTLD_LAZY);
+ g_libCEC = dlopen(
strLib ? strLib :
"libcec.so", RTLD_LAZY);
#endif
if (!g_libCEC)
{
#if defined(__APPLE__)
#endif
if (!g_libCEC)
{
#if defined(__APPLE__)
- cout << "cannot find
libcec.dylib"
<< endl;
+ cout << "cannot find
" << (strLib ? strLib : "libcec.dylib")
<< endl;
#else
#else
- cout << "cannot find
libcec.so"
<< endl;
+ cout << "cannot find
" << (strLib ? strLib : "libcec.so")
<< endl;
#endif
return NULL;
}
}
#endif
return NULL;
}
}
+ typedef void* _CreateLibCec(const char *, uint8_t, uint16_t);
_CreateLibCec* CreateLibCec = (_CreateLibCec*) dlsym(g_libCEC, "CECCreate");
if (!CreateLibCec)
{
_CreateLibCec* CreateLibCec = (_CreateLibCec*) dlsym(g_libCEC, "CECCreate");
if (!CreateLibCec)
{