Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.56,1.57 plugin.cpp,1.162,1.163
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2004-12-13 17:20:40
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32398/Source Modified Files: plugin-setup.cpp plugin.cpp Log Message: Fix issue with http://www.camerata-trajectina.nl/, autoplay and buttons showing up Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** plugin-setup.cpp 13 Dec 2004 16:15:25 -0000 1.56 --- plugin-setup.cpp 13 Dec 2004 17:20:13 -0000 1.57 *************** *** 228,234 **** if (enable_real == 0 && enable_qt == 1) { ! if (enable_smil == 1) ! strlcat(MimeTypes, ! "application/smil:smil:SMIL;", sizeof(MimeTypes)); } --- 228,234 ---- if (enable_real == 0 && enable_qt == 1) { ! if (enable_smil == 1) ! strlcat(MimeTypes, ! "application/smil:smil:SMIL;", sizeof(MimeTypes)); } *************** *** 395,399 **** *((PRBool *) value) = PR_FALSE; #endif ! #ifdef GTK1_ENABLED *((PRBool *) value) = PR_TRUE; #endif --- 395,399 ---- *((PRBool *) value) = PR_FALSE; #endif ! #ifdef GTK1_ENABLED *((PRBool *) value) = PR_TRUE; #endif *************** *** 525,529 **** } ! if (strncasecmp(parameters->argn[i], "autostart", 9) == 0) { lowercase(parameters->argv[i]); --- 525,530 ---- } ! if ((strncasecmp(parameters->argn[i], "autostart", 9) == 0) ! || (strncasecmp(parameters->argn[i], "autoplay", 8) == 0)) { lowercase(parameters->argv[i]); Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** plugin.cpp 13 Dec 2004 16:15:26 -0000 1.162 --- plugin.cpp 13 Dec 2004 17:20:13 -0000 1.163 *************** *** 1146,1149 **** --- 1146,1156 ---- signalPlayerThread(this); threadsignaled = 1; + } else { + if (showcontrols) { + panel_height = 16; + #ifdef GTK_ENABLED + g_idle_add(gtkgui_draw, this); + #endif + } } } *************** *** 2157,2163 **** y = rect.height; gtk_widget_realize(fs_window); ! FILE *fslog; ! gint wx, wy, wwidth, wheight; // wdepth; fslog = fopen("/tmp/mplayerplug-in.fs.log", "a+"); gtk_window_get_position(GTK_WINDOW(fs_window), &wx, &wy); --- 2164,2170 ---- y = rect.height; gtk_widget_realize(fs_window); ! FILE *fslog; ! gint wx, wy, wwidth, wheight; // wdepth; fslog = fopen("/tmp/mplayerplug-in.fs.log", "a+"); gtk_window_get_position(GTK_WINDOW(fs_window), &wx, &wy); *************** *** 2167,2171 **** fprintf(fslog, "width, height values %i,%i\n", wwidth, wheight); ! fprintf(fslog, "screen width, height values %i, %i\n", gdk_screen_get_width(screen), --- 2174,2178 ---- fprintf(fslog, "width, height values %i,%i\n", wwidth, wheight); ! fprintf(fslog, "screen width, height values %i, %i\n", gdk_screen_get_width(screen), *************** *** 2184,2188 **** fprintf(fslog, "width, height values %i,%i\n", wwidth, wheight); ! gtk_window_move(GTK_WINDOW(fs_window), wx, wy); gtk_window_get_position(GTK_WINDOW(fs_window), &wx, &wy); --- 2191,2195 ---- fprintf(fslog, "width, height values %i,%i\n", wwidth, wheight); ! gtk_window_move(GTK_WINDOW(fs_window), wx, wy); gtk_window_get_position(GTK_WINDOW(fs_window), &wx, &wy); |