Commit 2dab23fc authored by Michel Lespinasse's avatar Michel Lespinasse

Yop,

Bon ben voila, j'ai commence a bouger les .h comme je voulais le faire...

C'est encore un peu le bordel et j'en suis desole. Mais je compte bien
deplacer des trucs jusqu'a ce que ca soit a nouveau bien range :)
parent 66f08a82
......@@ -205,7 +205,6 @@ interface_obj = interface/main.o \
interface/intf_msg.o \
interface/intf_cmd.o \
interface/intf_ctrl.o \
interface/control.o \
interface/intf_console.o \
$(video:%=interface/intf_%.o)
......
/*****************************************************************************
* control.h: user control functions
* (c)1999 VideoLAN
*****************************************************************************
* 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.
*****************************************************************************
* Required headers:
* <sys/uio.h>
* <X11/Xlib.h>
* <X11/extensions/XShm.h>
* "config.h"
* "common.h"
* "mtime.h"
* "vlc_thread.h"
* "input.h"
* "video.h"
* "video_output.h"
* "xconsole.h"
* "interface.h"
*****************************************************************************/
/*****************************************************************************
* Prototypes
*****************************************************************************/
int intf_SelectAudioStream ( intf_thread_t *p_intf, int i_input, int i_id );
void intf_DeselectAudioStream( intf_thread_t *p_intf, int i_input, int i_id );
int intf_SelectVideoStream ( intf_thread_t *p_intf, int i_input,
int i_vout, int i_id );
void intf_DeselectVideoStream( intf_thread_t *p_intf, int i_input, int i_id );
/*****************************************************************************
* vlc.h: all headers
* (c)1998 VideoLAN
*****************************************************************************
* This header includes all vlc .h headers and depending headers. A source file
* including it would also be able to use any of the structures of the project.
* Note that functions or system headers specific to the file itself are not
* included.
*****************************************************************************
* required headers:
* none
*****************************************************************************/
/* System headers */
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <sys/shm.h>
#include <sys/soundcard.h>
#include <sys/uio.h>
#ifdef VIDEO_X11
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/XShm.h>
#include <X11/extensions/xf86dga.h>
#endif
/* Common headers */
#include "config.h"
#include "common.h"
#include "mtime.h"
#include "vlc_thread.h"
#include "netutils.h"
#include "debug.h"
#include "intf_msg.h"
/* Input */
#include "input.h"
#include "input_psi.h"
#include "input_pcr.h"
#include "input_netlist.h"
#include "input_vlan.h"
#include "decoder_fifo.h"
#include "input_file.h"
#include "input_network.h"
#include "input_ctrl.h"
/* Audio */
#include "audio_output.h"
#include "audio_decoder.h"
#include "ac3_decoder.h"
/* Subtitles */
#include "spu_decoder.h"
/* Video */
#include "video.h"
#include "video_output.h"
#ifdef OLD_DECODER
#include "video_decoder.h"
#else
#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "video_fifo.h"
#endif
/* Interface */
#include "intf_cmd.h"
#include "intf_ctrl.h"
#ifndef OLD_DECODER
#include "intf_sys.h"
#include "intf_console.h"
#endif
#include "interface.h"
#include "main.h"
......@@ -9,9 +9,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include "vlc.h"
/*
#include <errno.h>
#include <sys/uio.h>
#include <string.h>
......@@ -42,8 +39,18 @@
#include "video.h"
#include "video_output.h"
#include "vdec_idct.h"
#include "vdec_motion.h"
#include "video_decoder.h"
*/
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "ac3_decoder.h"
#include "spu_decoder.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
......
......@@ -10,9 +10,6 @@
* Preamble
*****************************************************************************/
#include "vlc.h"
#if 0
#include <errno.h>
#include <sys/uio.h> /* iovec */
#include <stdlib.h> /* atoi(), malloc(), free() */
......@@ -35,14 +32,20 @@
#include "decoder_fifo.h"
#include "audio_output.h"
#include "audio_dsp.h"
#include "audio_decoder.h"
#include "ac3_decoder.h"
#include "video.h"
#include "video_output.h"
#include "video_decoder.h"
#endif
#include "vdec_idct.h"
//#include "video_decoder.h"
#include "vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "spu_decoder.h"
/*****************************************************************************
* input_AddPgrmElem: Start the extraction and the decoding of a program element
......
......@@ -9,9 +9,6 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include "vlc.h"
/*
#include <errno.h>
#include <pthread.h>
#include <errno.h>
......@@ -37,10 +34,9 @@
#include "audio_output.h"
#include "video.h"
#include "video_output.h"
#include "xconsole.h"
#include "interface.h"
#include "pgm_data.h"*/
#include "main.h"
/*
* Precalculated 32-bits CRC table, shared by all instances of the PSI decoder
......
/*****************************************************************************
* control.c: user control functions
* (c)1999 VideoLAN
*****************************************************************************
* Library of functions common to all threads, allowing access to various
* structures and settings. Interfaces should only use those functions
* to read or write informations from other threads.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include "vlc.h"
......@@ -24,8 +24,26 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include "vlc.h"
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/uio.h>
/* Common headers */
#include "config.h"
#include "common.h"
#include "mtime.h"
#include "vlc_thread.h"
#include "debug.h"
#include "intf_msg.h"
#include "input.h"
#include "audio_output.h"
#include "intf_cmd.h"
#include "interface.h"
#include "main.h"
/*
* Local prototypes
......
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