[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp, 1.256, 1.257 plugin-ui.cpp, 1.235, 1.236

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

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

Modified Files:
	plugin-threads.cpp plugin-ui.cpp 
Log Message:
Fix problem with href videos (Apple HD sites) cancelled flag 
	was not cleared correctly
Fix problem in playlist when using hrefs and clicking/selecting second time


Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** plugin-ui.cpp	1 Nov 2006 20:46:16 -0000	1.235
--- plugin-ui.cpp	6 Nov 2006 19:27:52 -0000	1.236
***************
*** 3115,3119 ****
  		if (instance->targetplayer == 0)
  		    gtk_widget_hide(instance->src_event_box);
! 		n->play = 1;
  		instance->Play();
  	    }
--- 3115,3128 ----
  		if (instance->targetplayer == 0)
  		    gtk_widget_hide(instance->src_event_box);
! 		//n->play = 1;
! 		instance->cancelled = 0;
! 		pthread_mutex_lock(&(instance->playlist_mutex));	// manipulating the playlist, so lock it
! 		n = instance->list;
!     		while (n != NULL) {
! 		   if (n->played == 1)
! 		       n->played = 0;	// reset played flag
! 		   n = n->next;
! 		}
! 		pthread_mutex_unlock(&(instance->playlist_mutex));	// unlock the playlist
  		instance->Play();
  	    }

Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** plugin-threads.cpp	4 Nov 2006 15:20:17 -0000	1.256
--- plugin-threads.cpp	6 Nov 2006 19:27:52 -0000	1.257
***************
*** 398,407 ****
  #endif
  #ifdef GTK_ENABLED
! 	    if (instance->targetplayer == 1) {
! 		gtk_widget_show(instance->gtkwidget);
! 	    }
  	    if (GTK_IS_WIDGET(instance->drawing_area)) {
  		gtk_widget_show(instance->drawing_area);
  		gtk_widget_set_usize(instance->drawing_area,1,1);
  	    }
  #ifdef GTK2_ENABLED
--- 398,411 ----
  #endif
  #ifdef GTK_ENABLED
! //	    if (instance->targetplayer == 1) {
! //		gtk_widget_show(instance->gtkwidget);
! //	    }
! 
  	    if (GTK_IS_WIDGET(instance->drawing_area)) {
  		gtk_widget_show(instance->drawing_area);
  		gtk_widget_set_usize(instance->drawing_area,1,1);
+ 		while (gtk_events_pending())
+ 		        gtk_main_iteration();
+ 	    
  	    }
  #ifdef GTK2_ENABLED