[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-list.cpp,1.43,1.44 plugin-setup.cpp,1.44,1.45 plug
Brought to you by:
kdekorte
Menu
▾
▴
[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-list.cpp,1.43,1.44 plugin-setup.cpp,1.44,1.45 plugin-threads.cpp,1.120,1.121 plugin.cpp,1.142,1.143 plugin.h,1.51,1.52
|
From: Kevin D. <kde...@us...> - 2004-10-29 14:48:19
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30475/Source Modified Files: plugin-list.cpp plugin-setup.cpp plugin-threads.cpp plugin.cpp plugin.h Log Message: Applied sync A/V options patch from Yasuhiro Matsumoto Applied some Sun JDS patches from hiroa - did not apply all since they used global variables Index: plugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.h,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** plugin.h 20 Sep 2004 20:47:02 -0000 1.51 --- plugin.h 29 Oct 2004 14:48:05 -0000 1.52 *************** *** 277,280 **** --- 277,283 ---- int moz_toolkit; int plug_toolkit; + int framedrop; + int autosync; + int mc; // JavaScript State Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** plugin-setup.cpp 25 Oct 2004 17:59:14 -0000 1.44 --- plugin-setup.cpp 29 Oct 2004 14:48:05 -0000 1.45 *************** *** 374,382 **** } ! if (variable == NPPVpluginNeedsXEmbed) { ! *((PRBool *)value) = PR_TRUE; } ! if ((variable != NPPVpluginNameString) && (variable != NPPVpluginDescriptionString) --- 374,382 ---- } ! if (variable == NPPVpluginNeedsXEmbed) { ! *((PRBool *) value) = PR_TRUE; } ! if ((variable != NPPVpluginNameString) && (variable != NPPVpluginDescriptionString) *************** *** 804,807 **** --- 804,833 ---- } + if (strncasecmp(buffer, "framedrop", 9) == 0) { + snprintf(parse, 1000, "%s", strtok(buffer, "=")); + snprintf(parse, 1000, "%s", strtok(NULL, "=")); + sscanf(parse, "%i", &instance->framedrop); + if (instance->framedrop != 0) + instance->framedrop = 1; + continue; + } + + if (strncasecmp(buffer, "autosync", 8) == 0) { + snprintf(parse, 1000, "%s", strtok(buffer, "=")); + snprintf(parse, 1000, "%s", strtok(NULL, "=")); + sscanf(parse, "%i", &instance->autosync); + if (instance->autosync < 0) + instance->autosync = 0; + continue; + } + + if (strncasecmp(buffer, "mc", 2) == 0) { + snprintf(parse, 1000, "%s", strtok(buffer, "=")); + snprintf(parse, 1000, "%s", strtok(NULL, "=")); + sscanf(parse, "%i", &instance->mc); + if (instance->mc < 0) + instance->mc = 0; + continue; + } if (strncasecmp(buffer, "osdlevel", 8) == 0) { Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** plugin-threads.cpp 28 Oct 2004 13:36:24 -0000 1.120 --- plugin-threads.cpp 29 Oct 2004 14:48:05 -0000 1.121 *************** *** 414,426 **** instance->td->argv[i++] = strdup(buffer); } - // if (instance->cachesize > 0) { ! // snprintf(buffer, 1024, "-cache"); ! // instance->td->argv[i++] = strdup(buffer); ! // snprintf(buffer, 1024, "%i", instance->cachesize); ! // instance->td->argv[i++] = strdup(buffer); // } else { ! // snprintf(buffer, 1024, "-nocache"); ! // instance->td->argv[i++] = strdup(buffer); // } --- 414,425 ---- instance->td->argv[i++] = strdup(buffer); } // if (instance->cachesize > 0) { ! // snprintf(buffer, 1024, "-cache"); ! // instance->td->argv[i++] = strdup(buffer); ! // snprintf(buffer, 1024, "%i", instance->cachesize); ! // instance->td->argv[i++] = strdup(buffer); // } else { ! // snprintf(buffer, 1024, "-nocache"); ! // instance->td->argv[i++] = strdup(buffer); // } *************** *** 456,459 **** --- 455,477 ---- } + if (instance->framedrop == 1) { + snprintf(buffer, 1024, "-framedrop"); + instance->td->argv[i++] = strdup(buffer); + } + + if (instance->autosync > 0) { + snprintf(buffer, 1024, "-autosync"); + instance->td->argv[i++] = strdup(buffer); + snprintf(buffer, 1024, "%i", instance->autosync); + instance->td->argv[i++] = strdup(buffer); + } + + if (instance->mc > 0) { + snprintf(buffer, 1024, "-mc"); + instance->td->argv[i++] = strdup(buffer); + snprintf(buffer, 1024, "%i", instance->mc); + instance->td->argv[i++] = strdup(buffer); + } + snprintf(buffer, 1024, "-osdlevel"); instance->td->argv[i++] = strdup(buffer); *************** *** 573,577 **** int playNode(ThreadData * local_td, Node * local_list, char *local_url, ! int local_mmsstream, int *usefps, int *nomouseinput, int *maybeplaylist) { --- 591,596 ---- int playNode(ThreadData * local_td, Node * local_list, char *local_url, ! int local_mmsstream, int *usefps, int *nomouseinput, ! int *maybeplaylist) { *************** *** 902,910 **** if (strstr(buffer, "Example: mplayer -playlist ") != NULL) { ! if (*maybeplaylist == 0) { ! tryagain = TRYAGAIN_TRUE; ! *maybeplaylist = 1; ! } else ! tryagain = TRYAGAIN_FALSE; break; } --- 921,929 ---- if (strstr(buffer, "Example: mplayer -playlist ") != NULL) { ! if (*maybeplaylist == 0) { ! tryagain = TRYAGAIN_TRUE; ! *maybeplaylist = 1; ! } else ! tryagain = TRYAGAIN_FALSE; break; } *************** *** 973,985 **** break; } - // Possible work around for cinema now site - // if (strstr(buffer, "ASF file format detected") != NULL) { - // tryagain = TRYAGAIN_TRUE; - // local_list->playlist = 1; - // break; - // } - if (strstr(buffer, "Exiting") != NULL) { if (DEBUG) --- 992,1003 ---- break; } + // Possible work around for cinema now site + // if (strstr(buffer, "ASF file format detected") != NULL) { + // tryagain = TRYAGAIN_TRUE; + // local_list->playlist = 1; + // break; + // } if (strstr(buffer, "Exiting") != NULL) { if (DEBUG) *************** *** 1086,1090 **** int usefps; int nomouseinput; ! int maybeplaylist; int listempty; --- 1104,1108 ---- int usefps; int nomouseinput; ! int maybeplaylist; int listempty; *************** *** 1330,1334 **** } local_td->argv[argc++] = strdup("-cache"); ! snprintf(message, 1024, "%i", local_td->instance->cachesize); local_td->argv[argc++] = strdup(message); } else { --- 1348,1353 ---- } local_td->argv[argc++] = strdup("-cache"); ! snprintf(message, 1024, "%i", ! local_td->instance->cachesize); local_td->argv[argc++] = strdup(message); } else { *************** *** 1377,1381 **** tryagain = playNode(local_td, local_list, local_url, ! local_mmsstream, &usefps, &nomouseinput, &maybeplaylist); if (DEBUG) --- 1396,1401 ---- tryagain = playNode(local_td, local_list, local_url, ! local_mmsstream, &usefps, &nomouseinput, ! &maybeplaylist); if (DEBUG) Index: plugin-list.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** plugin-list.cpp 3 Oct 2004 15:13:41 -0000 1.43 --- plugin-list.cpp 29 Oct 2004 14:48:05 -0000 1.44 *************** *** 51,61 **** { char *tmp = NULL; ! if (n != NULL) { if (n->copy == 0) { if ((n->remove == 1) || (n->remove == 0 && n->play == 0)) { if (strlen(n->fname) != 0) { ! if (strncasecmp(n->fname,"sdp://",6) == 0) { ! tmp = strdup(n->fname); strcpy(n->fname, tmp + 6); free(tmp); --- 51,61 ---- { char *tmp = NULL; ! if (n != NULL) { if (n->copy == 0) { if ((n->remove == 1) || (n->remove == 0 && n->play == 0)) { if (strlen(n->fname) != 0) { ! if (strncasecmp(n->fname, "sdp://", 6) == 0) { ! tmp = strdup(n->fname); strcpy(n->fname, tmp + 6); free(tmp); Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** plugin.cpp 3 Oct 2004 15:13:41 -0000 1.142 --- plugin.cpp 29 Oct 2004 14:48:05 -0000 1.143 *************** *** 246,249 **** --- 246,252 ---- qt_speed = SPEED_MED; cache_percent = 25; + framedrop = 0; + autosync = 0; + mc = 0; // JavaScript *************** *** 1048,1052 **** tmp = strdup(n->fname); strcpy(n->fname, "sdp://"); ! strcat(n->fname,tmp); free(tmp); } --- 1051,1055 ---- tmp = strdup(n->fname); strcpy(n->fname, "sdp://"); ! strcat(n->fname, tmp); free(tmp); } *************** *** 1531,1534 **** --- 1534,1540 ---- } + if (threadlaunched == 0) + return; + pthread_mutex_lock(&control_mutex); if (paused == 1) { *************** *** 1601,1604 **** --- 1607,1612 ---- void nsPluginInstance::Pause() { + if (threadlaunched == 0) + return; pthread_mutex_lock(&control_mutex); if (paused == 0) { *************** *** 1617,1620 **** --- 1625,1630 ---- void nsPluginInstance::Stop() { + if (threadlaunched == 0) + return; pthread_mutex_lock(&control_mutex); if (DEBUG) *************** *** 1633,1636 **** --- 1643,1648 ---- void nsPluginInstance::Quit() { + if (threadlaunched == 0) + return; pthread_mutex_lock(&control_mutex); if (DEBUG) *************** *** 1647,1650 **** --- 1659,1664 ---- void nsPluginInstance::FastForward() { + if (threadlaunched == 0) + return; pthread_mutex_lock(&control_mutex); js_state = JS_STATE_SCANFORWARD; *************** *** 1661,1665 **** void nsPluginInstance::FastReverse() { ! pthread_mutex_lock(&control_mutex); js_state = JS_STATE_SCANREVERSE; --- 1675,1680 ---- void nsPluginInstance::FastReverse() { ! if (threadlaunched == 0) ! return; pthread_mutex_lock(&control_mutex); js_state = JS_STATE_SCANREVERSE; *************** *** 1678,1681 **** --- 1693,1698 ---- char command[32]; + if (threadlaunched == 0) + return; pthread_mutex_lock(&control_mutex); if (paused == 1) *************** *** 1860,1867 **** int win_height, win_width; if (DEBUG) printf("in SetFullscreen with %i\nfullscreen = %i\n", value, fullscreen); - #ifdef GTK_ENABLED black.red = 0; --- 1877,1886 ---- int win_height, win_width; + if (threadlaunched == 0) + return; + if (DEBUG) printf("in SetFullscreen with %i\nfullscreen = %i\n", value, fullscreen); #ifdef GTK_ENABLED black.red = 0; |