Removed unused files.

Makefile

@@ -36,11 +36,8 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
 INTERFACE =	src/interface/main.o \
 		src/interface/interface.o \
 		src/interface/intf_msg.o \
-		src/interface/intf_cmd.o \
-		src/interface/intf_ctrl.o \
 		src/interface/intf_playlist.o \
 		src/interface/intf_channels.o \
-		src/interface/intf_console.o \
 		src/interface/intf_urldecode.o \
 
 INPUT =		src/input/input_ext-dec.o \
@@ -102,7 +99,6 @@ VIDEO_DECODER =	src/video_decoder/video_decoder.o
 
 MISC =		src/misc/mtime.o \
 		src/misc/tests.o \
-		src/misc/rsc_files.o \
 		src/misc/modules.o \
 		src/misc/netutils.o
 

doc/todo

--------------------------------------------------------------------------------
-* marque les points prioritaires
-+ les points à ne pas oublier avant la fin de l'année
-- les trucs qu'il faudra faire, mais qui ne sont pas urgents
-? les idées à discuter
--------------------------------------------------------------------------------
-
-Input
-=====
-    ? utilisation de la NAT pour convoyer des infos sur les vlans
-    * gestion du décodeur générique/par défaut
-    - passage en b_run    
-    + trouver des flux de test bien tordus pour tester l'update des
-      PSI, les discontinuites, la gestion des PCR, etc...
-
-Input: vlan method
-==================
-    + faire une libvlan rapide (benny est dessus)
-    - reconcevoir l'API et les dialogues du vlan serveur, faire une
-      libvlan avancée, l'encapsuler proprement dans input_vlan, refaire
-      le vlan server
-
-Main
-====
-    - lire un fichier de config en plus de la ligne de commande
-
-Audio output
-============
-    - détection automatique du materiel ;
-    - 8/16 Bits, Signed/Unsigned, Mono/Stereo (sauf 16 Bits Signed Stereo) ;
-
-Audio decoder
-=============
-    + implémenter une synkronisation absolue et non relative ;
-    - MPEG2 Layer I, II, III (sauf Layer II Stereo) ;
-
-AC3 decoder
-===========
-    * éviter le SIGSEGV lorsque le décodeur mange du garbage en entrée ;
-    + implémenter une synkronisation absolue et non relative ;
-
-Video output
-============
-    + nettoyer la boucle principale
-        + tenir compte du fait que lorsque b_die est mis, normalement tous
-          les flux et images doivent déjà être detruits -> afficher une
-          erreur plutôt que de les supprimer
-        + gestion de b_active
-        + arbre de décisions avec goto pour les passes
-    * convertion et affichage des images
-    * gestion des couleurs X11
-    ? interpolation pour des display ratios < 1
-    ? utiliser XDGA pour accelerer 
-
-Video graphics
-==============
-    + tout reste à implementer
-    + rajouter les convertions rgb->pixel
-
-Video decoder
-=============
-    * tout tout tout
-    + sur p_vout->b_active == 0, trasher tout sauf I
-    * parser/trasher de PES
-
-Generic decoder
-===============
-    * identification des paquets
-    * sauvegarde d'un flux multiplexé
-    * sauvegarde de flux demultiplexés
-    
-Interface
-=========
-    - incrustation d'infos sur les buffers
-    + réagir aux signaux
-
-Interface: commandes
-====================
-    - Plein de commandes à implémenter
-
-Interface: console
-==================
-    - Utiliser un widget quelconque (portable de préférence) et renommer
-      en intf_console si la portabilité est atteinte (sinon, x11console).
-    - Utilisation des pixmaps pour egayer un peu en début de ligne
-    - Gestion des fontes et couleurs
-    - Choix d'une couleur de bg en l'absende de pixmap
-    - Ascenceur pour la zone de texte
-    - Unicité des enregistrements de l'history - sauvegarde de l'history
-    - Gestion de la souris (copier/coller)
-
-General: sources
-================
-    + déclarer en extern inline les fonctions de mtime et netlist...
-    - Eliminer les headers superflus des sources, bien indiquer les dépendances
-    - conserver la cohérence des sources: input_psi plutot que psi par exemple.
-    + vérifier que des messages sont bien émis partout (faire une recherche sur
-      les 'returns'... En particulier dans video_output).
-
-General: processus
-==================
-    * définir l'ordre de fermeture et les accès
-    - identifier les threads (pour ps)
-    ? penser au mode mono-thread
-    + utiliser les messages b_die, b_error, b_active et b_run
-
-General: X11
-============
-    - detection de fermeture des fenêtres
-    - déclaration des icones pour les window managers
-    - implémentation de X{En|Dis}ableScreenSaver dans xutils
-
-Documentation
-=============
-    - documentation des interfaces de programmation dès qu'elles sont
-      au point. En LaTeX ? (pour latex2html).

