repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync LibCecSharp
[deb_libcec.git]
/
include
/
cecloader.h
diff --git
a/include/cecloader.h
b/include/cecloader.h
index 5d4361d6199034c31b24732f52fe01c7fa137a8c..7a7dce6cf583d70c340e7f1fc9f5d0bcd5c9a595 100644
(file)
--- a/
include/cecloader.h
+++ b/
include/cecloader.h
@@
-159,15
+159,11
@@
CEC::ICECAdapter *LibCecInit(const char *strDeviceName, CEC::cec_device_type_lis
#if defined(__APPLE__)
g_libCEC = dlopen(strLib ? strLib : "libcec.dylib", RTLD_LAZY);
#else
#if defined(__APPLE__)
g_libCEC = dlopen(strLib ? strLib : "libcec.dylib", RTLD_LAZY);
#else
- g_libCEC = dlopen(strLib ? strLib : "libcec.so
"
, RTLD_LAZY);
+ g_libCEC = dlopen(strLib ? strLib : "libcec.so
." CEC_LIB_VERSION_MAJOR_STR
, RTLD_LAZY);
#endif
if (!g_libCEC)
{
#endif
if (!g_libCEC)
{
-#if defined(__APPLE__)
- cout << "cannot find " << (strLib ? strLib : "libcec.dylib") << dlerror() << endl;
-#else
- cout << "cannot find " << (strLib ? strLib : "libcec.so") << dlerror() << endl;
-#endif
+ cout << dlerror() << endl;
return NULL;
}
}
return NULL;
}
}
@@
-196,15
+192,11
@@
CEC::ICECAdapter *LibCecInitialise(CEC::libcec_configuration *configuration, con
#if defined(__APPLE__)
g_libCEC = dlopen(strLib ? strLib : "libcec.dylib", RTLD_LAZY);
#else
#if defined(__APPLE__)
g_libCEC = dlopen(strLib ? strLib : "libcec.dylib", RTLD_LAZY);
#else
- g_libCEC = dlopen(strLib ? strLib : "libcec.so
"
, RTLD_LAZY);
+ g_libCEC = dlopen(strLib ? strLib : "libcec.so
." CEC_LIB_VERSION_MAJOR_STR
, RTLD_LAZY);
#endif
if (!g_libCEC)
{
#endif
if (!g_libCEC)
{
-#if defined(__APPLE__)
- cout << "cannot find " << (strLib ? strLib : "libcec.dylib") << dlerror() << endl;
-#else
- cout << "cannot find " << (strLib ? strLib : "libcec.so") << dlerror() << endl;
-#endif
+ cout << dlerror() << endl;
return NULL;
}
}
return NULL;
}
}
@@
-246,15
+238,11
@@
bool LibCecBootloader(const char *strLib = NULL)
#if defined(__APPLE__)
g_libCEC = dlopen(strLib ? strLib : "libcec.dylib", RTLD_LAZY);
#else
#if defined(__APPLE__)
g_libCEC = dlopen(strLib ? strLib : "libcec.dylib", RTLD_LAZY);
#else
- g_libCEC = dlopen(strLib ? strLib : "libcec.so
"
, RTLD_LAZY);
+ g_libCEC = dlopen(strLib ? strLib : "libcec.so
." CEC_LIB_VERSION_MAJOR_STR
, RTLD_LAZY);
#endif
if (!g_libCEC)
{
#endif
if (!g_libCEC)
{
-#if defined(__APPLE__)
- cout << "cannot find " << (strLib ? strLib : "libcec.dylib") << dlerror() << endl;
-#else
- cout << "cannot find " << (strLib ? strLib : "libcec.so") << dlerror() << endl;
-#endif
+ cout << dlerror() << endl;
return NULL;
}
}
return NULL;
}
}