2000-02-13 05:31:35 +01:00
|
|
|
/*****************************************************************************
|
2003-06-24 15:33:49 +02:00
|
|
|
* vlc_interface.h: interface access for other threads
|
1999-08-08 14:42:54 +02:00
|
|
|
* This library provides basic functions for threads to interact with user
|
|
|
|
* interface, such as message output.
|
2000-02-13 05:31:35 +01:00
|
|
|
*****************************************************************************
|
2000-03-03 08:03:34 +01:00
|
|
|
* Copyright (C) 1999, 2000 VideoLAN
|
2004-01-25 19:17:08 +01:00
|
|
|
* $Id: vlc_interface.h,v 1.9 2004/01/25 18:17:08 zorglub Exp $
|
2000-03-03 08:03:34 +01:00
|
|
|
*
|
2001-03-21 14:42:35 +01:00
|
|
|
* Authors: Vincent Seguin <seguin@via.ecp.fr>
|
2000-03-03 08:03:34 +01:00
|
|
|
*
|
|
|
|
* 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.
|
2003-02-07 01:26:23 +01:00
|
|
|
*
|
2000-03-03 08:03:34 +01:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2000-05-25 00:39:44 +02:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2000-03-03 08:03:34 +01:00
|
|
|
*
|
2000-05-25 00:39:44 +02:00
|
|
|
* 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.
|
2000-03-03 08:03:34 +01:00
|
|
|
*****************************************************************************/
|
|
|
|
|
2003-07-20 12:38:49 +02:00
|
|
|
typedef struct intf_dialog_args_t intf_dialog_args_t;
|
|
|
|
|
2003-09-18 19:54:02 +02:00
|
|
|
/**
|
|
|
|
* \file
|
2004-01-25 19:17:08 +01:00
|
|
|
* This file contains structures and function prototypes for
|
|
|
|
* interface management in vlc
|
2003-09-18 19:54:02 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2000-02-13 05:31:35 +01:00
|
|
|
/*****************************************************************************
|
1999-08-08 14:42:54 +02:00
|
|
|
* intf_thread_t: describe an interface thread
|
2000-02-13 05:31:35 +01:00
|
|
|
*****************************************************************************
|
2002-10-03 19:01:59 +02:00
|
|
|
* This struct describes all interface-specific data of the main (interface)
|
1999-08-08 14:42:54 +02:00
|
|
|
* thread.
|
2000-02-13 05:31:35 +01:00
|
|
|
*****************************************************************************/
|
2003-09-18 19:54:02 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* \defgroup vlc_interface Interface
|
|
|
|
* These functions and structures are for interface management
|
|
|
|
* @{
|
|
|
|
*/
|
2002-07-20 20:01:43 +02:00
|
|
|
struct intf_thread_t
|
1999-08-08 14:42:54 +02:00
|
|
|
{
|
* ALL: the first libvlc commit.
As for video output 4, this breaks almost everything, but I'll slowly
do what remains to be fixed during the weekend.
Changes in vlc:
===============
* vlc is now a very small program (20 lines) which uses the libvlc API;
it is quite simple for the moment but can be extended in the future.
* interfaces, decoders, video outputs, etc. are now almost the same
objects (yes, I know, this is C++ redone in C) and are structured in
a tree. More about this later, but basically it allows the following
nice features:
- several interfaces
- several playlists with several outputs
- input plugins spawning helper interfaces (will be used for DVD menus)
- anything spawning anything; I swear there are useful uses for this!
* libvlc can be used in other programs; I'm currently writing a Mozilla
plugin for my employer.
Things currently broken:
========================
* most interfaces, most ports
* the playlist handling (almost finished rewriting this though). This means
no file can be played from the GUI, you need to use the commandline. This
also means it segfaults at EOF, when exiting the program, and it sometimes
refuses to open a file when asked to.
2002-06-01 14:32:02 +02:00
|
|
|
VLC_COMMON_MEMBERS
|
|
|
|
|
|
|
|
/* Thread properties and locks */
|
|
|
|
vlc_bool_t b_block;
|
1999-08-08 14:42:54 +02:00
|
|
|
|
2000-02-13 05:31:35 +01:00
|
|
|
/* Specific interfaces */
|
2003-10-15 00:41:41 +02:00
|
|
|
intf_console_t * p_console; /** console */
|
|
|
|
intf_sys_t * p_sys; /** system interface */
|
2003-02-07 01:26:23 +01:00
|
|
|
|
2003-09-18 19:54:02 +02:00
|
|
|
/** Interface module */
|
* ALL: the first libvlc commit.
As for video output 4, this breaks almost everything, but I'll slowly
do what remains to be fixed during the weekend.
Changes in vlc:
===============
* vlc is now a very small program (20 lines) which uses the libvlc API;
it is quite simple for the moment but can be extended in the future.
* interfaces, decoders, video outputs, etc. are now almost the same
objects (yes, I know, this is C++ redone in C) and are structured in
a tree. More about this later, but basically it allows the following
nice features:
- several interfaces
- several playlists with several outputs
- input plugins spawning helper interfaces (will be used for DVD menus)
- anything spawning anything; I swear there are useful uses for this!
* libvlc can be used in other programs; I'm currently writing a Mozilla
plugin for my employer.
Things currently broken:
========================
* most interfaces, most ports
* the playlist handling (almost finished rewriting this though). This means
no file can be played from the GUI, you need to use the commandline. This
also means it segfaults at EOF, when exiting the program, and it sometimes
refuses to open a file when asked to.
2002-06-01 14:32:02 +02:00
|
|
|
module_t * p_module;
|
2003-09-18 19:54:02 +02:00
|
|
|
void ( *pf_run ) ( intf_thread_t * ); /** Run function */
|
2000-02-14 09:44:59 +01:00
|
|
|
|
2003-09-18 19:54:02 +02:00
|
|
|
/** Specific for dialogs providers */
|
2003-07-20 12:38:49 +02:00
|
|
|
void ( *pf_show_dialog ) ( intf_thread_t *, int, int,
|
|
|
|
intf_dialog_args_t * );
|
2003-07-17 19:30:40 +02:00
|
|
|
|
Beginning of Interface II
---------------------------
* 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).
2001-02-11 02:15:12 +01:00
|
|
|
/* XXX: new message passing stuff will go here */
|
* ALL: the first libvlc commit.
As for video output 4, this breaks almost everything, but I'll slowly
do what remains to be fixed during the weekend.
Changes in vlc:
===============
* vlc is now a very small program (20 lines) which uses the libvlc API;
it is quite simple for the moment but can be extended in the future.
* interfaces, decoders, video outputs, etc. are now almost the same
objects (yes, I know, this is C++ redone in C) and are structured in
a tree. More about this later, but basically it allows the following
nice features:
- several interfaces
- several playlists with several outputs
- input plugins spawning helper interfaces (will be used for DVD menus)
- anything spawning anything; I swear there are useful uses for this!
* libvlc can be used in other programs; I'm currently writing a Mozilla
plugin for my employer.
Things currently broken:
========================
* most interfaces, most ports
* the playlist handling (almost finished rewriting this though). This means
no file can be played from the GUI, you need to use the commandline. This
also means it segfaults at EOF, when exiting the program, and it sometimes
refuses to open a file when asked to.
2002-06-01 14:32:02 +02:00
|
|
|
vlc_mutex_t change_lock;
|
|
|
|
vlc_bool_t b_menu_change;
|
|
|
|
vlc_bool_t b_menu;
|
2003-10-15 00:41:41 +02:00
|
|
|
|
|
|
|
/* Provides the ability to switch an interface on the fly */
|
|
|
|
char *psz_switch_intf;
|
* ALL: the first libvlc commit.
As for video output 4, this breaks almost everything, but I'll slowly
do what remains to be fixed during the weekend.
Changes in vlc:
===============
* vlc is now a very small program (20 lines) which uses the libvlc API;
it is quite simple for the moment but can be extended in the future.
* interfaces, decoders, video outputs, etc. are now almost the same
objects (yes, I know, this is C++ redone in C) and are structured in
a tree. More about this later, but basically it allows the following
nice features:
- several interfaces
- several playlists with several outputs
- input plugins spawning helper interfaces (will be used for DVD menus)
- anything spawning anything; I swear there are useful uses for this!
* libvlc can be used in other programs; I'm currently writing a Mozilla
plugin for my employer.
Things currently broken:
========================
* most interfaces, most ports
* the playlist handling (almost finished rewriting this though). This means
no file can be played from the GUI, you need to use the commandline. This
also means it segfaults at EOF, when exiting the program, and it sometimes
refuses to open a file when asked to.
2002-06-01 14:32:02 +02:00
|
|
|
};
|
2002-02-19 01:50:20 +01:00
|
|
|
|
2003-07-20 12:38:49 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
* intf_dialog_args_t: arguments structure passed to a dialogs provider.
|
|
|
|
*****************************************************************************
|
|
|
|
* This struct describes the arguments passed to the dialogs provider.
|
|
|
|
* For now they are only used with INTF_DIALOG_FILE_GENERIC.
|
|
|
|
*****************************************************************************/
|
|
|
|
struct intf_dialog_args_t
|
|
|
|
{
|
|
|
|
char *psz_title;
|
|
|
|
|
|
|
|
vlc_bool_t b_blocking;
|
|
|
|
vlc_bool_t b_ready;
|
|
|
|
vlc_mutex_t lock;
|
|
|
|
vlc_cond_t wait;
|
|
|
|
|
|
|
|
char **psz_results;
|
|
|
|
int i_results;
|
|
|
|
|
|
|
|
void (*pf_callback) ( intf_dialog_args_t * );
|
|
|
|
void *p_arg;
|
|
|
|
|
|
|
|
/* Specifically for INTF_DIALOG_FILE_GENERIC */
|
|
|
|
char *psz_extensions;
|
|
|
|
vlc_bool_t b_save;
|
|
|
|
vlc_bool_t b_multiple;
|
|
|
|
};
|
|
|
|
|
2000-02-13 05:31:35 +01:00
|
|
|
/*****************************************************************************
|
1999-08-08 14:42:54 +02:00
|
|
|
* Prototypes
|
2000-02-13 05:31:35 +01:00
|
|
|
*****************************************************************************/
|
2003-02-07 00:59:40 +01:00
|
|
|
#define intf_Create(a,b) __intf_Create(VLC_OBJECT(a),b)
|
2003-02-07 01:29:53 +01:00
|
|
|
VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char * ) );
|
Changes to the libvlc API:
* ./include/vlc/vlc.h: changed the naming conventions for libvlc. Now
exported functions start with VLC_ instead of vlc_ to avoid conflicts.
* ./include/vlc/vlc.h: removed the vlc_object_t, vlc_list_t, vlc_error_t
and vlc_t types; they are now internal types only.
* ./include/vlc/vlc.h: merged the reentrant and non-reentrant libvlc
calls. In non-reentrant mode, we just use 0 as the first argument. In
reentrant mode, we use an object's ID. (see below)
Internal changes:
* ./src/libvlc.c, ./src/misc/objects.c: instead of manipulating vlc_object_t
pointers, we manipulate their i_object_id. When needed, an object is
retrieved using vlc_object_get (I hope the lookup isn't too expensive,
that's why I designed the pp_objects layout to allow log2(n) seeks).
* ./src/misc/objects.c: activated the per-object variable storage. Unused
yet, unless you want to try "getfoo" and "setfoo blablah" in vlc -I rc.
* ./include/vlc_objects.h: moved the vlc_object_t and vlc_list_t definitions
here.
Misc:
* ./src/vlc.c, ./mozilla/vlcshell.cpp: removed inclusion of config.h in
code portions not part of libvlc; it was just required for the
COPYRIGHT_MESSAGE string which is now available from VLC_Version().
2002-10-12 00:32:56 +02:00
|
|
|
VLC_EXPORT( int, intf_RunThread, ( intf_thread_t * ) );
|
2002-07-17 23:54:37 +02:00
|
|
|
VLC_EXPORT( void, intf_StopThread, ( intf_thread_t * ) );
|
|
|
|
VLC_EXPORT( void, intf_Destroy, ( intf_thread_t * ) );
|
2000-01-11 00:36:06 +01:00
|
|
|
|
2003-09-18 19:54:02 +02:00
|
|
|
/*@}*/
|
|
|
|
|
2002-10-03 19:01:59 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
* Macros
|
|
|
|
*****************************************************************************/
|
2002-11-11 15:39:12 +01:00
|
|
|
#if defined( WIN32 ) && !defined( UNDER_CE )
|
2002-10-03 19:01:59 +02:00
|
|
|
# define CONSOLE_INTRO_MSG \
|
2002-10-04 14:01:40 +02:00
|
|
|
AllocConsole(); \
|
|
|
|
freopen( "CONOUT$", "w", stdout ); \
|
|
|
|
freopen( "CONOUT$", "w", stderr ); \
|
|
|
|
freopen( "CONIN$", "r", stdin ); \
|
Changes to the libvlc API:
* ./include/vlc/vlc.h: changed the naming conventions for libvlc. Now
exported functions start with VLC_ instead of vlc_ to avoid conflicts.
* ./include/vlc/vlc.h: removed the vlc_object_t, vlc_list_t, vlc_error_t
and vlc_t types; they are now internal types only.
* ./include/vlc/vlc.h: merged the reentrant and non-reentrant libvlc
calls. In non-reentrant mode, we just use 0 as the first argument. In
reentrant mode, we use an object's ID. (see below)
Internal changes:
* ./src/libvlc.c, ./src/misc/objects.c: instead of manipulating vlc_object_t
pointers, we manipulate their i_object_id. When needed, an object is
retrieved using vlc_object_get (I hope the lookup isn't too expensive,
that's why I designed the pp_objects layout to allow log2(n) seeks).
* ./src/misc/objects.c: activated the per-object variable storage. Unused
yet, unless you want to try "getfoo" and "setfoo blablah" in vlc -I rc.
* ./include/vlc_objects.h: moved the vlc_object_t and vlc_list_t definitions
here.
Misc:
* ./src/vlc.c, ./mozilla/vlcshell.cpp: removed inclusion of config.h in
code portions not part of libvlc; it was just required for the
COPYRIGHT_MESSAGE string which is now available from VLC_Version().
2002-10-12 00:32:56 +02:00
|
|
|
msg_Info( p_intf, COPYRIGHT_MESSAGE ); \
|
2002-10-04 14:01:40 +02:00
|
|
|
msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
|
|
|
|
"anymore, open a dos command box, go to the " \
|
|
|
|
"directory where you installed VLC and run " \
|
2003-06-22 17:43:54 +02:00
|
|
|
"\"vlc -I wxwin\"\n") )
|
2002-10-03 19:01:59 +02:00
|
|
|
#else
|
|
|
|
# define CONSOLE_INTRO_MSG
|
|
|
|
#endif
|
2003-07-17 19:30:40 +02:00
|
|
|
|
|
|
|
/* Interface dialog ids for dialog providers */
|
|
|
|
#define INTF_DIALOG_FILE_SIMPLE 1
|
|
|
|
#define INTF_DIALOG_FILE 2
|
|
|
|
#define INTF_DIALOG_DISC 3
|
|
|
|
#define INTF_DIALOG_NET 4
|
|
|
|
#define INTF_DIALOG_SAT 5
|
|
|
|
|
* src/playlist/* && Makefile.am
- splitted the enormous playlist.c file
- implemented a better item group system: groups have a name
and must be created before use by
playlist_CreateGroup( p_playlist, "newgroupname")
* modules/misc/sap.c
- Create our own playlist group ("SAP") and use it
* modules/access/slp.c
- Create our own playlist group ("SLP") and use it
* modules/demux/util/id3tag.c
- Trigger playlist update when we have parsed our tag
* modules/gui/wxwindows/interface.cpp
- Fixed the about box by using vlc_wraptext
- Added the simple open and the streaming wizard icons
*** Icons need to be changed ! ***
- Added the visualization to the extended gui
* modules/gui/wxwindows/preferences.cpp && include/vlc_help.h
- Enlarged the window to fit the wrapped text
- Added help for audio encoders
* modules/gui/wxwindows/stream.cpp & open.cpp & include/vlc_interface.h
- Created a "streaming wizard" window (3-step streaming)
* modules/gui/wxwindows/iteminfo.cpp:
- Group change is now based on the name
* modules/gui/wxwindows/playlist.cpp
- Added author and group columns to the listview
- Redesigned the window
- Added the Sort menu with several criteria (title, author, group)
- Added up/down buttons to move an item in the playlist
- Added the group menu to enable/disable a group in an understandable way
TODO:
-----
* playlist core :
- Implement advanced sort capabilities (multi-criteria)
- File format to save the new features
- export playlist (to M3U, eg)
- more robust group creation (duplicates check, ...)
* wxWindows playlist:
The idea of a treeview seems impossible, because of wxWindow's treeview,
that don't allow multi-selection, and, as far as I know, multi-columns.
- Provide a frontend to advanced sort (when it's done :-) )
- Allow moving items by drag & drop (well, if possible, haven't checked yet)
- Allow moving several items at once
- Customizable listview (ability to remove/move columns)
- Find a solution to the focus problem
(when you change track, the selected one scrolls at the
bottom of the visible screen)
* wxWindows interface:
- New icons, our icons begin to get old and not so pretty
- Find a solution for the volume bar (nobody understands what it is)
2003-10-29 18:32:55 +01:00
|
|
|
#define INTF_DIALOG_STREAM 8
|
|
|
|
|
2003-07-17 19:30:40 +02:00
|
|
|
#define INTF_DIALOG_PLAYLIST 10
|
|
|
|
#define INTF_DIALOG_MESSAGES 11
|
|
|
|
#define INTF_DIALOG_FILEINFO 12
|
|
|
|
#define INTF_DIALOG_PREFS 13
|
2003-07-17 20:58:23 +02:00
|
|
|
|
|
|
|
#define INTF_DIALOG_POPUPMENU 20
|
2003-07-20 12:38:49 +02:00
|
|
|
|
|
|
|
#define INTF_DIALOG_FILE_GENERIC 30
|
|
|
|
|
|
|
|
#define INTF_DIALOG_EXIT 99
|
2003-08-30 15:59:15 +02:00
|
|
|
|
|
|
|
/* Useful text messages shared by interfaces */
|
|
|
|
#define INTF_ABOUT_MSG \
|
|
|
|
_( "VLC is an open-source and cross-platform multimedia " \
|
|
|
|
"player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \
|
|
|
|
"DivX, mp3, Ogg, ...) as well as DVDs, VCDs, CD audio, and various " \
|
|
|
|
"streaming protocols.\n\n" \
|
|
|
|
"VLC is also a streaming server with transcoding capabilities " \
|
|
|
|
"(UDP unicast and multicast, HTTP, ...) mainly designed for " \
|
|
|
|
"high-bandwidth networks.\n\n"\
|
|
|
|
"For more information, have a look at the web site." )
|