[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.62,1.63 plugin-support.cpp,1.68,1.69 p

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	plugin-setup.cpp plugin-support.cpp plugin-threads.cpp 
	plugin-ui.cpp plugin.cpp 
Log Message:
Progress Bar over video fix and crasher fix.

Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** plugin-ui.cpp	20 Apr 2005 14:13:03 -0000	1.115
--- plugin-ui.cpp	6 May 2005 22:38:18 -0000	1.116
***************
*** 1313,1316 ****
--- 1313,1321 ----
      }

+     if (instance->movie_width != 0 && instance->movie_height != 0) {
+ 	if (GTK_IS_WIDGET(instance->progress_bar))
+ 	    gtk_widget_hide(GTK_WIDGET(instance->progress_bar));
+     }
+ 
      return FALSE;
  }

Index: plugin-support.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-support.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** plugin-support.cpp	27 Apr 2005 16:55:45 -0000	1.68
--- plugin-support.cpp	6 May 2005 22:38:18 -0000	1.69
***************
*** 468,472 ****
  	if (DEBUG > 1)
  	    printf("closing player\n");
! //	fclose(instance->player);
  	instance->player = NULL;

--- 468,472 ----
  	if (DEBUG > 1)
  	    printf("closing player\n");
! //      fclose(instance->player);
  	instance->player = NULL;

***************
*** 479,483 ****
      }

!     if(DEBUG > 1)
  	printf("player should be closed\n");

--- 479,483 ----
      }

!     if (DEBUG > 1)
  	printf("player should be closed\n");

Index: plugin-setup.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** plugin-setup.cpp	5 May 2005 13:48:52 -0000	1.62
--- plugin-setup.cpp	6 May 2005 22:38:17 -0000	1.63
***************
*** 508,512 ****

  	    if ((strncasecmp(parameters->argn[i], "loop", 4) == 0)
! 		|| (strncasecmp(parameters->argn[i], "autorewind", 10) == 0)
  		|| (strncasecmp(parameters->argn[i], "repeat", 6) == 0)) {

--- 508,513 ----

  	    if ((strncasecmp(parameters->argn[i], "loop", 4) == 0)
! 		|| (strncasecmp(parameters->argn[i], "autorewind", 10) ==
! 		    0)
  		|| (strncasecmp(parameters->argn[i], "repeat", 6) == 0)) {

***************
*** 518,523 ****
  		    || strstr(parameters->argv[i], "yes")
  		    || strstr(parameters->argv[i], "infinite")) {
! 		    instance->loop = 0;		// 0 = infinite (like mplayer)
! 		} else if (isdigit((int)*(parameters->argv[i]))) {
  		    sscanf(parameters->argv[i], "%i", &instance->loop);
  		} else {
--- 519,524 ----
  		    || strstr(parameters->argv[i], "yes")
  		    || strstr(parameters->argv[i], "infinite")) {
! 		    instance->loop = 0;	// 0 = infinite (like mplayer)
! 		} else if (isdigit((int) *(parameters->argv[i]))) {
  		    sscanf(parameters->argv[i], "%i", &instance->loop);
  		} else {

Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** plugin-threads.cpp	5 May 2005 13:48:52 -0000	1.140
--- plugin-threads.cpp	6 May 2005 22:38:18 -0000	1.141
***************
*** 1190,1194 ****
      char message[1024];
      char mmsplaylist[1024];
!     char buffer[1024];	// scratch pad

      int argc = 0, base_argc = 0;
--- 1190,1194 ----
      char message[1024];
      char mmsplaylist[1024];
!     char buffer[1024];		// scratch pad

      int argc = 0, base_argc = 0;
***************
*** 1307,1311 ****
  	}
      }
- 
      // count playable items in the list, if playable =1 and loop = 1 then add a couple of args
      if (local_td->instance->loop >= 0) {
--- 1307,1310 ----
***************
*** 1313,1328 ****
  	local_list = local_td->list;
  	while (local_list != NULL) {
! 	    if (local_list->play) 
  		i++;
  	    local_list = local_list->next;
  	}
! 	if (DEBUG) 
! 	    printf("----player thread:\nFound %i files to play and loop is true\n", i);

  	// if the play count is exactly 1 then tell mplayer to loop continuously and to use the same frame buffer (should eliminate blinking)
! 	if (i == 1) {	
  	    loop_single = 1;
  	    local_td->argv[argc++] = strdup("-loop");
! 	    snprintf(buffer, 32,"%i", local_td->instance->loop);
  	    local_td->argv[argc++] = strdup(buffer);
  	    local_td->argv[argc++] = strdup("-fixed-vo");
--- 1312,1329 ----
  	local_list = local_td->list;
  	while (local_list != NULL) {
! 	    if (local_list->play)
  		i++;
  	    local_list = local_list->next;
  	}
! 	if (DEBUG)
! 	    printf
! 		("----player thread:\nFound %i files to play and loop is true\n",
! 		 i);

  	// if the play count is exactly 1 then tell mplayer to loop continuously and to use the same frame buffer (should eliminate blinking)
! 	if (i == 1) {
  	    loop_single = 1;
  	    local_td->argv[argc++] = strdup("-loop");
! 	    snprintf(buffer, 32, "%i", local_td->instance->loop);
  	    local_td->argv[argc++] = strdup(buffer);
  	    local_td->argv[argc++] = strdup("-fixed-vo");

Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** plugin.cpp	5 May 2005 13:48:52 -0000	1.185
--- plugin.cpp	6 May 2005 22:38:18 -0000	1.186
***************
*** 158,161 ****
--- 158,163 ----
      embed_width = 0;
      embed_height = 0;
+     movie_width = 0;
+     movie_height = 0;
      setwindow = 0;
      baseurl = NULL;
***************
*** 347,353 ****
  		gtk_widget_destroy(rew_event_box);
  	    }
! 	    if (mediaprogress_bar != NULL)
  		gtk_widget_destroy(GTK_WIDGET(mediaprogress_bar));
  	    mediaprogress_bar = NULL;
  	    panel_drawn = 0;
  	}
--- 349,358 ----
  		gtk_widget_destroy(rew_event_box);
  	    }
