- �a compile sous FreeBSD (mais �a ne tourne pas)

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index c9573fa71c8b61dc0a018224ebfcd9f14f3214ae..cd869c39ab8cd66b9386e0f4fcf65005b7a0b4cb 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -1,36 +1,55 @@
 /*****************************************************************************
  * interface.c: interface access for other threads
- * (c)1998 VideoLAN
- *****************************************************************************
  * This library provides basic functions for threads to interact with user
  * interface, such as command line.
+ *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+#include <errno.h>                                                 /* ENOMEM */
+#include <stdlib.h>                                      /* free(), strtol() */
+#include <stdio.h>                                                   /* FILE */
+#include <string.h>                                            /* strerror() */
+#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                          /* for input.h */
 
-#include <dlfcn.h>                                                /* plugins */
-
 #include "config.h"
 #include "common.h"
 #include "mtime.h"
-#include "vlc_thread.h"
+#include "threads.h"
+#include "plugins.h"
 #include "input.h"
+
 #include "intf_msg.h"
 #include "interface.h"
 #include "intf_cmd.h"
 #include "intf_console.h"
-#include "main.h"
+
 #include "video.h"
 #include "video_output.h"
 
+#include "main.h"
+
 /*****************************************************************************
  * intf_channel_t: channel description
  *****************************************************************************
@@ -69,7 +88,6 @@ intf_thread_t* intf_Create( void )
 {
     intf_thread_t *p_intf;
     char * psz_method;
-    char * psz_plugin;
 
     /* Allocate structure */
     p_intf = malloc( sizeof( intf_thread_t ) );
@@ -79,27 +97,21 @@ intf_thread_t* intf_Create( void )
         return( NULL );
     }
 
-    /* Initialize method-dependent functions */
+    /* Request an interface plugin */
     psz_method = main_GetPszVariable( VOUT_METHOD_VAR, VOUT_DEFAULT_METHOD );
+    p_intf->p_intf_plugin = RequestPlugin( "intf", psz_method );
 
-    psz_plugin = malloc( sizeof("./interface/intf_.so") + strlen(psz_method) );
-    sprintf( psz_plugin, "./interface/intf_%s.so", psz_method );
-
-    p_intf->p_intf_plugin = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
-
-    if( p_intf->p_intf_plugin == NULL )
+    if( !p_intf->p_intf_plugin )
     {
-        intf_ErrMsg( "error: could not open interface plugin %s\n", psz_plugin );
-        free( psz_plugin );
+        intf_ErrMsg( "error: could not open interface plugin intf_%s.so\n", psz_method );
         free( p_intf );
         return( NULL );
     }
-    free( psz_plugin );
 
     /* Get plugins */
-    p_intf->p_sys_create =  dlsym(p_intf->p_intf_plugin, "intf_SysCreate");
-    p_intf->p_sys_manage =  dlsym(p_intf->p_intf_plugin, "intf_SysManage");
-    p_intf->p_sys_destroy = dlsym(p_intf->p_intf_plugin, "intf_SysDestroy");
+    p_intf->p_sys_create =  GetPluginFunction( p_intf->p_intf_plugin, "intf_SysCreate" );
+    p_intf->p_sys_manage =  GetPluginFunction( p_intf->p_intf_plugin, "intf_SysManage" );
+    p_intf->p_sys_destroy = GetPluginFunction( p_intf->p_intf_plugin, "intf_SysDestroy" );
 
     /* Initialize structure */
     p_intf->b_die =     0;
@@ -116,7 +128,7 @@ intf_thread_t* intf_Create( void )
     if( p_intf->p_console == NULL )
     {
         intf_ErrMsg("error: can't create control console\n");
-        dlclose( p_intf->p_intf_plugin );
+        TrashPlugin( p_intf->p_intf_plugin );
         free( p_intf );
         return( NULL );
     }
@@ -124,7 +136,7 @@ intf_thread_t* intf_Create( void )
     {
         intf_ErrMsg("error: can't create interface\n");
         intf_ConsoleDestroy( p_intf->p_console );
-        dlclose( p_intf->p_intf_plugin );
+        TrashPlugin( p_intf->p_intf_plugin );
         free( p_intf );
         return( NULL );
     }
@@ -190,7 +202,7 @@ void intf_Destroy( intf_thread_t *p_intf )
     UnloadChannels( p_intf );
 
     /* Close plugin */
-    dlclose( p_intf->p_intf_plugin );
+    TrashPlugin( p_intf->p_intf_plugin );
 
     /* Free structure */
     free( p_intf );