diff options
| -rw-r--r-- | src/input/input_file.c | 8 | ||||
| -rw-r--r-- | src/input/input_http.c | 6 | ||||
| -rw-r--r-- | src/input/input_mms.c | 8 | ||||
| -rw-r--r-- | src/input/input_net.c | 9 | ||||
| -rw-r--r-- | src/input/input_plugin.h | 4 | ||||
| -rw-r--r-- | src/input/input_rtp.c | 10 | ||||
| -rw-r--r-- | src/input/input_stdin_fifo.c | 8 |
7 files changed, 11 insertions, 42 deletions
diff --git a/src/input/input_file.c b/src/input/input_file.c index 9f9efe05c..75bec4f02 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.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: input_file.c,v 1.67 2002/11/08 23:28:00 f1rmb Exp $ + * $Id: input_file.c,v 1.68 2002/11/17 17:48:47 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -174,10 +174,6 @@ static int is_a_dir(char *filepathname) { return (S_ISDIR(pstat.st_mode)); } -static int file_plugin_eject_media (input_class_t *this_gen) { - return 1; /* doesn't make sense */ -} - static char* file_plugin_get_mrl (input_plugin_t *this_gen) { file_input_plugin_t *this = (file_input_plugin_t *) this_gen; @@ -847,7 +843,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->input_class.get_dir = file_class_get_dir; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = file_class_dispose; - this->input_class.eject_media = file_plugin_eject_media; + this->input_class.eject_media = NULL; this->mrls = (xine_mrl_t **) xine_xmalloc(sizeof(xine_mrl_t*)); this->mrls_allocated_entries = 0; diff --git a/src/input/input_http.c b/src/input/input_http.c index 0d2cb7975..e7d27b1e4 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -929,10 +929,6 @@ static void http_class_dispose (input_class_t *this_gen) { free (this); } -static int http_plugin_eject_media (input_class_t *this_gen) { - return 1; /* doesn't make sense */ -} - static void *init_class (xine_t *xine, void *data) { http_input_class_t *this; @@ -950,7 +946,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = http_class_dispose; - this->input_class.eject_media = http_plugin_eject_media; + this->input_class.eject_media = NULL; return this; } diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 5cad12dfa..593e5c9b7 100644 --- a/src/input/input_mms.c +++ b/src/input/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: input_mms.c,v 1.24 2002/11/03 20:43:57 guenter Exp $ + * $Id: input_mms.c,v 1.25 2002/11/17 17:48:47 mroi Exp $ * * mms input plugin based on work from major mms */ @@ -313,10 +313,6 @@ static void mms_class_dispose (input_class_t *this_gen) { free (this); } -static int mms_class_eject_media (input_class_t *this_gen) { - return 1; -} - static void *init_class (xine_t *xine, void *data) { mms_input_class_t *this; @@ -331,7 +327,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = mms_class_dispose; - this->input_class.eject_media = mms_class_eject_media; + this->input_class.eject_media = NULL; return this; } diff --git a/src/input/input_net.c b/src/input/input_net.c index a4afe2375..c6850bca9 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -267,13 +267,6 @@ static off_t net_plugin_get_current_pos (input_plugin_t *this_gen){ /* * */ -static int net_plugin_eject_media (input_plugin_t *this_gen) { - return 1; -} - -/* - * - */ static void net_plugin_close (input_plugin_t *this_gen) { net_input_plugin_t *this = (net_input_plugin_t *) this_gen; @@ -350,7 +343,7 @@ static void *init_input_plugin (xine_t *xine, void *data) { this->input_plugin.get_length = net_plugin_get_length; this->input_plugin.get_blocksize = net_plugin_get_blocksize; this->input_plugin.get_dir = NULL; - this->input_plugin.eject_media = net_plugin_eject_media; + this->input_plugin.eject_media = NULL; this->input_plugin.get_mrl = net_plugin_get_mrl; this->input_plugin.close = net_plugin_close; this->input_plugin.stop = net_plugin_stop; diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index d647708a9..0e6edf2ed 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -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: input_plugin.h,v 1.36 2002/10/25 15:36:22 mroi Exp $ + * $Id: input_plugin.h,v 1.37 2002/11/17 17:48:47 mroi Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H @@ -70,7 +70,7 @@ struct input_class_s { void (*dispose) (input_class_t *this); /* - * eject/load the media (if possible) + * eject/load the media (if possible), optional: may be NULL * * returns 0 for temporary failures */ diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index e576e6f53..933aa5029 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -438,14 +438,6 @@ static void rtp_plugin_stop (input_plugin_t *this_gen) { /* * */ -static int rtp_plugin_eject_media (input_plugin_t *this_gen) { - - return 1; -} - -/* - * - */ static char *rtp_plugin_get_description (input_plugin_t *this_gen) { return _("rtp input plugin as shipped with xine"); @@ -536,7 +528,7 @@ static void *init_input_plugin (xine_t *xine, void *data) { this->input_plugin.get_current_pos = rtp_plugin_get_current_pos; this->input_plugin.get_length = rtp_plugin_get_length; this->input_plugin.get_blocksize = rtp_plugin_get_blocksize; - this->input_plugin.eject_media = rtp_plugin_eject_media; + this->input_plugin.eject_media = NULL; this->input_plugin.close = rtp_plugin_close; this->input_plugin.stop = rtp_plugin_stop; this->input_plugin.get_identifier = rtp_plugin_get_identifier; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index f7c3333d5..cfe8bf6b8 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.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: input_stdin_fifo.c,v 1.35 2002/11/07 23:05:07 guenter Exp $ + * $Id: input_stdin_fifo.c,v 1.36 2002/11/17 17:48:47 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -368,10 +368,6 @@ static void stdin_class_dispose (input_class_t *this_gen) { free (this); } -static int stdin_class_eject_media (input_class_t *this_gen) { - return 1; -} - static void *init_class (xine_t *xine, void *data) { stdin_input_class_t *this; @@ -386,7 +382,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = stdin_class_dispose; - this->input_class.eject_media = stdin_class_eject_media; + this->input_class.eject_media = NULL; return this; } |