mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
959674591f
--------------------------- * Plugins have completely disappeared, we now only use the new module API. * All intf and vout modules are now independant. So far, only the Gnome intf module and the SDL vout module have been ported. configure.in has been modified to reflect the changes (x11 and dummy aren't compiled by default anymore, while SDL and Gnome are). Note that this is _not_ Interface II, it's just a step forward. For instance, it lacks the whole message passing scheme. Things that should work: * Right-clicking on the SDL video output window brings the Gnome menu. * Pause, Play, Exit, About work from the menu or from the interface window. * The old SDL keys still work. Things that are broken or may be broken: * Xlib calls are not locked yet, which may lead to "Unexpected async reply" errors, and make the vlc segfault. * Sound only works for the first file. * The SDL vout_sdl.c file is absolutely ugly and kludgey. * The vlc immediately quits when no filename is given as an argument. Not a real bug, but still annoying. * The Gnome menu does not work in fullscreen mode. Things that will come soon, maybe tomorrow: * Complete navigation buttons (fast forward, slow, etc.). * File/Open menu to add files to the playlist. * Return of the X11 video output for those of us who do not have SDL. * Textmode interface for those of us who do not have Gnome. * aout and vout autospawn (maybe).
110 lines
3.9 KiB
C
110 lines
3.9 KiB
C
/*****************************************************************************
|
|
* interface.h: interface access for other threads
|
|
* This library provides basic functions for threads to interact with user
|
|
* interface, such as message output.
|
|
*****************************************************************************
|
|
* Copyright (C) 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, USA.
|
|
*****************************************************************************/
|
|
|
|
/*****************************************************************************
|
|
* Required headers:
|
|
* <X11/Xlib.h>
|
|
* <X11/extensions/XShm.h>
|
|
* "config.h"
|
|
* "common.h"
|
|
* "mtime.h"
|
|
* "threads.h"
|
|
* "input.h"
|
|
* "video.h"
|
|
* "video_output.h"
|
|
* "audio_output.h"
|
|
* "xconsole.h"
|
|
*****************************************************************************/
|
|
|
|
/*****************************************************************************
|
|
* intf_thread_t: describe an interface thread
|
|
*****************************************************************************
|
|
* This structe describes all interface-specific data of the main (interface)
|
|
* thread.
|
|
*****************************************************************************/
|
|
typedef struct _keyparam
|
|
{
|
|
int key;
|
|
int param;
|
|
} keyparm;
|
|
|
|
typedef struct _key
|
|
{
|
|
int received_key;
|
|
keyparm forwarded;
|
|
struct _key * next;
|
|
} intf_key;
|
|
|
|
typedef intf_key * p_intf_key;
|
|
|
|
typedef struct intf_thread_s
|
|
{
|
|
boolean_t b_die; /* `die' flag */
|
|
|
|
/* Specific interfaces */
|
|
p_intf_console_t p_console; /* console */
|
|
p_intf_sys_t p_sys; /* system interface */
|
|
p_intf_key p_keys;
|
|
|
|
/* Plugin used and shortcuts to access its capabilities */
|
|
struct module_s * p_module;
|
|
int ( *pf_open ) ( struct intf_thread_s * );
|
|
void ( *pf_close ) ( struct intf_thread_s * );
|
|
void ( *pf_run ) ( struct intf_thread_s * );
|
|
|
|
/* Interface callback */
|
|
void ( *pf_manage ) ( struct intf_thread_s * );
|
|
|
|
/* XXX: Channels array - new API */
|
|
//p_intf_channel_t * p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
|
|
|
|
/* Channels array - NULL if not used */
|
|
p_intf_channel_t p_channel; /* description of channels */
|
|
|
|
/* Main threads - NULL if not active */
|
|
p_input_thread_t p_input;
|
|
|
|
/* Specific functions */
|
|
keyparm (*p_intf_get_key)(struct intf_thread_s *p_intf, int r_key) ;
|
|
|
|
/* XXX: new message passing stuff will go here */
|
|
vlc_mutex_t change_lock;
|
|
boolean_t b_menu_change;
|
|
boolean_t b_menu;
|
|
|
|
} intf_thread_t;
|
|
|
|
/*****************************************************************************
|
|
* Prototypes
|
|
*****************************************************************************/
|
|
intf_thread_t * intf_Create ( void );
|
|
void intf_Destroy ( intf_thread_t * p_intf );
|
|
|
|
int intf_ProcessKey ( intf_thread_t * p_intf, int i_key );
|
|
|
|
void intf_AssignKey( intf_thread_t *p_intf, int r_key, int f_key, int param);
|
|
keyparm intf_GetKey( intf_thread_t *p_intf, int r_key);
|
|
void intf_AssignNormalKeys( intf_thread_t *p_intf);
|
|
|