Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23656/Source
Modified Files:
plugin-list.cpp plugin-ui.cpp
Log Message:
Improved ASX detection
Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -C2 -d -r1.240 -r1.241
*** plugin-ui.cpp 10 Dec 2006 14:10:51 -0000 1.240
--- plugin-ui.cpp 12 Dec 2006 18:52:44 -0000 1.241
***************
*** 853,856 ****
--- 853,858 ----
{
+ int fs_state;
+
if (DEBUG)
printf("fs_callback clicked\n");
***************
*** 862,865 ****
--- 864,869 ----
return FALSE;
+ fs_state = instance->fullscreen;
+
if (instance->controlsvisible == 1) {
if (instance->panel_height > 16)
***************
*** 903,906 ****
--- 907,916 ----
}
+ // printf("****\nfs_state = %i\nfullscreen = %i\n****\n",fs_state,instance->fullscreen);
+ while(gtk_events_pending()) gtk_main_iteration();
+ if (fs_state == 1 && instance->fullscreen == 0) {
+ return TRUE;
+ }
+
return FALSE;
***************
*** 2122,2125 ****
--- 2132,2136 ----
instance->SetFullscreen(instance->fullscreen);
+ // printf("****\nfs_state = %i\nfullscreen = %i\n****\n",fs_state,instance->fullscreen);
if (fs_state == 1 && instance->fullscreen == 0) {
return TRUE;
Index: plugin-list.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** plugin-list.cpp 31 Oct 2006 00:02:38 -0000 1.66
--- plugin-list.cpp 12 Dec 2006 18:52:44 -0000 1.67
***************
*** 590,594 ****
lowercase((char *) buffer_lower);
p = buffer_lower;
! if (memmem(p, size, "<asx version=\"3.0\">", strlen("<asx version=\"3.0\">")) && found == 0) {
if (DEBUG)
printf("found ASX 3.0file\n");
--- 590,594 ----
lowercase((char *) buffer_lower);
p = buffer_lower;
! if ((memmem(p, size, "<asx version=\"3.0\">", strlen("<asx version=\"3.0\">")) || memmem(p, size, "<asx version = \"3.0\">", strlen("<asx version = \"3.0\">"))) && found == 0) {
if (DEBUG)
printf("found ASX 3.0file\n");
|