Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17184/Source
Modified Files:
plugin-ui.cpp plugin.cpp
Log Message:
Fix fullscreen mode where video was not centered vertically (NP_EMBED)
Disable GTK2 widget cleanup, seems to cause crashes
Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** plugin-ui.cpp 25 Apr 2004 12:43:12 -0000 1.76
--- plugin-ui.cpp 28 Apr 2004 18:54:57 -0000 1.77
***************
*** 1070,1076 ****
instance->movie_height);
gtk_widget_hide(GTK_WIDGET(instance->progress_bar));
! if ((instance->movie_width + 10 >= instance->window_width) || (instance->movie_height + 100 >= instance->window_height))
! gtk_fixed_put(GTK_FIXED(instance->fixed_container),
! instance->drawing_area, 0, 0);
}
return FALSE;
--- 1070,1078 ----
instance->movie_height);
gtk_widget_hide(GTK_WIDGET(instance->progress_bar));
! if (instance->mode == NP_FULL)
! if ((instance->movie_width + 10 >= instance->window_width) || (instance->movie_height + 100 >= instance->window_height))
! if (instance->fullscreen == 0)
! gtk_fixed_put(GTK_FIXED(instance->fixed_container),
! instance->drawing_area, 0, 0);
}
return FALSE;
Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** plugin.cpp 25 Apr 2004 13:20:23 -0000 1.111
--- plugin.cpp 28 Apr 2004 18:54:57 -0000 1.112
***************
*** 306,310 ****
#endif
! #ifdef GTK2_ENABLED
if (controlwindow == 0) {
if (panel_drawn == 1) {
--- 306,310 ----
#endif
! #ifdef NOT_ENABLED // probably causes a GTK memory leak, but stops weird crash and warnings
if (controlwindow == 0) {
if (panel_drawn == 1) {
***************
*** 1917,1929 ****
}
!
if (movie_height != 0 && movie_width != 0) {
! disp_y = x * movie_height / movie_width;
} else {
! if (mode == NP_EMBED) {
! disp_y = x * embed_height / embed_width;
! } else {
! disp_y = x * window_height / window_width;
! }
}
pos_y = (y - disp_y) / 2;
--- 1917,1927 ----
}
!
! disp_y = y;
if (movie_height != 0 && movie_width != 0) {
! disp_y = ((long int)(x * movie_height)) / movie_width;
} else {
! if (win_width != 0)
! disp_y = ((long int)(x * win_height)) / win_width;
}
pos_y = (y - disp_y) / 2;
***************
*** 1936,1939 ****
--- 1934,1940 ----
GTK_WIDGET(drawing_area), 0, pos_y);
+ if (DEBUG > 1)
+ printf("x=%i, y=%i, movie_width=%i, movie_height=%i, disp_y=%i, pos_y=%i\n",x,y,movie_width,movie_height,disp_y,pos_y);
+
if (image != NULL)
gtk_widget_hide(GTK_WIDGET(image));
|