Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp, 1.123, 1.124 plugin-setup.h, 1.58, 1.5
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2006-08-20 16:52:49
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3763/Source Modified Files: plugin-setup.cpp plugin-setup.h plugin-support.cpp Log Message: Added workaround for dumb href urls are onegoodmove.org Index: plugin-setup.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.h,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** plugin-setup.h 17 Aug 2006 18:48:36 -0000 1.58 --- plugin-setup.h 20 Aug 2006 16:52:46 -0000 1.59 *************** *** 174,178 **** extern void remove_quotes(char *url); void killmplayer(nsPluginInstance * instance); ! void fullyQualifyURL(nsPluginInstance * instance, char *item, char *localitem); int toolkitOk(NPP instance, int *mozilla_toolkit, int *plugin_toolkit); #ifdef DPMSExtension --- 174,178 ---- extern void remove_quotes(char *url); void killmplayer(nsPluginInstance * instance); ! void fullyQualifyURL(nsPluginInstance * instance, char *initem, char *localitem); int toolkitOk(NPP instance, int *mozilla_toolkit, int *plugin_toolkit); #ifdef DPMSExtension Index: plugin-support.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-support.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** plugin-support.cpp 17 Aug 2006 18:48:36 -0000 1.99 --- plugin-support.cpp 20 Aug 2006 16:52:46 -0000 1.100 *************** *** 607,623 **** } ! void fullyQualifyURL(nsPluginInstance * instance, char *item, char *localitem) { char tmpdir[1024]; char *tmp; if (DEBUG > 1) printf("in fullyQualifyURL\n"); ! if (DEBUG > 1) printf("item: %s\nbaseurl: %s\nhostname: %s\n", item, instance->baseurl, instance->hostname); ! if (!isMms(item, instance->nomediacache)) { if ((strncasecmp(item, "http", 4) != 0) --- 607,639 ---- } ! void fullyQualifyURL(nsPluginInstance * instance, char *initem, char *localitem) { char tmpdir[1024]; char *tmp; + char * item; if (DEBUG > 1) printf("in fullyQualifyURL\n"); + + item = strdup(initem); ! tmp = strstr(item, "<"); ! if (tmp != NULL) { ! strlcpy(item,tmp+1,1024); ! tmp = strstr(item, ">"); ! if (DEBUG > 1) ! printf("item = %p tmp = %p diff = %i\n",item,tmp, (tmp-item)); ! if (tmp != NULL) { ! strlcpy(tmp,"",1024); ! } ! if (DEBUG > 1) ! printf("item = %s\n",item); ! } ! ! if (DEBUG > 1) printf("item: %s\nbaseurl: %s\nhostname: %s\n", item, instance->baseurl, instance->hostname); ! if (!isMms(item, instance->nomediacache)) { if ((strncasecmp(item, "http", 4) != 0) *************** *** 664,667 **** --- 680,684 ---- } + if (strncasecmp(localitem, "file://", 7) == 0) { // chop off file:// *************** *** 696,702 **** } ! if (DEBUG >= 2) printf("fqu result: %s\n", localitem); ! } --- 713,720 ---- } ! free(item); ! if (DEBUG > 1) printf("fqu result: %s\n", localitem); ! } Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** plugin-setup.cpp 4 Aug 2006 13:25:27 -0000 1.123 --- plugin-setup.cpp 20 Aug 2006 16:52:46 -0000 1.124 *************** *** 616,619 **** --- 616,622 ---- fullyQualifyURL(instance, parameters->argv[i], instance->href); + if (strstr(parameters->argv[i], "<") != NULL) + fullyQualifyURL(instance, parameters->argv[i], + instance->href); instance->state = STATE_HAVEURL; } |