include/intf_msg.h

@@ -4,7 +4,7 @@
  * interface, such as message output. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_msg.h,v 1.12 2001/04/27 19:29:11 massiot Exp $
+ * $Id: intf_msg.h,v 1.13 2001/04/30 15:00:59 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -81,7 +81,6 @@ void         intf_MsgDestroy     ( void );
 void         intf_Msg            ( char *psz_format, ... );
 void         intf_ErrMsg         ( char *psz_format, ... );
 void         intf_WarnMsg        ( int i_level, char *psz_format, ... );
-void         intf_IntfMsg        ( char *psz_format, ... );
 
 void         intf_MsgImm         ( char *psz_format, ... );
 void         intf_ErrMsgImm      ( char *psz_format, ... );

include/rsc_files.h

-/*****************************************************************************
- * rsc_files.h: resources files manipulation functions
- * This library describes a general format used to store 'resources'. Resources
- * can be anything, including pictures, audio streams, and so on.
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: rsc_files.h,v 1.7 2001/03/21 13:42:33 sam Exp $
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Requires:
- *  config.h
- *  common.h
- *****************************************************************************/
-
-/*****************************************************************************
- * Constants
- *****************************************************************************/
-
-/* Maximum length of a resource name (not including the final '\0') - this
- * constant should not be changed without extreme care */
-#define RESOURCE_MAX_NAME   32
-
-/*****************************************************************************
- * resource_descriptor_t: resource descriptor
- *****************************************************************************
- * This type describe an entry in the resource table.
- *****************************************************************************/
-typedef struct
-{
-    char    psz_name[RESOURCE_MAX_NAME + 1];                         /* name */
-    u16     i_type;                                                  /* type */
-    u64     i_offset;                                         /* data offset */
-    u64     i_size;                                             /* data size */
-} resource_descriptor_t;
-
-/* Resources types */
-#define EMPTY_RESOURCE      0                        /* empty place in table */
-#define PICTURE_RESOURCE    10                       /* native video picture */
-
-/*****************************************************************************
- * resource_file_t: resource file descriptor
- *****************************************************************************
- * This type describes a resource file and store it's resources table. It can
- * be used through the *Resource functions, or directly with the i_file field.
- *****************************************************************************/
-typedef struct
-{
-    /* File informations */
-    int                     i_file;                       /* file descriptor */
-    int                     i_type;                             /* file type */
-    boolean_t               b_up_to_date;            /* is file up to date ? */
-    boolean_t               b_read_only;                   /* read-only mode */
-
-    /* Resources table */
-    int                     i_size;                            /* table size */
-    resource_descriptor_t * p_resource;                   /* resources table */
-} resource_file_t;
-
-/* Resources files types */
-#define VLC_RESOURCE_FILE   0               /* VideoLAN Client resource file */
-
-/*****************************************************************************
- * Prototypes
- *****************************************************************************/
-resource_file_t *   CreateResourceFile  ( char *psz_filename, int i_type, int i_size, int i_mode );
-resource_file_t *   OpenResourceFile    ( char *psz_filename, int i_type, int i_flags );
-int                 UpdateResourceFile  ( resource_file_t *p_file );
-int                 CloseResourceFile   ( resource_file_t *p_file );
-
-int                 SeekResource        ( resource_file_t *p_file, char *psz_name, int i_type );
-int                 ReadResource        ( resource_file_t *p_file, char *psz_name, int i_type,
-                                          size_t max_size, byte_t *p_data );
-int                 vlc_WriteResource       ( resource_file_t *p_file, char *psz_name, int i_type,
-                                              size_t size, byte_t *p_data );
-

src/interface/interface.c

@@ -4,7 +4,7 @@
  * interface, such as command line.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: interface.c,v 1.73 2001/04/28 03:36:25 sam Exp $
+ * $Id: interface.c,v 1.74 2001/04/30 15:00:59 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -47,7 +47,6 @@
 
 #include "intf_msg.h"
 #include "interface.h"
-#include "intf_cmd.h"
 #include "intf_playlist.h"
 #include "intf_channels.h"
 #include "keystrokes.h"

src/interface/intf_cmd.h

