/*****************************************************************************
* 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 "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 "intf_sys.h"
+#include "main.h"
/*****************************************************************************
* intf_channel_t: channel description
/*****************************************************************************
* intf_Create: prepare interface before main loop
*****************************************************************************
- * This function opens output devices and create specific interfaces. It send
- * it's own error messages.
+ * This function opens output devices and creates specific interfaces. It sends
+ * its own error messages.
*****************************************************************************/
intf_thread_t* intf_Create( void )
{
intf_thread_t *p_intf;
+ char * psz_method;
/* Allocate structure */
p_intf = malloc( sizeof( intf_thread_t ) );
if( !p_intf )
{
intf_ErrMsg("error: %s\n", strerror( ENOMEM ) );
- return( NULL );
+ return( NULL );
+ }
+
+ /* Request an interface plugin */
+ psz_method = main_GetPszVariable( VOUT_METHOD_VAR, VOUT_DEFAULT_METHOD );
+ p_intf->p_intf_plugin = RequestPlugin( "intf", psz_method );
+
+ if( !p_intf->p_intf_plugin )
+ {
+ intf_ErrMsg( "error: could not open interface plugin intf_%s.so\n", psz_method );
+ free( p_intf );
+ return( NULL );
}
+ /* Get plugins */
+ 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;
p_intf->p_vout = NULL;
if( p_intf->p_console == NULL )
{
intf_ErrMsg("error: can't create control console\n");
- free( p_intf );
+ TrashPlugin( p_intf->p_intf_plugin );
+ free( p_intf );
return( NULL );
}
- if( intf_SysCreate( p_intf ) )
+ if( p_intf->p_sys_create( p_intf ) )
{
- intf_ErrMsg("error: can't create interface\n");
- intf_ConsoleDestroy( p_intf->p_console );
- free( p_intf );
- return( NULL );
+ intf_ErrMsg("error: can't create interface\n");
+ intf_ConsoleDestroy( p_intf->p_console );
+ TrashPlugin( p_intf->p_intf_plugin );
+ free( p_intf );
+ return( NULL );
}
intf_Msg("Interface initialized\n");
* the script could be executed but failed */
if( intf_ExecScript( main_GetPszVariable( INTF_INIT_SCRIPT_VAR, INTF_INIT_SCRIPT_DEFAULT ) ) > 0 )
{
- intf_ErrMsg("warning: error(s) during startup script\n");
+ intf_ErrMsg("warning: error(s) during startup script\n");
}
/* Main loop */
intf_FlushMsg();
/* Manage specific interface */
- intf_SysManage( p_intf );
+ p_intf->p_sys_manage( p_intf );
/* 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 )
void intf_Destroy( intf_thread_t *p_intf )
{
/* Destroy interfaces */
- intf_SysDestroy( p_intf );
+ p_intf->p_sys_destroy( p_intf );
intf_ConsoleDestroy( p_intf->p_console );
/* Unload channels */
UnloadChannels( p_intf );
+ /* Close 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':
- // ??
- break;
+ /* XXX?? */
+ break;
case 'g': /* gamma - */
if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma > -INTF_GAMMA_LIMIT) )
{
projects / vlc / blobdiff