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 :)

diff --git a/Makefile b/Makefile
index 848a99bef1570ac2008bbccf76fab7cb8f74fe05..f4ff9066117a013419aba337ed2aaa9bbad27646 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)
 

diff --git a/include/control.h b/include/control.h
deleted file mode 100644 (file)
index def1740..0000000
--- a/include/control.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * 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 );
-
-
-

diff --git a/include/vlc.h b/include/vlc.h
deleted file mode 100644 (file)
index a25e013..0000000
--- a/include/vlc.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************
- * 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"
-
-

diff --git a/include/ac3_bit_allocate.h b/src/ac3_decoder/ac3_bit_allocate.h
similarity index 100%
rename from include/ac3_bit_allocate.h
rename to src/ac3_decoder/ac3_bit_allocate.h

diff --git a/include/ac3_downmix.h b/src/ac3_decoder/ac3_downmix.h
similarity index 100%
rename from include/ac3_downmix.h
rename to src/ac3_decoder/ac3_downmix.h

diff --git a/include/ac3_exponent.h b/src/ac3_decoder/ac3_exponent.h
similarity index 100%
rename from include/ac3_exponent.h
rename to src/ac3_decoder/ac3_exponent.h

diff --git a/include/ac3_imdct.h b/src/ac3_decoder/ac3_imdct.h
similarity index 100%
rename from include/ac3_imdct.h
rename to src/ac3_decoder/ac3_imdct.h

diff --git a/include/ac3_mantissa.h b/src/ac3_decoder/ac3_mantissa.h
similarity index 100%
rename from include/ac3_mantissa.h
rename to src/ac3_decoder/ac3_mantissa.h

diff --git a/include/ac3_parse.h b/src/ac3_decoder/ac3_parse.h
similarity index 100%
rename from include/ac3_parse.h
rename to src/ac3_decoder/ac3_parse.h

diff --git a/include/ac3_rematrix.h b/src/ac3_decoder/ac3_rematrix.h
similarity index 100%
rename from include/ac3_rematrix.h
rename to src/ac3_decoder/ac3_rematrix.h

diff --git a/include/audio_constants.h b/src/audio_decoder/audio_constants.h
similarity index 100%
rename from include/audio_constants.h
rename to src/audio_decoder/audio_constants.h

diff --git a/include/audio_math.h b/src/audio_decoder/audio_math.h
similarity index 100%
rename from include/audio_math.h
rename to src/audio_decoder/audio_math.h

diff --git a/include/audio_sys.h b/src/audio_output/audio_sys.h
similarity index 100%
rename from include/audio_sys.h
rename to src/audio_output/audio_sys.h

diff --git a/include/generic_decoder.h b/src/generic_decoder/generic_decoder.h
similarity index 100%
rename from include/generic_decoder.h
rename to src/generic_decoder/generic_decoder.h

diff --git a/src/input/input.c b/src/input/input.c
index 615bbc4f960769435a7e92fd0661577f6054cc9d..a30b51e707fca682ad9feef13d2786c0439d92a8 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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

diff --git a/src/input/input_ctrl.c b/src/input/input_ctrl.c
index 048c34d28001b8ce7434e6c7f152429fda7f085c..b80179c123fe1f5a868fe6e748d24ae3d7c9aad1 100644 (file)
--- a/src/input/input_ctrl.c
+++ b/src/input/input_ctrl.c
@@ -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

diff --git a/include/input_ctrl.h b/src/input/input_ctrl.h
similarity index 100%
rename from include/input_ctrl.h
rename to src/input/input_ctrl.h

diff --git a/include/input_file.h b/src/input/input_file.h
similarity index 100%
rename from include/input_file.h
rename to src/input/input_file.h

diff --git a/include/input_network.h b/src/input/input_network.h
similarity index 100%
rename from include/input_network.h
rename to src/input/input_network.h

diff --git a/include/input_pcr.h b/src/input/input_pcr.h
similarity index 100%
rename from include/input_pcr.h
rename to src/input/input_pcr.h

diff --git a/src/input/input_psi.c b/src/input/input_psi.c
index 8c3170574f1baf03ee9e83c9ac6158ee0677fc8b..b0bb28f68ddde27f41352bb0955c62856df1b3cd 100644 (file)
--- a/src/input/input_psi.c
+++ b/src/input/input_psi.c
@@ -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

diff --git a/include/input_psi.h b/src/input/input_psi.h
similarity index 100%
rename from include/input_psi.h
rename to src/input/input_psi.h

diff --git a/src/interface/control.c b/src/interface/control.c
deleted file mode 100644 (file)
index 0c0bf64..0000000
--- a/src/interface/control.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*****************************************************************************
- * 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"
-

diff --git a/include/intf_cmd.h b/src/interface/intf_cmd.h
similarity index 100%
rename from include/intf_cmd.h
rename to src/interface/intf_cmd.h

diff --git a/include/intf_console.h b/src/interface/intf_console.h
similarity index 100%
rename from include/intf_console.h
rename to src/interface/intf_console.h

diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c
index f8dfa96b11c00e9ca6197a864406b5452bdd84dd..fff65dfd1f4d90c5a89453d5d5802390cd0f4ac4 100644 (file)
--- a/src/interface/intf_ctrl.c
+++ b/src/interface/intf_ctrl.c
@@ -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

diff --git a/include/intf_ctrl.h b/src/interface/intf_ctrl.h
similarity index 100%
rename from include/intf_ctrl.h
rename to src/interface/intf_ctrl.h

diff --git a/include/intf_sys.h b/src/interface/intf_sys.h
similarity index 100%
rename from include/intf_sys.h
rename to src/interface/intf_sys.h

diff --git a/include/video_sys.h b/src/video_output/video_sys.h
similarity index 100%
rename from include/video_sys.h
rename to src/video_output/video_sys.h

diff --git a/include/video_text.h b/src/video_output/video_text.h
similarity index 100%
rename from include/video_text.h
rename to src/video_output/video_text.h

diff --git a/include/video_x11.h b/src/video_output/video_x11.h
similarity index 100%
rename from include/video_x11.h
rename to src/video_output/video_x11.h

diff --git a/include/video_yuv.h b/src/video_output/video_yuv.h
similarity index 100%
rename from include/video_yuv.h
rename to src/video_output/video_yuv.h