mplayerplug-in for mozilla

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

Modified Files:
	plugin-ui.cpp plugin.cpp 
Log Message:
Added % Buffering message to media progress bar

Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** plugin-ui.cpp	18 Apr 2006 21:36:43 -0000	1.213
--- plugin-ui.cpp	29 Apr 2006 13:19:17 -0000	1.214
***************
*** 1708,1712 ****
      int hour = 0, min = 0, length_hour = 0, length_min = 0;
      long int seconds, length_seconds;
!     char display[30];
  
      if (DEBUG > 1)
--- 1708,1712 ----
      int hour = 0, min = 0, length_hour = 0, length_min = 0;
      long int seconds, length_seconds;
!     char display[35];
  
      if (DEBUG > 1)
***************
*** 1754,1768 ****
  				length_seconds - (length_min * 60);
  			}
- 			if (hour == 0 && length_hour == 0) {
- 			    snprintf(display, 30, "%2i:%02i / %2i:%02i",
- 				     min, (int) seconds, length_min,
- 				     (int) length_seconds);
- 			} else {
- 			    snprintf(display, 30,
- 				     "%i:%02i:%02i / %i:%02i:%02i", hour,
- 				     min, (int) seconds, length_hour,
- 				     length_min, (int) length_seconds);
- 			}
  
  			gtk_progress_bar_set_text(instance->
  						  mediaprogress_bar,
--- 1754,1786 ----
  				length_seconds - (length_min * 60);
  			}
  
+ 		        if (instance->percent > 0.0 && instance->percent < 1.0) {
+ 
+ 			    if (hour == 0 && length_hour == 0) {
+ 				snprintf(display, 30, _("%2i:%02i / %2i:%02i | %2i%% Buffered"),
+ 					 min, (int) seconds, length_min,
+ 					 (int) length_seconds, (int)(instance->percent * 100));
+ 			    } else {
+ 				snprintf(display, 30,
+ 					 _("%i:%02i:%02i / %i:%02i:%02i | %2i%% Buffered"), hour,
+ 					 min, (int) seconds, length_hour,
+ 					 length_min, (int) length_seconds, (int)(instance->percent * 100));
+ 			    }
+ 			          
+ 		    	} else {
+ 
+ 			    if (hour == 0 && length_hour == 0) {
+ 				snprintf(display, 30, "%2i:%02i / %2i:%02i",
+ 					 min, (int) seconds, length_min,
+ 					 (int) length_seconds);
+ 			    } else {
+ 				snprintf(display, 30,
+ 					 "%i:%02i:%02i / %i:%02i:%02i", hour,
+ 					 min, (int) seconds, length_hour,
+ 					 length_min, (int) length_seconds);
+ 			    }
+ 			
+ 			}
+ 		    
  			gtk_progress_bar_set_text(instance->
  						  mediaprogress_bar,

Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.298
retrieving revision 1.299
diff -C2 -d -r1.298 -r1.299
*** plugin.cpp	12 Apr 2006 23:13:48 -0000	1.298
--- plugin.cpp	29 Apr 2006 13:19:17 -0000	1.299
***************
*** 1864,1871 ****
--- 1864,1875 ----
  					 (double) maxdownload)),
  				 (n->bytes / 1024));
+ 			percent = ((double) currdownload /
+ 					 (double) maxdownload);
+ 		    
  		    } else {
  			snprintf(message, 1024,
  				 _("Buffering Complete - %li KB"),
  				 (n->bytes / 1024));
+ 		    	percent = 1.0;
  		    }
  		}