return false;
bool bReturn = LibCecBootloader();
- UnloadLibCec(static_cast< CEC::ICECAdapter* > g_libCEC);
+ FreeLibrary(g_libCEC);
+ g_libCEC = NULL;
return bReturn;
}
#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)
{
-#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;
}
}
#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)
{
-#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;
}
}
#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)
{
-#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;
}
}
}
bool bReturn = LibCecBootloader();
- UnloadLibCec((CEC::ICECAdapter*)g_libCEC);
+ dlclose(g_libCEC);
return bReturn;
}