[Mplayerplug-in-cvs] mplayerplug-in/Source nsScriptablePeer.h,1.10,1.11 plugin-threads.cpp,1.32,1.33
Brought to you by:
kdekorte
Menu
▾
▴
[Mplayerplug-in-cvs] mplayerplug-in/Source nsScriptablePeer.h,1.10,1.11 plugin-threads.cpp,1.32,1.33 plugin-ui.cpp,1.34,1.35 plugin.cpp,1.29,1.30
|
From: <kde...@us...> - 2004-03-04 16:03:27
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3196/Source Modified Files: nsScriptablePeer.h plugin-threads.cpp plugin-ui.cpp plugin.cpp Log Message: Index: nsScriptablePeer.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsScriptablePeer.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** nsScriptablePeer.h 2 Mar 2004 20:15:55 -0000 1.10 --- nsScriptablePeer.h 4 Mar 2004 15:42:09 -0000 1.11 *************** *** 60,66 **** *aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT; return NS_OK; ! } ! NS_IMETHOD GetImplementationLanguage(PRUint32 * ! aImplementationLanguage) { *aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS; return NS_OK; --- 60,65 ---- *aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT; return NS_OK; ! } NS_IMETHOD GetImplementationLanguage(PRUint32 * ! aImplementationLanguage) { *aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS; return NS_OK; Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** plugin-threads.cpp 4 Mar 2004 14:57:41 -0000 1.32 --- plugin-threads.cpp 4 Mar 2004 15:42:09 -0000 1.33 *************** *** 65,73 **** #endif ! // if (instance->td->list == NULL) { ! // pthread_mutex_lock(&(instance->playlist_mutex)); ! // instance->td->list = newNode(); ! // pthread_mutex_unlock(&(instance->playlist_mutex)); ! // } if (instance->href) { --- 65,71 ---- #endif ! if (instance->td->list == NULL) { ! instance->td->list = instance->list; ! } if (instance->href) { *************** *** 138,145 **** snprintf(instance->td->argv[i++], 1024, "-wid"); #ifdef X_ENABLED ! // instance->player_window = ! // XCreateSimpleWindow(instance->display, instance->window, 0, ! // 0, instance->embed_width, ! // instance->embed_height, 0, 0, 0); snprintf(instance->td->argv[i++], 1024, "0x%x", (int) instance->window); --- 136,143 ---- snprintf(instance->td->argv[i++], 1024, "-wid"); #ifdef X_ENABLED ! // instance->player_window = ! // XCreateSimpleWindow(instance->display, instance->window, 0, ! // 0, instance->embed_width, ! // instance->embed_height, 0, 0, 0); snprintf(instance->td->argv[i++], 1024, "0x%x", (int) instance->window); *************** *** 351,354 **** --- 349,354 ---- pthread_cond_wait(&(local_td->instance->playlist_complete_cond), &(local_td->instance->playlist_mutex)); + if (DESTROYED) + return NULL; if (local_td == NULL) return NULL; *************** *** 413,416 **** --- 413,419 ---- copyNode(copy, local_list); pthread_mutex_unlock(&(local_td->instance->playlist_mutex)); + if (DESTROYED) + return NULL; + while (copy != NULL) { tryagain = 0; *************** *** 542,547 **** #endif #ifdef GTK_ENABLED ! snprintf(local_td->instance->lastmessage, 1024, "%s", ! message); g_idle_add(gtkgui_message, local_td->instance); local_td->instance->percent = --- 545,550 ---- #endif #ifdef GTK_ENABLED ! snprintf(local_td->instance->lastmessage, 1024, ! "%s", message); g_idle_add(gtkgui_message, local_td->instance); local_td->instance->percent = *************** *** 563,568 **** #endif #ifdef GTK_ENABLED ! snprintf(local_td->instance->lastmessage, 1024, "%s", ! message); g_idle_add(gtkgui_message, local_td->instance); #endif --- 566,571 ---- #endif #ifdef GTK_ENABLED ! snprintf(local_td->instance->lastmessage, 1024, ! "%s", message); g_idle_add(gtkgui_message, local_td->instance); #endif *************** *** 584,601 **** local_list->play_y; ! if (local_td->instance->player_window != 0) { - #ifdef X_ENABLED - XResizeWindow(local_td->instance->display, - local_td->instance-> - player_window, - local_list->play_x, - local_td->instance-> - embed_height - - local_td->instance-> - panel_height); - #endif - #ifdef GTK_ENABLED local_td->instance->movie_height = local_list->play_y; --- 587,593 ---- local_list->play_y; ! #ifdef GTK_ENABLED if (local_td->instance->player_window != 0) { local_td->instance->movie_height = local_list->play_y; *************** *** 606,612 **** g_idle_add(gtkgui_draw, local_td->instance); - #endif - } if (DEBUG) printf("panel height in thread = %i\n", --- 598,603 ---- g_idle_add(gtkgui_draw, local_td->instance); } + #endif if (DEBUG) printf("panel height in thread = %i\n", *************** *** 646,651 **** #endif #ifdef GTK_ENABLED ! snprintf(local_td->instance->lastmessage, 1024, "%s", ! message); g_idle_add(gtkgui_message, local_td->instance); #endif --- 637,642 ---- #endif #ifdef GTK_ENABLED ! snprintf(local_td->instance->lastmessage, 1024, ! "%s", message); g_idle_add(gtkgui_message, local_td->instance); #endif Index: plugin-ui.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** plugin-ui.cpp 4 Mar 2004 14:57:41 -0000 1.34 --- plugin-ui.cpp 4 Mar 2004 15:42:09 -0000 1.35 *************** *** 592,603 **** #endif - #ifdef X_ENABLED - // if (instance->player_window != 0) { - // if (instance->threadsignaled == 1) - // XDestroyWindow(instance->display, instance->player_window); - // instance->player_window = 0; - // } - #endif - pthread_mutex_unlock(&(instance->playlist_mutex)); } else { --- 592,595 ---- Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** plugin.cpp 3 Mar 2004 23:14:46 -0000 1.29 --- plugin.cpp 4 Mar 2004 15:42:09 -0000 1.30 *************** *** 159,163 **** list = newNode(); td = (ThreadData *) NPN_MemAlloc(sizeof(ThreadData)); ! td->list = newNode(); td->instance = NULL; control = NULL; --- 159,163 ---- list = newNode(); td = (ThreadData *) NPN_MemAlloc(sizeof(ThreadData)); ! td->list = NULL; td->instance = NULL; control = NULL; *************** *** 380,386 **** --- 380,388 ---- deleteList(td->list); td->list = NULL; + list = NULL; } if (td != NULL) { + td->instance = NULL; NPN_MemFree(td); td = NULL; |