Commit 1df2b502 authored by gates's avatar gates

Fixup libbluray when using normal linking

parent 730a9d82
......@@ -113,19 +113,17 @@ static int _libaacs_open(BLURAY *bd, const char *keyfile_path)
DEBUG(DBG_BLURAY, "libaacs not found!\n");
}
#else
if ((bd->h_libaacs = NULL)) {
DEBUG(DBG_BLURAY, "Using libaacs via normal linking\n");
bd->h_libaacs = NULL;
DEBUG(DBG_BLURAY, "Using libaacs via normal linking\n");
fptr_p_void fptr = (fptr_p_void)&aacs_open;
bd->libaacs_decrypt_unit = &aacs_decrypt_unit;
bd->libaacs_decrypt_unit = &aacs_decrypt_unit;
if (fptr && bd->libaacs_decrypt_unit) {
if ((bd->aacs = fptr(bd->device_path, keyfile_path))) {
DEBUG(DBG_BLURAY, "Opened libaacs (%p)\n", bd->aacs);
return 1;
}
DEBUG(DBG_BLURAY, "aacs_open() failed!\n");
if (bd->libaacs_decrypt_unit) {
if ((bd->aacs = aacs_open(bd->device_path, keyfile_path))) {
DEBUG(DBG_BLURAY, "Opened libaacs (%p)\n", bd->aacs);
return 1;
}
DEBUG(DBG_BLURAY, "aacs_open() failed!\n");
}
#endif
......@@ -203,20 +201,15 @@ BLURAY *bd_open(const char* device_path, const char* keyfile_path)
}
#else
if ((bd->h_libbdplus = NULL)) {
DEBUG(DBG_BLURAY,"Using libbdplus via normal linking\n");
fptr_p_void fp_bdplus_init = (fptr_p_void)&bdplus_init;
//bdplus_t *bdplus_init(path,configfile_path,*vid );
if (fp_bdplus_init)
bd->bdplus = fp_bdplus_init(device_path, keyfile_path, vid);
bd->h_libbdplus = NULL;
DEBUG(DBG_BLURAY,"Using libbdplus via normal linking\n");
// Since we will call these functions a lot, we assign them
// now.
bd->bdplus_seek = &bdplus_seek;
bd->bdplus_fixup = &bdplus_fixup;
bd->bdplus = bdplus_init(device_path, keyfile_path, vid);
}
// Since we will call these functions a lot, we assign them
// now.
bd->bdplus_seek = &bdplus_seek;
bd->bdplus_fixup = &bdplus_fixup;
#endif
} // file_open
X_FREE(tmp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment