From a74413f06efef91496b3f5b9f749b328ede19ac8 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sat, 29 May 2004 14:45:25 +0000 Subject: separate the two semantics of querying a port's status with a NULL stream; before, NULL could mean two things: no stream at all or a stream that does not want to be addressed; now the latter is represented by the new XINE_ANON_STREAM resulting changes: * the status() functions now behave differently for NULL and XINE_ANON_STREAM (as the commentary always implied, but this was not the case, so post plugin rewiring went wrong, because it relies on the status() function) * the NULL_STREAM defines in audio_out and video_out are obsolete * update the function comments in the headers * update the post plugin rewire functions to use the status() functions to check, if the old port was opened and handle the new one accordingly; this makes open_count obsolete * change all post plugins accordingly (mostly using XINE_ANON_STREAM instead of NULL) additional change: * the status() function of audio port now returns the bits/rate/mode values of the input and not the output; this is more likely to be what a post plugin wants * the reimplementation of status() in the upmix plugin is obsolete CVS patchset: 6603 CVS date: 2004/05/29 14:45:25 --- src/post/mosaico/switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/post/mosaico/switch.c') diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index ce4a8cd85..e63275d06 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.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: switch.c,v 1.13 2004/04/17 19:54:31 mroi Exp $ + * $Id: switch.c,v 1.14 2004/05/29 14:45:26 mroi Exp $ */ /* @@ -253,7 +253,7 @@ static int switch_draw(vo_frame_t *frame, xine_stream_t *stream) pthread_cond_wait(&this->display_condition_changed, &this->mutex); if (this->selected_source == source_num) { _x_post_frame_copy_down(frame, frame->next); - skip = frame->next->draw(frame->next, NULL); + skip = frame->next->draw(frame->next, XINE_ANON_STREAM); _x_post_frame_copy_up(frame, frame->next); this->vpts_limit = frame->vpts + frame->duration; if (skip) { -- cgit v1.2.3