Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp,1.58,1.59 plugin.cpp,1.58,1.59
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2004-03-16 01:46:41
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30159/Source Modified Files: plugin-threads.cpp plugin.cpp Log Message: Found and fixed crash in X mode Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** plugin-threads.cpp 15 Mar 2004 16:44:53 -0000 1.58 --- plugin-threads.cpp 16 Mar 2004 01:37:28 -0000 1.59 *************** *** 911,915 **** pthread_mutex_lock(&(local_td->instance->playlist_mutex)); - //handle qtNext //shouldn't this be somewhere else? --- 911,914 ---- *************** *** 926,932 **** } - - - // preview playlist local_list = local_td->list; --- 925,928 ---- *************** *** 941,944 **** --- 937,941 ---- } } + //find a node to play local_list = local_td->list; *************** *** 948,957 **** } local_list = local_list->next; - } if (local_list == NULL) { //nothing to play: will exit break; } //we have a node to play if (DEBUG) { --- 945,955 ---- } local_list = local_list->next; } + if (local_list == NULL) { //nothing to play: will exit break; } + //we have a node to play if (DEBUG) { *************** *** 1044,1049 **** pthread_cleanup_pop(0); - - while (argc < 257) argv[argc++] = NULL; --- 1042,1045 ---- *************** *** 1051,1055 **** pthread_testcancel(); - //start up mplayer pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock, --- 1047,1050 ---- Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** plugin.cpp 15 Mar 2004 16:44:54 -0000 1.58 --- plugin.cpp 16 Mar 2004 01:37:28 -0000 1.59 *************** *** 187,190 **** --- 187,191 ---- #ifdef X_ENABLED + font = NULL; logo = (Pixmap) NULL; logomask = (Pixmap) NULL; *************** *** 1121,1125 **** --- 1122,1128 ---- if (showcontrols) { panel_height = 16; + #ifdef GTK_ENABLED g_idle_add(gtkgui_draw, this); + #endif } } |