-/*****************************************************************************
- * intf_cmd.h: interface commands parsing and executions functions
- * This file implements the interface commands execution functions. It is used
- * by command-line oriented interfaces and scripts. The commands themselves are
- * implemented in intf_ctrl.
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_cmd.h,v 1.4 2001/03/21 13:42:34 sam Exp $
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * 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:
- *  none
- *****************************************************************************/
-
-/*****************************************************************************
- * intf_arg_t: control fonction argument descriptor
- *****************************************************************************
- * This structure is used to control an argument type and to transmit
- * arguments to control functions. It is also used to parse format string and
- * build an easier to use array of arguments.
- *****************************************************************************/
-typedef struct
-{
-    /* Argument type */
-    int         i_flags;                          /* argument type and flags */
-    int         i_index;                   /* index of mask in format string */
-
-    /* Converted arguments value */
-    char *      psz_str;                                     /* string value */
-    char *      ps_name;              /* name, can be '\0' or '=' terminated */
-    long        i_num;                                      /* integer value */
-    float       f_num;                                        /* float value */
-} intf_arg_t;
-
-/* Arguments flags */
-#define INTF_STR_ARG            1                         /* string argument */
-#define INTF_INT_ARG            2                        /* integer argument */
-#define INTF_FLOAT_ARG          4                          /* float argument */
-#define INTF_NAMED_ARG          16                         /* named argument */
-#define INTF_OPT_ARG            256                    /* optionnal argument */
-#define INTF_REP_ARG            512              /* argument can be repeated */
-#define INTF_PRESENT_ARG        1024        /* argument has been encountered */
-
-/*****************************************************************************
- * intf_command_t: control command descriptor
- *****************************************************************************
- * This structure describes a control commands. It stores informations needed
- * for argument type checking, command execution but also a short inline help.
- * See control.c for more informations about fields.
- *****************************************************************************/
-typedef struct
-{
-    /* Function control */
-    char *          psz_name;                                /* command name */
-    int (* function)( int i_argc, intf_arg_t *p_argv );          /* function */
-    char *          psz_format;                          /* arguments format */
-
-    /* Function informations */
-    char *          psz_summary;                                /* info text */
-    char *          psz_usage;                                 /* usage text */
-    char *          psz_help;                                   /* help text */
-} intf_command_t;
-
-/*****************************************************************************
- * Error constants
- *****************************************************************************
- * These errors should be used as return values for control functions (see
- * control.c). The intf_ExecCommand function as different behaviour depending
- * of the error it received. Other errors numbers can be used, but their valued
- * should be positive to avoid conflict with future error codes.
- *****************************************************************************/
-
-#define INTF_NO_ERROR       0                                     /* success */
-#define INTF_FATAL_ERROR    -1          /* fatal error: the program will end */
-#define INTF_CRITICAL_ERROR -2      /* critical error: the program will exit */
-#define INTF_USAGE_ERROR    -3 /* usage error: command usage will be displayed */
-#define INTF_OTHER_ERROR    -4/* other error: command prints its own message */
-
-/*****************************************************************************
- * Prototypes
- *****************************************************************************/
-int intf_ExecCommand    ( char *psz_cmd );
-int intf_ExecScript     ( char *psz_filename );

src/interface/intf_console.c

-/*****************************************************************************
- * intf_console.c: generic console for interface
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: intf_console.c,v 1.7 2001/03/21 13:42:34 sam Exp $
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#include "defs.h"
-
-#include <stdlib.h>                                              /* malloc() */
-
-#include "config.h"
-
-/*****************************************************************************
- * intf_console_t: console descriptor
- *****************************************************************************
- * Generic console object. This object will have a representation depending of
- * the interface.
- *****************************************************************************/
-typedef struct intf_console_s
-{
-    /* Text and history arrays - last line/command has indice 0 */
-    char *                  psz_text[INTF_CONSOLE_MAX_TEXT];
-    char *                  psz_history[INTF_CONSOLE_MAX_HISTORY];
-} intf_console_t;
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-
-/*****************************************************************************
- * intf_ConsoleCreate: create console
- *****************************************************************************
- * This function will initialize the console object.
- * It returns NULL on error.
- *****************************************************************************/
-intf_console_t *intf_ConsoleCreate( void )
-{
-    intf_console_t *p_console;
-
-    p_console = malloc( sizeof( intf_console_t ) );
-    return( p_console );
-}
-
-/*****************************************************************************
- * intf_ConsoleDestroy
- *****************************************************************************
- * Destroy the console instance initialized by intf_ConsoleCreate.
- *****************************************************************************/
-void intf_ConsoleDestroy( intf_console_t *p_console )
-{
-    free( p_console );
-}
-
-/*****************************************************************************
- * intf_ConsoleClear: clear console
- *****************************************************************************
- * Empty all text.
- *****************************************************************************/
-void intf_ConsoleClear( intf_console_t *p_console )
-{
-    /* XXX?? */
-}
-
-/*****************************************************************************
- * intf_ConsolePrint: print a message to console
- *****************************************************************************
- * Print a message to the console.
- *****************************************************************************/
-void intf_ConsolePrint( intf_console_t *p_console, char *psz_str )
-{
-    /* XXX?? */
-}
-
-
-/*****************************************************************************
- * intf_ConsoleExec: execute a command in console
- *****************************************************************************
- * This function will run a command and print its result in console.
- *****************************************************************************/
-void intf_ConsoleExec( intf_console_t *p_console, char *psz_str )
-{
-    /* XXX?? */
-}
-
-/* following functions are local */

