Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp,1.127,1.128 plugin.cpp,1.150,1.151
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2004-12-01 19:11:06
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv854/Source Modified Files: plugin-threads.cpp plugin.cpp Log Message: Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** plugin-threads.cpp 30 Nov 2004 02:35:31 -0000 1.127 --- plugin-threads.cpp 1 Dec 2004 19:10:56 -0000 1.128 *************** *** 942,945 **** --- 942,959 ---- } + pthread_testcancel(); + if (strstr(buffer, "No stream found") != NULL) { + snprintf(message, 1024, "%s", buffer); + #ifdef X_ENABLED + DrawUI(local_td->instance->widget, + local_td->instance, message, 0, -1); + #endif + #ifdef GTK_ENABLED + snprintf(local_td->instance->lastmessage, 1024, "%s", message); + g_idle_add(gtkgui_message, local_td->instance); + #endif + } + + pthread_testcancel(); if (strstr(buffer, "Example: mplayer -playlist ") != NULL) { Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.150 retrieving revision 1.151 diff -C2 -d -r1.150 -r1.151 *** plugin.cpp 1 Dec 2004 15:17:01 -0000 1.150 --- plugin.cpp 1 Dec 2004 19:10:56 -0000 1.151 *************** *** 311,315 **** killmplayer(this); } ! if (DEBUG) printf("mplayer dead\n"); --- 311,315 ---- killmplayer(this); } ! if (DEBUG) printf("mplayer dead\n"); *************** *** 351,356 **** if (embed_height > 125) if (image != NULL) ! gtk_widget_destroy(image); ! if (fs_event_box != NULL) gtk_widget_destroy(fs_event_box); --- 351,356 ---- if (embed_height > 125) if (image != NULL) ! gtk_widget_destroy(image); ! if (fs_event_box != NULL) gtk_widget_destroy(fs_event_box); *************** *** 1935,1939 **** fullscreen); #ifdef GTK_ENABLED ! colormap = gdk_window_get_colormap (drawing_area->window); black.red = 0; black.green = 0; --- 1935,1939 ---- fullscreen); #ifdef GTK_ENABLED ! colormap = gdk_window_get_colormap(drawing_area->window); black.red = 0; black.green = 0; *************** *** 2117,2121 **** screen = gtk_window_get_screen(GTK_WINDOW(gtkwidget)); gtk_window_set_screen(GTK_WINDOW(fs_window), screen); ! gtk_window_set_title(GTK_WINDOW(fs_window), "mplayerplug-in fullscreen"); gtk_window_fullscreen(GTK_WINDOW(fs_window)); gtk_widget_show(fs_window); --- 2117,2122 ---- screen = gtk_window_get_screen(GTK_WINDOW(gtkwidget)); gtk_window_set_screen(GTK_WINDOW(fs_window), screen); ! gtk_window_set_title(GTK_WINDOW(fs_window), ! "mplayerplug-in fullscreen"); gtk_window_fullscreen(GTK_WINDOW(fs_window)); gtk_widget_show(fs_window); *************** *** 2238,2246 **** --- 2239,2255 ---- gtk_fixed_move(GTK_FIXED(fixed_container), GTK_WIDGET(status), 10, 10); + #ifdef GTK2_ENABLED + gtk_widget_modify_bg(gtkwidget, GTK_STATE_NORMAL, &black); + if (drawing_area != NULL) + gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &black); + #endif #ifdef GTK_ENABLED gdk_window_set_background(gtkwidget->window, &black); + gdk_window_clear(gtkwidget->window); gdk_window_set_background(fs_window->window, &black); + gdk_window_clear(fs_window->window); if (drawing_area != NULL) { gdk_window_set_background(drawing_area->window, &black); + gdk_window_clear(drawing_area->window); } #endif |