[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-list.cpp,1.45,1.46 plugin.cpp,1.145,1.146

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

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

Modified Files:
	plugin-list.cpp plugin.cpp 
Log Message:
	Fixed problem with http://www.vg.no/video media


Index: plugin-list.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** plugin-list.cpp	29 Oct 2004 16:10:41 -0000	1.45
--- plugin-list.cpp	8 Nov 2004 21:17:25 -0000	1.46
***************
*** 666,670 ****
  		found = 1;
  	    }
- 
  	    // simple playlist usually realmedia file
  	    if (strncasecmp(buffer, "rtsp://", 7) == 0 && found == 0) {
--- 666,669 ----

Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** plugin.cpp	5 Nov 2004 19:19:01 -0000	1.145
--- plugin.cpp	8 Nov 2004 21:17:25 -0000	1.146
***************
*** 831,834 ****
--- 831,837 ----
  	    setwindow++;
  
+ 	    if (DEBUG > 1)
+ 		printf("Current state is %i\n", state);
+ 
  	    if (state != STATE_GETTING_PLAYLIST) {
  		state = STATE_GETTING_PLAYLIST;
***************
*** 841,855 ****
  			    SetupPlayer(this, NULL);
  		    }
! 		} else {
! 		    if (url != NULL) {
! 			if (isMms(url)) {
! 			    snprintf(list->url, 1024, "%s", url);
! 			    state = STATE_STARTED_PLAYER;
! 			    list->mmsstream = 1;
! 			    if (threadsetup == 0 && controlwindow == 0)
! 				SetupPlayer(this, NULL);
! 			}
  		    }
  		}
  	    }
  	}
--- 844,868 ----
  			    SetupPlayer(this, NULL);
  		    }
! 		}
! 		if (url != NULL) {
! 		    if (isMms(url)) {
! 			snprintf(list->url, 1024, "%s", url);
! 			state = STATE_STARTED_PLAYER;
! 			list->mmsstream = 1;
! 			if (threadsetup == 0 && controlwindow == 0)
! 			    SetupPlayer(this, NULL);
  		    }
  		}
+ 
+ 		if (fname != NULL) {
+ 		    if (isMms(fname)) {
+ 			snprintf(list->url, 1024, "%s", fname);
+ 			state = STATE_STARTED_PLAYER;
+ 			list->mmsstream = 1;
+ 			if (threadsetup == 0 && controlwindow == 0)
+ 			    SetupPlayer(this, NULL);
+ 		    }
+ 
+ 		}
  	    }
  	}