src/interface/intf_console.h

-/*****************************************************************************
- * intf_console.h: generic console methods for interface
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: intf_console.h,v 1.4 2001/03/21 13:42:34 sam Exp $
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Prototypes
- *****************************************************************************/
-p_intf_console_t  intf_ConsoleCreate    ( void );
-void              intf_ConsoleDestroy   ( p_intf_console_t p_console );
-
-void              intf_ConsoleClear     ( p_intf_console_t p_console );
-void              intf_ConsolePrint     ( p_intf_console_t p_console, char *psz_str );
-void              intf_ConsoleExec      ( p_intf_console_t p_console, char *psz_str );
-
-

src/interface/intf_ctrl.h

-/*****************************************************************************
- * intf_ctrl.h: interface commands access to control functions
- * Library of functions common to all interfaces, allowing access to various
- * structures and settings. Interfaces should only use those functions
- * to read or write informations from other threads.
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_ctrl.h,v 1.4 2001/03/21 13:42:34 sam Exp $
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * 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:
- *  none
- *****************************************************************************/
-
-/*****************************************************************************
- * Extern variables
- *****************************************************************************/
-extern const intf_command_t control_command[];
-

src/interface/intf_msg.c

@@ -4,7 +4,7 @@
  * interface, such as message output. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: intf_msg.c,v 1.32 2001/04/28 03:36:25 sam Exp $
+ * $Id: intf_msg.c,v 1.33 2001/04/30 15:01:00 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -43,7 +43,6 @@
 
 #include "intf_msg.h"
 #include "interface.h"
-#include "intf_console.h"
 
 #include "main.h"
 
@@ -76,7 +75,6 @@ typedef struct
 /* Message types */
 #define INTF_MSG_STD    0                                /* standard message */
 #define INTF_MSG_ERR    1                                   /* error message */
-#define INTF_MSG_INTF   2                               /* interface message */
 #define INTF_MSG_DBG    3                                   /* debug message */
 #define INTF_MSG_WARN   4                                  /* warning message*/
 
@@ -238,26 +236,6 @@ void intf_WarnMsg( int i_level, char *psz_format, ... )
 }
 
 
-/*****************************************************************************
- * intf_IntfMsg : print an interface message                             (ok ?)
- *****************************************************************************
- * In opposition to all other intf_*Msg function, this function does not print
- * it's message on default terminal (stdout or stderr), but send it to
- * interface (in fact to the X11 console). This means that the interface MUST
- * be initialized and a X11 console openned before this function is used, and
- * that once the console is closed, this call is vorbidden.
- * Practically, only the interface thread itself should call this function, and
- * flush all messages before intf_CloseX11Console() is called.
- *****************************************************************************/
-void intf_IntfMsg(char *psz_format, ...)
-{
-    va_list ap;
-
-    va_start( ap, psz_format );
-    QueueMsg( p_main->p_msg, INTF_MSG_INTF, psz_format, ap );
-    va_end( ap );
-}
-
 /*****************************************************************************
  * _intf_DbgMsg: print a debugging message                               (ok ?)
  *****************************************************************************
@@ -608,10 +586,6 @@ static void PrintMsg( intf_msg_item_t *p_msg )
 
         break;
         
-    case INTF_MSG_INTF:                                /* interface messages */
-        snprintf( psz_msg, i_msg_len, "%s", p_msg->psz_msg );
-        break;
-
     case INTF_MSG_DBG:                                     /* debug messages */
         mstrtime( psz_date, p_msg->date );
         snprintf( psz_msg, i_msg_len, "(%s) " INTF_MSG_DBG_FORMAT "%s",
@@ -635,9 +609,6 @@ static void PrintMsg( intf_msg_item_t *p_msg )
 #endif
         fprintf( stderr, "%s\n", psz_msg );
         break;
-    case INTF_MSG_INTF:                                /* interface messages */
-        intf_ConsolePrint( p_main->p_intf->p_console, psz_msg );
-        break;
     }
 
 #ifdef TRACE_LOG
@@ -670,9 +641,6 @@ static void PrintMsg( intf_msg_item_t *p_msg )
     case INTF_MSG_WARN:
         fprintf( stderr, "%s\n", p_msg->psz_msg );        /* warning message */
         break;
-    case INTF_MSG_INTF:                                /* interface messages */
-        intf_ConsolePrint( p_main->p_intf->p_console, p_msg->psz_msg );
-        break;
     }
 }