diff options
| -rw-r--r-- | edl.c | 3 | ||||
| -rw-r--r-- | edl.h | 4 | ||||
| -rw-r--r-- | libmpdemux/tv.c | 3 | ||||
| -rw-r--r-- | libmpdemux/tv.h | 6 | ||||
| -rw-r--r-- | libmpdvdkit2/dvd_input.c | 6 | ||||
| -rw-r--r-- | libmpdvdkit2/dvd_input.h | 12 |
6 files changed, 23 insertions, 11 deletions
@@ -5,6 +5,9 @@ #include "edl.h" #include "help_mp.h" +char *edl_filename; // file to extract EDL entries from (-edl) +char *edl_output_filename; // file to put EDL entries in (-edlout) + #ifdef USE_EDL /** @@ -23,8 +23,8 @@ struct edl_record { typedef struct edl_record* edl_record_ptr; -char *edl_filename; // file to extract EDL entries from (-edl) -char *edl_output_filename; // file to put EDL entries in (-edlout) +extern char *edl_filename; // file to extract EDL entries from (-edl) +extern char *edl_output_filename; // file to put EDL entries in (-edlout) int edl_check_mode(void); // we cannot do -edl and -edlout at the same time int edl_count_entries(void); // returns total number of entries needed diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 13fdb269e1..d12a317987 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -78,6 +78,9 @@ int tv_param_brightness = 0; int tv_param_contrast = 0; int tv_param_hue = 0; int tv_param_saturation = 0; +tv_channels_t *tv_channel_list; +tv_channels_t *tv_channel_current, *tv_channel_last; +char *tv_channel_last_real; /* ================== DEMUX_TV ===================== */ /* diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h index c0ac37cce6..df57161ade 100644 --- a/libmpdemux/tv.h +++ b/libmpdemux/tv.h @@ -95,9 +95,9 @@ typedef struct tv_channels_s { struct tv_channels_s *prev; } tv_channels_t; -tv_channels_t *tv_channel_list; -tv_channels_t *tv_channel_current, *tv_channel_last; -char *tv_channel_last_real; +extern tv_channels_t *tv_channel_list; +extern tv_channels_t *tv_channel_current, *tv_channel_last; +extern char *tv_channel_last_real; #define TVI_CONTROL_FALSE 0 #define TVI_CONTROL_TRUE 1 diff --git a/libmpdvdkit2/dvd_input.c b/libmpdvdkit2/dvd_input.c index 0709c71540..713ba98772 100644 --- a/libmpdvdkit2/dvd_input.c +++ b/libmpdvdkit2/dvd_input.c @@ -34,6 +34,12 @@ int (*DVDcss_title) (dvdcss_handle, int); int (*DVDcss_read) (dvdcss_handle, void *, int, int); char * (*DVDcss_error) (dvdcss_handle); +dvd_input_t (*DVDinput_open) (const char *); +int (*DVDinput_close) (dvd_input_t); +int (*DVDinput_seek) (dvd_input_t, int, int); +int (*DVDinput_title) (dvd_input_t, int); +int (*DVDinput_read) (dvd_input_t, void *, int, int); +char * (*DVDinput_error) (dvd_input_t); /* The DVDinput handle, add stuff here for new input methods. */ struct dvd_input_s { diff --git a/libmpdvdkit2/dvd_input.h b/libmpdvdkit2/dvd_input.h index 638d60aebf..8d95681956 100644 --- a/libmpdvdkit2/dvd_input.h +++ b/libmpdvdkit2/dvd_input.h @@ -36,12 +36,12 @@ typedef struct dvd_input_s *dvd_input_t; /** * Pointers which will be filled either the input meathods functions. */ -dvd_input_t (*DVDinput_open) (const char *); -int (*DVDinput_close) (dvd_input_t); -int (*DVDinput_seek) (dvd_input_t, int, int); -int (*DVDinput_title) (dvd_input_t, int); -int (*DVDinput_read) (dvd_input_t, void *, int, int); -char * (*DVDinput_error) (dvd_input_t); +extern dvd_input_t (*DVDinput_open) (const char *); +extern int (*DVDinput_close) (dvd_input_t); +extern int (*DVDinput_seek) (dvd_input_t, int, int); +extern int (*DVDinput_title) (dvd_input_t, int); +extern int (*DVDinput_read) (dvd_input_t, void *, int, int); +extern char * (*DVDinput_error) (dvd_input_t); /** * Setup function accessed by dvd_reader.c. Returns 1 if there is CSS support. |