! 	    if (GTK_IS_WIDGET(mediaprogress_bar))
  		gtk_widget_destroy(GTK_WIDGET(mediaprogress_bar));
+ 	    if (GTK_IS_WIDGET(progress_bar))
+ 		gtk_widget_destroy(GTK_WIDGET(progress_bar));
  	    mediaprogress_bar = NULL;
+ 	    progress_bar = NULL;
  	    panel_drawn = 0;
  	}
***************
*** 359,366 ****
  	}
  	if (embed_height > 125)
! 	    if (image != NULL)
  		gtk_widget_destroy(image);

! 	if (fs_event_box != NULL)
  	    gtk_widget_destroy(fs_event_box);

--- 364,371 ----
  	}
  	if (embed_height > 125)
! 	    if (GTK_IS_WIDGET(image))
  		gtk_widget_destroy(image);

! 	if (GTK_IS_WIDGET(fs_event_box))
  	    gtk_widget_destroy(fs_event_box);

***************
*** 378,382 ****
  	}

! 	if (gtkwidget != NULL)
  	    gtk_widget_destroy(gtkwidget);
      }
--- 383,387 ----
  	}

! 	if (GTK_IS_WIDGET(gtkwidget))
  	    gtk_widget_destroy(gtkwidget);
      }
***************
*** 1131,1135 ****
  			    gtk_widget_hide(GTK_WIDGET(progress_bar));
  			} else {
! 			    gtk_widget_show(GTK_WIDGET(progress_bar));
  			}
  		    }
--- 1136,1141 ----
  			    gtk_widget_hide(GTK_WIDGET(progress_bar));
  			} else {
! 			    if (movie_width == 0 && movie_height == 0)
! 				gtk_widget_show(GTK_WIDGET(progress_bar));
  			}
  		    }
***************
*** 1549,1559 ****
  #endif
  #ifdef GTK_ENABLED
! 			if (progress_bar != NULL && maxdownload != 0) {
! 			    gtk_progress_bar_update(progress_bar,
! 						    ((currdownload * 1.0) /
! 						     (maxdownload * 1.0)));
! 			    gtk_widget_show(GTK_WIDGET(progress_bar));
! 			    gtk_widget_queue_draw(GTK_WIDGET
! 						  (progress_bar));
  			}
  			if (status != NULL) {
--- 1555,1570 ----
  #endif
  #ifdef GTK_ENABLED
! 			if (GTK_IS_WIDGET(progress_bar)
! 			    && maxdownload != 0) {
! 			    if (movie_width == 0 && movie_height == 0) {
! 				gtk_progress_bar_update(progress_bar,
! 							((currdownload *
! 							  1.0) /
! 							 (maxdownload *
! 							  1.0)));
! 				gtk_widget_show(GTK_WIDGET(progress_bar));
! 				gtk_widget_queue_draw(GTK_WIDGET
! 						      (progress_bar));
! 			    }
  			}
  			if (status != NULL) {
***************
*** 1573,1583 ****
  #endif
  #ifdef GTK_ENABLED
! 			if (progress_bar != NULL && maxdownload != 0) {
! 			    gtk_progress_bar_update(progress_bar,
! 						    ((currdownload * 1.0) /
! 						     (maxdownload * 1.0)));
! 			    gtk_widget_show(GTK_WIDGET(progress_bar));
! 			    gtk_widget_queue_draw(GTK_WIDGET
! 						  (progress_bar));
  			}
  			if (status != NULL) {
--- 1584,1599 ----
  #endif
  #ifdef GTK_ENABLED
! 			if (GTK_IS_WIDGET(progress_bar)
! 			    && maxdownload != 0) {
! 			    if (movie_width == 0 && movie_height == 0) {
! 				gtk_progress_bar_update(progress_bar,
! 							((currdownload *
! 							  1.0) /
! 							 (maxdownload *
! 							  1.0)));
! 				gtk_widget_show(GTK_WIDGET(progress_bar));
! 				gtk_widget_queue_draw(GTK_WIDGET
! 						      (progress_bar));
! 			    }
  			}
  			if (status != NULL) {

[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.62,1.63 plugin-support.cpp,1.68,1.69 p

[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.62,1.63 plugin-support.cpp,1.68,1.69 plugin-threads.cpp,1.140,1.141 plugin-ui.cpp,1.115,1.116 plugin.cpp,1.185,1.186