diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-03-14 23:52:07 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-03-14 23:52:07 +0000 |
| commit | a818eb61818a99d4a3cc401712fd252a74ccaf3e (patch) | |
| tree | f565c6dd7dca77b3e680688883f85369ea5592b1 /src | |
| parent | e27ea806baed458b746db968c073fca3203d1bdd (diff) | |
| download | xine-lib-a818eb61818a99d4a3cc401712fd252a74ccaf3e.tar.gz xine-lib-a818eb61818a99d4a3cc401712fd252a74ccaf3e.tar.bz2 | |
testing the idea of aborting because of action pending AND read timeout.
we should extend it to network plugins if it works well
CVS patchset: 4421
CVS date: 2003/03/14 23:52:07
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/input_stdin_fifo.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index eacd78b7c..2f0daa019 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.44 2003/03/06 23:56:47 miguelfreitas Exp $ + * $Id: input_stdin_fifo.c,v 1.45 2003/03/14 23:52:07 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -120,6 +120,12 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen, #ifdef LOG printf ("stdin: timeout\n"); #endif + /* aborts current read if action pending. otherwise xine + * cannot be stopped when no more data is available. + */ + if( this->stream->demux_action_pending ) + return 0; + } else { break; } |