Commit 99a60281 authored by Alexander Bethke's avatar Alexander Bethke Committed by Rémi Denis-Courmont

Revert broken loading of libvlc with OPTION_DLOPEN_GLOBAL in jvlc

As I understand this has been a temporary workaround for libvlccore, which seems to have been resolved.
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit ee25a62a)
parent c10bdb07
......@@ -25,9 +25,6 @@
package org.videolan.jvlc.internal;
import java.util.HashMap;
import java.util.Map;
import com.sun.jna.Callback;
import com.sun.jna.Library;
import com.sun.jna.Native;
......@@ -37,19 +34,11 @@ import com.sun.jna.Pointer;
import com.sun.jna.PointerType;
import com.sun.jna.Structure;
import com.sun.jna.Union;
import com.sun.jna.win32.W32APIFunctionMapper;
import com.sun.jna.win32.W32APITypeMapper;
public interface LibVlc extends Library
{
Map options = new HashMap() {
{
put(Library.OPTION_DLOPEN_GLOBAL, Boolean.TRUE);
}
};
LibVlc INSTANCE = (LibVlc) Native.loadLibrary(Platform.isWindows()? "libvlc" : "vlc", LibVlc.class, options);
LibVlc INSTANCE = (LibVlc) Native.loadLibrary(Platform.isWindows()? "libvlc" : "vlc", LibVlc.class);
LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE);
......
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