Mercurial > mplayer.hg

diff stream/tcp.c @ 26326:5bfc1d8bece9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the need for code using stream to export an mp_input_check_interrupt() function. It also removes the compile-time dependency on input.
author albeu
date Wed, 09 Apr 2008 00:36:28 +0000
parents 44540930bf94
children ba4a01eb4475
line wrap: on
line diff
--- a/stream/tcp.c	Wed Apr 09 00:32:35 2008 +0000
+++ b/stream/tcp.c	Wed Apr 09 00:36:28 2008 +0000
@@ -19,7 +19,6 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "input/input.h"
 
 #ifndef HAVE_WINSOCK2
 #include <netdb.h>
@@ -195,7 +194,7 @@
 	FD_SET( socket_server_fd, &set );
 	// When the connection will be made, we will have a writeable fd
 	while((ret = select(socket_server_fd+1, NULL, &set, NULL, &tv)) == 0) {
-	      if(count > 30 || mp_input_check_interrupt(500)) {
+	      if(count > 30 || stream_check_interrupt(500)) {
 		if(count > 30)
 		  mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ConnTimeout);
 		else