Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-list.cpp, 1.67, 1.68 plugin-setup.h, 1.63, 1.64 p
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2006-12-16 15:00:00
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19778/Source Modified Files: plugin-list.cpp plugin-setup.h plugin-threads.cpp Log Message: Improve entryref handling in ASX files Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.261 retrieving revision 1.262 diff -C2 -d -r1.261 -r1.262 *** plugin-threads.cpp 14 Dec 2006 14:49:07 -0000 1.261 --- plugin-threads.cpp 16 Dec 2006 14:59:55 -0000 1.262 *************** *** 1419,1424 **** ("----player thread: breaking read loop - Exiting\n"); if (local_td->instance->mediaPercent == 0) { ! result->tryagain = TRYAGAIN_TRUE; ! result->errorcode = ERROR_USE_URL; } else { --- 1419,1432 ---- ("----player thread: breaking read loop - Exiting\n"); if (local_td->instance->mediaPercent == 0) { ! if ((strncmp(local_url, "mms://", 6) == 0) || ! strncmp(local_url, "http://", 7) == 0) { ! ! result->tryagain = TRYAGAIN_FALSE; ! result->errorcode = ERROR_NO_ERROR; ! ! } else { ! result->tryagain = TRYAGAIN_TRUE; ! result->errorcode = ERROR_USE_URL; ! } } else { Index: plugin-list.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** plugin-list.cpp 12 Dec 2006 18:52:44 -0000 1.67 --- plugin-list.cpp 16 Dec 2006 14:59:52 -0000 1.68 *************** *** 604,608 **** } else { if ( entry < href ) { ! entry_counter++; if (DEBUG) printf("incrementing entry counter\n"); --- 604,608 ---- } else { if ( entry < href ) { ! entry_counter= highest_entry(instance->list) + 1; if (DEBUG) printf("incrementing entry counter\n"); *************** *** 635,644 **** continue; } if (memmem(p - 9, 9, "entryref", 8) != NULL) { if (DEBUG > 1) printf("found entryref in ASX\n"); ! p = p + 4; ! continue; } } p = p + 4; --- 635,647 ---- continue; } + if (memmem(p - 9, 9, "entryref", 8) != NULL) { if (DEBUG > 1) printf("found entryref in ASX\n"); ! //p = p + 4; ! //continue; ! //entry_counter = highest_entry(instance->list) + 1; } + } p = p + 4; *************** *** 1038,1039 **** --- 1041,1063 ---- } + int highest_entry(Node * l) { + + Node *n; + int entry = -1; + + if (DEBUG) + printf("highest_entry\n"); + + n = l; + while (n != NULL) { + if (n->entry > entry) { + entry = n->entry; + } + n = n->next; + } + + return entry; + } + + + Index: plugin-setup.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.h,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** plugin-setup.h 14 Dec 2006 00:21:34 -0000 1.63 --- plugin-setup.h 16 Dec 2006 14:59:55 -0000 1.64 *************** *** 197,200 **** --- 197,201 ---- void printList(Node * l); void markPlayed(Node * l); + int highest_entry(Node * l); //plugin-ui.cpp |