Commit e630779b authored by Sam Hocevar's avatar Sam Hocevar

 * Ported the framebuffer plugin to the new module API. As for most of the
   other video output modules, keyboard doesn't work. Except ^C to quit.
parent b0ab70c9
...@@ -301,7 +301,6 @@ PLUGIN_ESD = plugins/esd/esd.o \ ...@@ -301,7 +301,6 @@ PLUGIN_ESD = plugins/esd/esd.o \
plugins/esd/aout_esd.o plugins/esd/aout_esd.o
PLUGIN_FB = plugins/fb/fb.o \ PLUGIN_FB = plugins/fb/fb.o \
plugins/fb/intf_fb.o \
plugins/fb/vout_fb.o plugins/fb/vout_fb.o
PLUGIN_GGI = plugins/ggi/ggi.o \ PLUGIN_GGI = plugins/ggi/ggi.o \
......
...@@ -3450,7 +3450,7 @@ fi ...@@ -3450,7 +3450,7 @@ fi
# Check whether --enable-fb or --disable-fb was given. # Check whether --enable-fb or --disable-fb was given.
if test "${enable_fb+set}" = set; then if test "${enable_fb+set}" = set; then
enableval="$enable_fb" enableval="$enable_fb"
if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi
fi fi
# Check whether --with-ggi or --without-ggi was given. # Check whether --with-ggi or --without-ggi was given.
......
...@@ -156,7 +156,7 @@ AC_ARG_ENABLE(esd, ...@@ -156,7 +156,7 @@ AC_ARG_ENABLE(esd,
[if test x$enable_esd = xyes; then PLUGINS=${PLUGINS}"esd "; fi]) [if test x$enable_esd = xyes; then PLUGINS=${PLUGINS}"esd "; fi])
AC_ARG_ENABLE(fb, AC_ARG_ENABLE(fb,
[ --enable-fb Linux framebuffer support (default disabled)], [ --enable-fb Linux framebuffer support (default disabled)],
[if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi]) [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi])
AC_ARG_WITH(ggi, AC_ARG_WITH(ggi,
[ --with-ggi[=name] GGI support (default disabled)], [ --with-ggi[=name] GGI support (default disabled)],
[ PLUGINS=${PLUGINS}"ggi "; [ PLUGINS=${PLUGINS}"ggi ";
......
...@@ -369,12 +369,7 @@ ...@@ -369,12 +369,7 @@
#define VOUT_FB_DEV_VAR "vlc_fb_dev" #define VOUT_FB_DEV_VAR "vlc_fb_dev"
#define VOUT_FB_DEV_DEFAULT "/dev/fb0" #define VOUT_FB_DEV_DEFAULT "/dev/fb0"
/* Some frame buffers aren't able to support double buffering. /* The default video output window title */
* We don't want to lose one frame out of 2, so we may set the
* FB_NOYPAN
*/
// #define FB_NOYPAN
#define VOUT_TITLE "VideoLAN Client @VLC_VERSION@" #define VOUT_TITLE "VideoLAN Client @VLC_VERSION@"
/***************************************************************************** /*****************************************************************************
......
/***************************************************************************** /*****************************************************************************
* fb.c : Linux framebuffer plugin for vlc * fb.c : framebuffer plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
* *
* Authors: * Authors: Samuel Hocevar <sam@zoy.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -20,118 +20,93 @@ ...@@ -20,118 +20,93 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#define MODULE_NAME fb
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include "defs.h" #include "defs.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <unistd.h> /* close() */
#include "config.h" #include "config.h"
#include "common.h" /* boolean_t, byte_t */ #include "common.h" /* boolean_t, byte_t */
#include "threads.h" #include "threads.h"
#include "mtime.h" #include "mtime.h"
#include "tests.h"
#include "plugins.h"
#include "interface.h"
#include "audio_output.h"
#include "video.h" #include "video.h"
#include "video_output.h" #include "video_output.h"
#include "main.h" #include "modules.h"
#include "modules_inner.h"
/***************************************************************************** /*****************************************************************************
* Exported prototypes * Building configuration tree
*****************************************************************************/ *****************************************************************************/
static void vout_GetPlugin( p_vout_thread_t p_vout ); MODULE_CONFIG_START
static void intf_GetPlugin( p_intf_thread_t p_intf ); ADD_WINDOW( "Configuration for framebuffer module" )
ADD_COMMENT( "For now, the framebuffer module cannot be configured" )
/* Video output */ MODULE_CONFIG_END
int vout_FBCreate ( vout_thread_t *p_vout, char *psz_display,
int i_root_window, void *p_data ); /*****************************************************************************
int vout_FBInit ( p_vout_thread_t p_vout ); * Capabilities defined in the other files.
void vout_FBEnd ( p_vout_thread_t p_vout ); ******************************************************************************/
void vout_FBDestroy ( p_vout_thread_t p_vout ); extern void vout_getfunctions( function_list_t * p_function_list );
int vout_FBManage ( p_vout_thread_t p_vout );
void vout_FBDisplay ( p_vout_thread_t p_vout );
void vout_FBSetPalette ( p_vout_thread_t p_vout,
u16 *red, u16 *green, u16 *blue, u16 *transp );
/* Interface */
int intf_FBCreate ( p_intf_thread_t p_intf );
void intf_FBDestroy ( p_intf_thread_t p_intf );
void intf_FBManage ( p_intf_thread_t p_intf );
/***************************************************************************** /*****************************************************************************
* GetConfig: get the plugin structure and configuration * InitModule: get the module structure and configuration.
*****************************************************************************
* We have to fill psz_name, psz_longname and psz_version. These variables
* will be strdup()ed later by the main application because the module can
* be unloaded later to save memory, and we want to be able to access this
* data even after the module has been unloaded.
*****************************************************************************/ *****************************************************************************/
plugin_info_t * GetConfig( void ) int InitModule( module_t * p_module )
{ {
int i_fd; p_module->psz_name = MODULE_STRING;
plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) ); p_module->psz_longname = "Linux console framebuffer module";
p_module->psz_version = VERSION;
p_info->psz_name = "Linux framebuffer";
p_info->psz_version = VERSION;
p_info->psz_author = "the VideoLAN team <vlc@videolan.org>";
p_info->aout_GetPlugin = NULL;
p_info->vout_GetPlugin = vout_GetPlugin;
p_info->intf_GetPlugin = intf_GetPlugin;
p_info->yuv_GetPlugin = NULL;
/* Test if the device can be opened */
if ( (i_fd = open( main_GetPszVariable( VOUT_FB_DEV_VAR,
VOUT_FB_DEV_DEFAULT ),
O_RDWR )) < 0 )
{
p_info->i_score = 0;
}
else
{
close( i_fd );
p_info->i_score = 0x100;
}
if( TestProgram( "fbvlc" ) ) p_module->i_capabilities = MODULE_CAPABILITY_NULL
{ | MODULE_CAPABILITY_VOUT;
p_info->i_score += 0x180;
} return( 0 );
}
/* If this plugin was requested, score it higher */ /*****************************************************************************
if( TestMethod( VOUT_METHOD_VAR, "fb" ) ) * ActivateModule: set the module to an usable state.
*****************************************************************************
* This function fills the capability functions and the configuration
* structure. Once ActivateModule() has been called, the i_usage can
* be set to 0 and calls to NeedModule() be made to increment it. To unload
* the module, one has to wait until i_usage == 0 and call DeactivateModule().
*****************************************************************************/
int ActivateModule( module_t * p_module )
{
p_module->p_functions = malloc( sizeof( module_functions_t ) );
if( p_module->p_functions == NULL )
{ {
p_info->i_score += 0x200; return( -1 );
} }
return( p_info ); vout_getfunctions( &p_module->p_functions->vout );
p_module->p_config = p_config;
return( 0 );
} }
/***************************************************************************** /*****************************************************************************
* Following functions are only called through the p_info structure * DeactivateModule: make sure the module can be unloaded.
*****************************************************************************
* This function must only be called when i_usage == 0. If it successfully
* returns, i_usage can be set to -1 and the module unloaded. Be careful to
* lock usage_lock during the whole process.
*****************************************************************************/ *****************************************************************************/
int DeactivateModule( module_t * p_module )
static void vout_GetPlugin( p_vout_thread_t p_vout )
{ {
p_vout->p_sys_create = vout_FBCreate; free( p_module->p_functions );
p_vout->p_sys_init = vout_FBInit;
p_vout->p_sys_end = vout_FBEnd;
p_vout->p_sys_destroy = vout_FBDestroy;
p_vout->p_sys_manage = vout_FBManage;
p_vout->p_sys_display = vout_FBDisplay;
/* optional functions */
p_vout->p_set_palette = vout_FBSetPalette;
}
static void intf_GetPlugin( p_intf_thread_t p_intf ) return( 0 );
{
p_intf->p_sys_create = intf_FBCreate;
p_intf->p_sys_destroy = intf_FBDestroy;
p_intf->p_sys_manage = intf_FBManage;
} }
This diff is collapsed.
This diff is collapsed.
...@@ -161,7 +161,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status ) ...@@ -161,7 +161,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status )
p_vout->b_interface = 0; p_vout->b_interface = 0;
p_vout->b_scale = 1; p_vout->b_scale = 1;
intf_DbgMsg( "wished configuration: %dx%d, %d/%d bpp (%d Bpl)", intf_WarnMsg( 1, "wished configuration: %dx%d, %d/%d bpp (%d Bpl)",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth, p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line ); p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
...@@ -199,7 +199,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status ) ...@@ -199,7 +199,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status )
free( p_vout ); free( p_vout );
return( NULL ); return( NULL );
} }
intf_DbgMsg( "actual configuration: %dx%d, %d/%d bpp (%d Bpl), " intf_WarnMsg( 1, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
"masks: 0x%x/0x%x/0x%x", "masks: 0x%x/0x%x/0x%x",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth, p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line, p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
......
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