/*****************************************************************************
* 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
*****************************************************************************
{
intf_thread_t *p_intf;
char * psz_method;
- char * psz_plugin;
/* Allocate structure */
p_intf = malloc( sizeof( intf_thread_t ) );
return( NULL );
}
- /* Initialize method-dependent functions */
+ /* Request an interface plugin */
psz_method = main_GetPszVariable( VOUT_METHOD_VAR, VOUT_DEFAULT_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 = RequestPlugin( "intf", psz_method );
- p_intf->p_intf_plugin = dlopen( psz_plugin, RTLD_LAZY );
-
- 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;
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 );
}
{
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 );
}
/* Check attached threads status */
if( (p_intf->p_vout != NULL) && p_intf->p_vout->b_error )
{
- //?? add aout error detection
+ /* FIXME: add aout error detection ?? */
p_intf->b_die = 1;
}
if( (p_intf->p_input != NULL) && p_intf->p_input->b_error )
UnloadChannels( p_intf );
/* Close plugin */
- dlclose( p_intf->p_intf_plugin );
-
+ TrashPlugin( p_intf->p_intf_plugin );
+
/* Free structure */
free( p_intf );
}
intf_SelectChannel( p_intf, i_key - '0' );
break;
case '+': /* volume + */
- // ??
+ /* XXX?? */
break;
case '-': /* volume - */
- // ??
+ /* XXX?? */
break;
case 'M': /* toggle mute */
case 'm':
- // ??
+ /* XXX?? */
break;
case 'g': /* gamma - */
if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma > -INTF_GAMMA_LIMIT) )