diff options
| -rw-r--r-- | xine/post.c | 24 | ||||
| -rw-r--r-- | xine/post.h | 4 |
2 files changed, 6 insertions, 22 deletions
diff --git a/xine/post.c b/xine/post.c index f4874470..ed42cbe2 100644 --- a/xine/post.c +++ b/xine/post.c @@ -390,12 +390,7 @@ void applugin_parse_and_store_post(fe_t *fe, const char *post_chain) static void _vpplugin_unwire(fe_t *fe) { xine_post_out_t *vo_source; - - if(fe->slave_stream) - vo_source = xine_get_video_source(fe->slave_stream); - else - vo_source = xine_get_video_source(fe->stream); - + vo_source = xine_get_video_source(fe->video_source); (void) xine_post_wire_video_port(vo_source, fe->video_port); } @@ -403,12 +398,7 @@ static void _vpplugin_unwire(fe_t *fe) static void _applugin_unwire(fe_t *fe) { xine_post_out_t *ao_source; - - if(fe->slave_stream) - ao_source = xine_get_audio_source(fe->slave_stream); - else - ao_source = xine_get_audio_source(fe->stream); - + ao_source = xine_get_audio_source(fe->audio_source); (void) xine_post_wire_audio_port(ao_source, fe->audio_port); } @@ -451,10 +441,7 @@ static void _vpplugin_rewire_from_post_elements(fe_t *fe, post_element_t **post_ post_elements[0]->post->video_input[1]); } - if(fe->slave_stream) - vo_source = xine_get_video_source(fe->slave_stream); - else - vo_source = xine_get_video_source(fe->stream); + vo_source = xine_get_video_source(fe->video_source); LOGDBG(" wiring %10s[out] -> [in]%-10s", "stream", post_elements[0]->name); xine_post_wire_video_port(vo_source, post_elements[0]->post->video_input[0]); @@ -491,10 +478,7 @@ static void _applugin_rewire_from_post_elements(fe_t *fe, post_element_t **post_ } } - if(fe->slave_stream) - ao_source = xine_get_audio_source(fe->slave_stream); - else - ao_source = xine_get_audio_source(fe->stream); + ao_source = xine_get_audio_source(fe->audio_source); LOGDBG(" wiring %10s[out] -> [in]%-10s", "stream", post_elements[0]->name); xine_post_wire_audio_port(ao_source, post_elements[0]->post->audio_input[0]); } diff --git a/xine/post.h b/xine/post.h index c1bf39f4..88f3916e 100644 --- a/xine/post.h +++ b/xine/post.h @@ -43,9 +43,9 @@ struct post_plugins_s { /* frontend data */ char *static_post_plugins; /* post plugins from command line; always on */ - xine_stream_t *stream; /* main stream (VDR output) */ + xine_stream_t *video_source; /* stream to take video from */ + xine_stream_t *audio_source; /* stream to take audio from */ xine_stream_t *pip_stream; /* pip stream */ - xine_stream_t *slave_stream; /* slave stream for file playing */ /* xine */ xine_t *xine; |