From b370640efc26593876e4f022459023dc5c1ec755 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Wed, 25 Dec 2002 15:02:23 +0000 Subject: allow post plugin output's rewire functions to be NULL CVS patchset: 3677 CVS date: 2002/12/25 15:02:23 --- include/xine.h.in | 5 +++-- src/xine-engine/xine_interface.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/xine.h.in b/include/xine.h.in index 6bdc3fa2f..2017f082d 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -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: xine.h.in,v 1.47 2002/12/21 16:14:32 miguelfreitas Exp $ + * $Id: xine.h.in,v 1.48 2002/12/25 15:02:23 mroi Exp $ * * public xine-lib (libxine) interface and documentation * @@ -383,7 +383,8 @@ struct xine_post_out_s { * argument: in this case you should disconnect the data pointer * from any output and if necessary to avoid writing to some stray * memory you should make it point to some dummy location, - * returns 1 on success, 0 on failure */ + * returns 1 on success, 0 on failure; + * if you do not implement rewiring, set this to NULL */ int (*rewire) (xine_post_out_t *self, void *data); }; diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 39817b8c9..122befb41 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.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: xine_interface.c,v 1.34 2002/12/14 18:34:57 esnel Exp $ + * $Id: xine_interface.c,v 1.35 2002/12/25 15:02:23 mroi Exp $ * * convenience/abstraction layer, functions to implement * libxine's public interface @@ -635,7 +635,7 @@ const xine_post_out_t *xine_post_output(xine_post_t *this_gen, char *name) { } int xine_post_wire(xine_post_out_t *source, xine_post_in_t *target) { - if (source) { + if (source && source->rewire) { if (target) { if (source->type == target->type) return source->rewire(source, target->data); -- cgit v1.2.3