[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp,1.111,1.112

[Kevin D. <kde...@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3045/Source

Modified Files:
	plugin-threads.cpp 
Log Message:
Rewrote input stream reader


Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** plugin-threads.cpp	30 Aug 2004 02:09:55 -0000	1.111
--- plugin-threads.cpp	30 Aug 2004 03:36:52 -0000	1.112
***************
*** 591,595 ****
      int zerocfbytes_count = 0;
      char url_copy[1024];
! 
  
  #define TRYAGAIN_FALSE 0
--- 591,595 ----
      int zerocfbytes_count = 0;
      char url_copy[1024];
!     int c;
  
  #define TRYAGAIN_FALSE 0
***************
*** 640,646 ****
  	pthread_testcancel();
  	if (local_td->instance->player != NULL) {
! 	    if (fgets(buffer, 1024, local_td->instance->player) == NULL) {
! 	    	continue;
! 	    }
  	}
  	pthread_testcancel();
--- 640,661 ----
  	pthread_testcancel();
  	if (local_td->instance->player != NULL) {
! 	
! 	    //if (fgets(buffer, 1024, local_td->instance->player) == NULL) {
! 	    //	continue;
! 	    //}
! 	    buffer[0] = '\0';
! 	    i = 0;
! 	    do {
! 	        pthread_testcancel();
! 	    	c = fgetc(local_td->instance->player);
! 		if (c == EOF || c == 0)
! 		    break;
! 	        buffer[i] = (char)c;
! 		i++;
! 		if ( i >= 1024 )
! 		    break;
! 	    } while (((unsigned char)c != '\n') || (feof(local_td->instance->player)));
! 	    if (buffer[0] == '\0')
! 	        continue;
  	}
  	pthread_testcancel();
***************
*** 1044,1048 ****
      int nomouseinput;
      int listempty;
-     long flags;
  
      local_td = (ThreadData *) td;
--- 1059,1062 ----