[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp, 1.264, 1.265 plugin.cpp, 1.331, 1.332

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

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

Modified Files:
	plugin-threads.cpp plugin.cpp 
Log Message:
When playing url rather than local file, mark it so that we don't retry on failure


Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.264
retrieving revision 1.265
diff -C2 -d -r1.264 -r1.265
*** plugin-threads.cpp	23 Dec 2006 15:37:37 -0000	1.264
--- plugin-threads.cpp	8 Jan 2007 00:38:01 -0000	1.265
***************
*** 1420,1424 ****
  	    if (local_td->instance->mediaPercent == 0) {
  		if (DEBUG)
! 		    printf("local_url = %s\n", local_url);
  		if (local_list->prefer_url == 1) {
  
--- 1420,1424 ----
  	    if (local_td->instance->mediaPercent == 0) {
  		if (DEBUG)
! 		    printf("local_url = %s\nprefer_url = %i\n", local_url,local_list->prefer_url);
  		if (local_list->prefer_url == 1) {
  
***************
*** 2027,2030 ****
--- 2027,2031 ----
  		    printf("local_url is %s\n", local_url);
  		local_td->argv[argc++] = strdup(local_url);
+ 		local_list->prefer_url = 1;
  		if (local_td->instance->keep_download) {
  		    snprintf(mmsplaylist, sizeof(mmsplaylist),
***************
*** 2058,2061 ****
--- 2059,2063 ----
  		    }
  		    local_td->argv[argc++] = strdup(local_url);
+ 		    local_list->prefer_url = 1;
  		} else {
  		    local_td->argv[argc++] = strdup("-nocache");

Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.331
retrieving revision 1.332
diff -C2 -d -r1.331 -r1.332
*** plugin.cpp	4 Jan 2007 18:26:20 -0000	1.331
--- plugin.cpp	8 Jan 2007 00:38:01 -0000	1.332
***************
*** 993,996 ****
--- 993,998 ----
  
  	status = GTK_LABEL(gtk_label_new(_("Initializing")));
+ 	// I don't really like this as it messes up the right click menu
+ 	// gtk_label_set_selectable(status,TRUE);
  	progress_bar = GTK_PROGRESS_BAR(gtk_progress_bar_new());