Commit e4d9dab6 authored by Olivier Aubert's avatar Olivier Aubert
Browse files

Revert "python bindings: workaround for the #2257 / #2266 VLC bug (linux only ATM)"

Not needed anymore since we are back at linking modules with libvlccode.

This reverts commit 937e3f2f.
parent 31f30e9a
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
*****************************************************************************/ *****************************************************************************/
#include "vlcglue.h" #include "vlcglue.h"
#include <dlfcn.h>
/************************************************************************** /**************************************************************************
* VLC Module * VLC Module
...@@ -48,21 +47,6 @@ initvlc( void ) ...@@ -48,21 +47,6 @@ initvlc( void )
{ {
PyObject* p_module; PyObject* p_module;
#ifdef WIN32
/*
FIXME: Win32 support is trickier than that (does not support dlopen).
Get code from src/modules/os.c to work on different OSes.
*/
#define LIBVLCCORE "libvlccore.dll"
#else
#define LIBVLCCORE "libvlccore.so"
#endif
/* Workaround for the 2257/2266 VLC bug. */
if ( !dlopen( LIBVLCCORE, RTLD_NOW | RTLD_GLOBAL ) )
{
fprintf( stderr, "Error when loading libvlccore:\n%s\nTrying to continue anyway.\n", dlerror() );
}
/* vlcMediaPlayer_Type.tp_new = PyType_GenericNew; */ /* vlcMediaPlayer_Type.tp_new = PyType_GenericNew; */
vlcMediaPlayer_Type.tp_alloc = PyType_GenericAlloc; vlcMediaPlayer_Type.tp_alloc = PyType_GenericAlloc;
/* vlcMedia_Type.tp_new = PyType_GenericNew; */ /* vlcMedia_Type.tp_new = PyType_GenericNew; */
......
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