Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-support.cpp,1.74,1.75 plugin.cpp,1.206,1.207
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2005-07-22 17:34:31
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21417/Source Modified Files: plugin-support.cpp plugin.cpp Log Message: Fix playlist problems resulting from multiprotocol fix Index: plugin-support.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-support.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** plugin-support.cpp 21 Jul 2005 23:31:28 -0000 1.74 --- plugin-support.cpp 22 Jul 2005 17:34:21 -0000 1.75 *************** *** 79,83 **** } } ! hostname[i] = '\0'; if (DEBUG > 1) printf("exiting getURLHostname with %s\n", hostname); --- 79,88 ---- } } ! if (i == 0) { ! free(hostname); ! hostname = NULL; ! } else { ! hostname[i] = '\0'; ! } if (DEBUG > 1) printf("exiting getURLHostname with %s\n", hostname); *************** *** 306,313 **** if (tmp1 != NULL && tmp2 != NULL) { if (strcmp(tmp1, tmp2) == 0) { ! if (strcmp(protocol1, protocol2) == 0) { ret = 0; } else { ! ret = -1; } } else { --- 311,322 ---- if (tmp1 != NULL && tmp2 != NULL) { if (strcmp(tmp1, tmp2) == 0) { ! if ((strncmp(protocol1,"file://",7) == 0) || (strncmp(protocol2,"file://",7) == 0)) { ret = 0; } else { ! if (strcmp(protocol1, protocol2) == 0){ ! ret = 0; ! } else { ! ret = -1; ! } } } else { *************** *** 569,572 **** --- 578,584 ---- && (strncasecmp(item, "file", 4) != 0)) { + if (DEBUG > 1) + printf("not http and not file\n"); + if (item[0] != '/') { strlcpy(tmpdir, item, 1024); // reuse the buffer *************** *** 577,583 **** } else { if (instance->hostname != NULL) { ! snprintf(tmpdir, 1024, "http://%s%s", ! instance->hostname, item); ! strlcpy(localitem, tmpdir, 1024); } else { // first char == / and hostname is null, sounds like a filename --- 589,600 ---- } else { if (instance->hostname != NULL) { ! if (fexists(item) == 0 ) { ! snprintf(tmpdir, 1024, "http://%s%s", ! instance->hostname, item); ! strlcpy(localitem, tmpdir, 1024); ! } else { ! // first char == / and hostname is null, sounds like a filename ! strlcpy(localitem, item, 1024); ! } } else { // first char == / and hostname is null, sounds like a filename Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.206 retrieving revision 1.207 diff -C2 -d -r1.206 -r1.207 *** plugin.cpp 20 Jul 2005 15:06:57 -0000 1.206 --- plugin.cpp 22 Jul 2005 17:34:21 -0000 1.207 *************** *** 1426,1430 **** n = td->list; while (n != NULL) { ! if (0) printf("WR:\nn->url= %s\nstream->url= %s\n", n->url, stream->url); --- 1426,1430 ---- n = td->list; while (n != NULL) { ! if (DEBUG > 1) printf("WR:\nn->url= %s\nstream->url= %s\n", n->url, stream->url); |