Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/input input_cdda.c,1.31,1.32 input_dvd.c,1.167,1.168 input_v4l.c,1.17,1.18 media_helper.c,1.2,1.3 mms.c,1.29,1.30 net_buf_ctrl.c,1.25,1.26
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-08-25 21:58:42
|
Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1:/tmp/cvs-serv11827/src/input
Modified Files:
input_cdda.c input_dvd.c input_v4l.c media_helper.c mms.c
net_buf_ctrl.c
Log Message:
Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).
Index: input_cdda.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_cdda.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- input_cdda.c 10 Aug 2003 16:11:05 -0000 1.31
+++ input_cdda.c 25 Aug 2003 21:51:39 -0000 1.32
@@ -355,13 +355,13 @@
}
}
-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);
Index: input_dvd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- input_dvd.c 21 Aug 2003 00:37:26 -0000 1.167
+++ input_dvd.c 25 Aug 2003 21:51:39 -0000 1.168
@@ -353,7 +353,7 @@
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 @@
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 @@
/*
* $Log$
+ * 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
*
Index: input_v4l.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_v4l.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- input_v4l.c 24 Jul 2003 15:51:09 -0000 1.17
+++ input_v4l.c 25 Aug 2003 21:51:39 -0000 1.18
@@ -702,7 +702,7 @@
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 @@
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 @@
* 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 @@
* 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");
Index: media_helper.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/media_helper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- media_helper.c 6 May 2003 14:02:26 -0000 1.2
+++ media_helper.c 25 Aug 2003 21:51:39 -0000 1.3
@@ -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 @@
/* 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));
***********/
Index: mms.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/mms.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mms.c 10 Jul 2003 22:43:41 -0000 1.29
+++ mms.c 25 Aug 2003 21:51:39 -0000 1.30
@@ -660,7 +660,7 @@
* 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 @@
/*
* 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 @@
return 0;
}
-void mms_gen_guid(char guid[]) {
+static void mms_gen_guid(char guid[]) {
static char digit[16] = "0123456789ABCDEF";
int i = 0;
Index: net_buf_ctrl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/net_buf_ctrl.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- net_buf_ctrl.c 13 May 2003 16:38:04 -0000 1.25
+++ net_buf_ctrl.c 25 Aug 2003 21:51:39 -0000 1.26
@@ -225,7 +225,8 @@
/* 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 @@
/* 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);
|