11 files changed, 40 insertions, 28 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 59a0fda71..ca091958a 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.31 2003/08/10 16:11:05 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -355,13 +355,13 @@ static void print_cdrom_toc(cdrom_toc *toc) {
 	}	
 }
 
-void init_cdrom_toc(cdrom_toc *toc) {
+static void init_cdrom_toc(cdrom_toc *toc) {
 
   toc->first_track = toc->last_track = toc->total_tracks = 0;
   toc->toc_entries = NULL;
 }
 
-void free_cdrom_toc(cdrom_toc *toc) {
+static void free_cdrom_toc(cdrom_toc *toc) {
 
   if(toc && toc->toc_entries)
     free(toc->toc_entries);
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 9fe9805dd..cdb250e2a 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_dvd.c,v 1.167 2003/08/21 00:37:26 miguelfreitas Exp $
+ * $Id: input_dvd.c,v 1.168 2003/08/25 21:51:39 f1rmb Exp $
  *
  */
 
@@ -353,7 +353,7 @@ static void send_mouse_enter_leave_event(dvd_input_plugin_t *this, int direction
     this->mouse_buttonN = -1;
 }
  
-void update_title_display(dvd_input_plugin_t *this) {
+static void update_title_display(dvd_input_plugin_t *this) {
   xine_event_t uevent;
   xine_ui_data_t data;
   int tt=-1, pr=-1;
@@ -1611,7 +1611,7 @@ static char **dvd_class_get_autoplay_list (input_class_t *this_gen,
   return this->filelist2;
 }
 
-void dvd_class_dispose(input_class_t *this_gen) {
+static void dvd_class_dispose(input_class_t *this_gen) {
   dvd_input_class_t *this = (dvd_input_class_t*)this_gen;
   
   free(this->mrls); this->mrls = NULL;
@@ -1736,6 +1736,9 @@ static void *init_class (xine_t *xine, void *data) {
 
 /*
  * $Log: input_dvd.c,v $
+ * Revision 1.168  2003/08/25 21:51:39  f1rmb
+ * Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).
+ *
  * Revision 1.167  2003/08/21 00:37:26  miguelfreitas
  * RIP Input Plugin
  *
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index d96c7f485..65de4fe41 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -702,7 +702,7 @@ static int search_by_channel(v4l_input_plugin_t *this, char *input_source)
    return 1;   
 }
 
-int open_radio_capture_device(v4l_input_plugin_t *this)
+static int open_radio_capture_device(v4l_input_plugin_t *this)
 {
    int tuner_found = 0;
    int i = 0;
@@ -776,7 +776,7 @@ int open_radio_capture_device(v4l_input_plugin_t *this)
       return 2;
 }
 
-int close_radio_capture_device(v4l_input_plugin_t *this)
+static int close_radio_capture_device(v4l_input_plugin_t *this)
 {
    if (this->radio_fd > 0)
       close(this->radio_fd);
@@ -796,7 +796,7 @@ int close_radio_capture_device(v4l_input_plugin_t *this)
  * which the signal should be grabbed.
  * @return 1 on success, 0 on failure.
  */
-int open_video_capture_device(v4l_input_plugin_t *this)
+static int open_video_capture_device(v4l_input_plugin_t *this)
 {
    int i, j, ret, found = 0;
    int tuner_found = 0;
@@ -1042,7 +1042,7 @@ int open_video_capture_device(v4l_input_plugin_t *this)
  * This function opens an alsa capture device. This will be used to capture
  * audio data from.
  */
-int open_audio_capture_device(v4l_input_plugin_t *this)
+static int open_audio_capture_device(v4l_input_plugin_t *this)
 {
 #ifdef HAVE_ALSA
    DBGPRINT("Audio    Opening PCM Device\n");
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index 7268bd79e..44b3b24e2 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: decoder.c,v 1.11 2003/05/16 09:56:50 mroi Exp $
+ * $Id: decoder.c,v 1.12 2003/08/25 21:51:40 f1rmb Exp $
  *
  */
 
@@ -125,7 +125,8 @@ static uint16_t eval_reg_or_data(command_t* command, int32_t imm, int32_t start)
    xBBB_BBBB, if immediate use all 7 bits for data else use
    lower four bits for the general purpose register number. */
 /* Evaluates gprm or data depending on bit, data is in byte n */
-uint16_t eval_reg_or_data_2(command_t* command, int32_t imm, int32_t start) {
+static uint16_t eval_reg_or_data_2(command_t* command, 
+				   int32_t imm, int32_t start) {
   if(imm) /* immediate */
     return vm_getbits(command, (start - 1), 7);
   else
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 40bed7ea6..09879e29e 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -95,6 +95,10 @@ struct dvd_file_s {
     ssize_t filesize;
 };
 
+int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
+                     size_t block_count, unsigned char *data, 
+                     int encrypted );
+
 /**
  * Set the level of caching on udf
  * level = 0 (no caching)
diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h
index edd18da77..c7d220f80 100644
--- a/src/input/libdvdnav/dvd_reader.h
+++ b/src/input/libdvdnav/dvd_reader.h
@@ -266,6 +266,12 @@ int DVDISOVolumeInfo( dvd_reader_t *, char *, unsigned int,
  */
 int DVDUDFCacheLevel( dvd_reader_t *, int );
 
+/**
+ * COMMENT ME
+ */
+void *GetUDFCacheHandle(dvd_reader_t *device);
+void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
+
 #ifdef __cplusplus
 };
 #endif
diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c
index a834cc8ac..d7adac891 100644
--- a/src/input/libdvdnav/dvd_udf.c
+++ b/src/input/libdvdnav/dvd_udf.c
@@ -144,9 +144,6 @@ typedef enum {
   PartitionCache, RootICBCache, LBUDFCache, MapCache, AVDPCache, PVDCache
 } UDFCacheType;
 
-extern void *GetUDFCacheHandle(dvd_reader_t *device);
-extern void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
-
 void FreeUDFCache(void *cache)
 {
   struct udf_cache *c = (struct udf_cache *)cache;
diff --git a/src/input/libdvdnav/remap.c b/src/input/libdvdnav/remap.c
index 3019c514a..8fffc6e29 100644
--- a/src/input/libdvdnav/remap.c
+++ b/src/input/libdvdnav/remap.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: remap.c,v 1.3 2003/04/29 15:58:30 jcdutton Exp $
+ * $Id: remap.c,v 1.4 2003/08/25 21:51:40 f1rmb Exp $
  */
 
 #include <stdlib.h>
@@ -51,7 +51,7 @@ struct remap_s {
     struct block_s *blocks;
 };
 
-remap_t* remap_new( char *title) {
+static remap_t* remap_new( char *title) {
     remap_t *map = malloc( sizeof(remap_t));
     map->title = strdup(title);
     map->maxblocks = 0;
@@ -142,10 +142,8 @@ static void remap_add_node( remap_t *map, block_t block) {
     }
 }
 
-int parseblock( 
-	char *buf, int *dom, int *tt, int *pg, 
-	unsigned long *start, unsigned long *end) 
-{
+static int parseblock(char *buf, int *dom, int *tt, int *pg, 
+		      unsigned long *start, unsigned long *end) {
     long tmp;
     char *tok;
     char *epos;
diff --git a/src/input/media_helper.c b/src/input/media_helper.c
index 5d387bb44..9c209f333 100644
--- a/src/input/media_helper.c
+++ b/src/input/media_helper.c
@@ -47,6 +47,7 @@
 #warning "This might not compile due to missing cdrom ioctls"
 #endif
 
+#include "media_helper.h"
 
 #define LOG_MEDIA_EJECT
 
@@ -92,7 +93,7 @@ int media_eject_media (char *device) {
   /* printf("input_dvd: Eject Device %s current device %s opened=%d handle=%p trying...\n",device, this->current_dvd_device, this->opened, this->dvdnav); */
   media_umount_media(device);
   /**********
-        printf("ipnut_dvd: umount result: %s\n", 
+        printf("input_dvd: umount result: %s\n", 
                   strerror(errno));  
    ***********/
 
diff --git a/src/input/mms.c b/src/input/mms.c
index 3b2b0b7f6..fd468fc01 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: mms.c,v 1.29 2003/07/10 22:43:41 tmattern Exp $
+ * $Id: mms.c,v 1.30 2003/08/25 21:51:39 f1rmb Exp $
  *
  * MMS over TCP protocol
  *   based on work from major mms
@@ -660,7 +660,7 @@ static void report_progress (xine_stream_t *stream, int p) {
  * TODO: error messages
  * returns 1 on error
  */
-int mms_parse_url(mms_t *this) {
+static int mms_parse_url(mms_t *this) {
   int     proto_len;
   char   *hostend;
   char   *forport;
@@ -712,7 +712,7 @@ int mms_parse_url(mms_t *this) {
 /*
  * returns 1 on error
  */
-int mms_tcp_connect(mms_t *this) {
+static int mms_tcp_connect(mms_t *this) {
   int progress, res;
   /* 
    * try to connect 
@@ -745,7 +745,7 @@ int mms_tcp_connect(mms_t *this) {
   return 0;
 }
 
-void mms_gen_guid(char guid[]) {
+static void mms_gen_guid(char guid[]) {
   static char digit[16] = "0123456789ABCDEF";
   int i = 0;
 
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index 2de2764bf..0138f1234 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -225,7 +225,8 @@ static void nbc_compute_fifo_length(nbc_t *this,
 
 /* Put callback
  * the fifo mutex is locked */
-void nbc_put_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_gen) {
+static void nbc_put_cb (fifo_buffer_t *fifo, 
+			buf_element_t *buf, void *this_gen) {
   nbc_t *this = (nbc_t*)this_gen;
   int64_t progress = 0;
   int64_t video_p = 0;
@@ -335,7 +336,8 @@ void nbc_put_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_gen) {
 
 /* Get callback
  * the fifo mutex is locked */
-void nbc_get_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_gen) {
+static void nbc_get_cb (fifo_buffer_t *fifo,
+			buf_element_t *buf, void *this_gen) {
   nbc_t *this = (nbc_t*)this_gen;
   int other_fifo_free;
   pthread_mutex_lock(&this->mutex);