[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp, 1.237, 1.238

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

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

Modified Files:
	plugin-threads.cpp 
Log Message:
	Change mms rotation from http > mms > mmst to mms > msst > https	
		Affects video quality at some sites, but keeps mplayer from crashing


Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -C2 -d -r1.237 -r1.238
*** plugin-threads.cpp	5 Jul 2006 14:09:27 -0000	1.237
--- plugin-threads.cpp	26 Jul 2006 14:28:49 -0000	1.238
***************
*** 1214,1218 ****
         pthread_testcancel();
         if (strstr(buffer, "Failed to open") != NULL) {
!        	   if (strstr(buffer, local_url) != NULL) {
  	       if (local_td->instance->currentnode->mmsstream == 1) {
  		    if (DEBUG)
--- 1214,1218 ----
         pthread_testcancel();
         if (strstr(buffer, "Failed to open") != NULL) {
!        	   if ((strstr(buffer, "/dev/rtc") == NULL) || (strstr(buffer, "LIRC") == NULL)) {	// ignore RTC device and LIRC device failures
  	       if (local_td->instance->currentnode->mmsstream == 1) {
  		    if (DEBUG)
***************
*** 1221,1227 ****
  		    break;
  	       } else {
! //		    result->tryagain = TRYAGAIN_FALSE;
! //		    result->errorcode = ERROR_FILE_NOT_FOUND;
! //		    break;
  	       }
  	   }
--- 1221,1227 ----
  		    break;
  	       } else {
! 		    result->tryagain = TRYAGAIN_FALSE;
! 		    result->errorcode = ERROR_FILE_NOT_FOUND;
! 		    break;
  	       }
  	   }
***************
*** 1462,1466 ****
  
      if (result->tryagain == TRYAGAIN_FALLBACK) {
! 	//fallback to msst if we can
  	strlcpy(url_copy, local_url, 1023);
  	url_copy[1023] = '\0';
--- 1462,1466 ----
  
      if (result->tryagain == TRYAGAIN_FALLBACK) {
! 	//fallback to msst and then to http if we can
  	strlcpy(url_copy, local_url, 1023);
  	url_copy[1023] = '\0';
***************
*** 1470,1476 ****
  	    result->retval = TRUE;
  	} else if (local_mmsstream &&
! 		   strncmp(local_url, "http://", 7) == 0) {
  
! 	    snprintf(local_url, 1023, "mms://%s", url_copy + 7);
  	    result->retval = TRUE;
  	} else {
--- 1470,1476 ----
  	    result->retval = TRUE;
  	} else if (local_mmsstream &&
! 		   strncmp(local_url, "mmst://", 7) == 0) {
  
! 	    snprintf(local_url, 1023, "http://%s", url_copy + 7);
  	    result->retval = TRUE;
  	} else {
***************
*** 1862,1871 ****
  		if (result != NULL) {
  			if (result->tryagain != TRYAGAIN_FALLBACK) {
! 			    mmsToHttp(local_url, local_list->url);
  			}
  		} else {
  		    if (DEBUG)
  			printf("result = null\n");
! 		    mmsToHttp(local_url, local_list->url);
  		}
  	        if (DEBUG)
--- 1862,1871 ----
  		if (result != NULL) {
  			if (result->tryagain != TRYAGAIN_FALLBACK) {
! 			    // mmsToHttp(local_url, local_list->url);
  			}
  		} else {
  		    if (DEBUG)
  			printf("result = null\n");
! 		    // mmsToHttp(local_url, local_list->url);
  		}
  	        if (DEBUG)