diff --git a/veejay-current/veejay/vj-el.h b/veejay-current/veejay/vj-el.h deleted file mode 100644 index 28f033a1..00000000 --- a/veejay-current/veejay/vj-el.h +++ /dev/null @@ -1,97 +0,0 @@ -/* veejay - Linux VeeJay - * (C) 2002-2004 Niels Elburg - * - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#ifndef VJ_MLT_EL_H -#define VJ_MLT_EL_H -#include -#include -#include -#include -#include - -#define N_EL_FRAME(x) ( (x)&0xfffffffffffffLLU ) -#define N_EL_FILE(x) (int) ( ((x)>>52)&0xfff ) -/* ((file)&0xfff<<52) */ -#define EL_ENTRY(file,frame) ( ((file)<<52) | ((frame)& 0xfffffffffffffLLU) ) - - - -typedef struct -{ - int has_video; - int video_width; - int video_height; - int video_inter; - float video_fps; - int video_sar_width; - int video_sar_height; - char video_norm; - - int has_audio; - long audio_rate; - int audio_chans; - int audio_bits; - int audio_bps; - int play_rate; - - long video_frames; - - long num_video_files; - - long max_frame_size; - int MJPG_chroma; - - char *(video_file_list[MAX_EDIT_LIST_FILES]); - lav_file_t *(lav_fd[MAX_EDIT_LIST_FILES]); - long num_frames[MAX_EDIT_LIST_FILES]; - uint64_t *frame_list; - - int last_afile; - long last_apos; - int auto_deinter; - - int pixel_format; - -} editlist; - - -editlist *vj_el_init_with_args(char **filenames, int n, int flags, int deinter, int force); - -editlist *vj_el_probe_from_file( char *filename ); - -void vj_el_free(editlist *el); - -int vj_el_get_audio_frame_at(editlist *el, uint32_t nframe, uint8_t *dst, int speed ); - -int vj_el_append_video_file(editlist *el, char *filename); - -int vj_el_write_editlist( char *filename, long start, long end, editlist *el ); - -int vj_el_get_video_frame(editlist *el, long nframe, uint8_t *dst[3], int pix_fmt); - -int vj_el_get_audio_frame(editlist *el, uint32_t nframe, uint8_t *dst); - -void vj_el_print(editlist *el); - -int vj_el_init_420_frame(editlist *el, VJFrame *frame); -int vj_el_init_422_frame(editlist *el, VJFrame *frame); - - -editlist *vj_el_dummy(int flags, int deinterlace, int chroma, char norm, int width, int height, float fps); - -#endif diff --git a/veejay-current/veejay/vj-jack.h b/veejay-current/veejay/vj-jack.h index 1c0ebcc6..870804a6 100644 --- a/veejay-current/veejay/vj-jack.h +++ b/veejay-current/veejay/vj-jack.h @@ -21,7 +21,7 @@ #include #ifdef HAVE_JACK -#include +#include int vj_jack_init(editlist *el); diff --git a/veejay-current/veejay/vj-pjack.c b/veejay-current/veejay/vj-pjack.c index 4848451c..f9c01400 100644 --- a/veejay-current/veejay/vj-pjack.c +++ b/veejay-current/veejay/vj-pjack.c @@ -22,7 +22,7 @@ #ifdef HAVE_JACK #include -#include +#include static int driver = 0; static int bits_per_sample = 0; static unsigned long audio_rate = 0;