[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.h,1.7,1.8 plugin-ui.cpp,1.9,1.10 plugin.cpp,
Brought to you by:
kdekorte
Menu
▾
▴
[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.h,1.7,1.8 plugin-ui.cpp,1.9,1.10 plugin.cpp,1.8,1.9 plugin.h,1.7,1.8
|
From: <kde...@us...> - 2004-02-21 17:57:06
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4412/Source Modified Files: plugin-setup.h plugin-ui.cpp plugin.cpp plugin.h Log Message: gtk1 configure option now compiles, but will crash Index: plugin-setup.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** plugin-setup.h 20 Feb 2004 20:14:26 -0000 1.7 --- plugin-setup.h 21 Feb 2004 17:45:04 -0000 1.8 *************** *** 8,15 **** #include <unistd.h> ! #ifdef GTK2_ENABLED #include <gdk/gdkx.h> #include <gtk/gtk.h> #endif #define STATE_RESET 0 --- 8,19 ---- #include <unistd.h> ! #ifdef GTK_ENABLED #include <gdk/gdkx.h> #include <gtk/gtk.h> #endif + #ifdef GTK1_ENABLED + #include <gdk/gdk.h> + extern GMutex *gdk_threads_mutex; + #endif #define STATE_RESET 0 *************** *** 132,136 **** extern void DestroyCB(Widget widget, XtPointer client_data, XtPointer call_data); ! #ifdef GTK2_ENABLED gboolean gtkwin_expose(GtkWidget * widget, GdkEventExpose * event, nsPluginInstance * instance); --- 136,140 ---- extern void DestroyCB(Widget widget, XtPointer client_data, XtPointer call_data); ! #ifdef GTK_ENABLED gboolean gtkwin_expose(GtkWidget * widget, GdkEventExpose * event, nsPluginInstance * instance); Index: plugin-ui.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** plugin-ui.cpp 21 Feb 2004 15:09:48 -0000 1.9 --- plugin-ui.cpp 21 Feb 2004 17:45:04 -0000 1.10 *************** *** 10,13 **** --- 10,14 ---- #ifdef X_ENABLED + #include "../pixmaps/progress_left.xpm" #include "../pixmaps/progress_middle.xpm" *************** *** 16,20 **** #endif ! #ifdef GTK2_ENABLED // 32 x 24 button pixmaps #include "../pixmaps/play_down.xpm" --- 17,36 ---- #endif ! // these are only used in X mode, but we keep them defined ! // so we don't get compile errors ! static XFontStruct *font = NULL; ! static Pixmap logo = (Pixmap) NULL, logomask = (Pixmap) NULL; ! static Pixmap progress_left = (Pixmap) NULL, progress_leftmask = ! (Pixmap) NULL; ! static Pixmap progress_middle = (Pixmap) NULL, progress_middlemask = ! (Pixmap) NULL; ! static Pixmap progress_right = (Pixmap) NULL, progress_rightmask = ! (Pixmap) NULL; ! static Pixmap progress_fill = (Pixmap) NULL, progress_fillmask = ! (Pixmap) NULL; ! ! ! ! #ifdef GTK_ENABLED // 32 x 24 button pixmaps #include "../pixmaps/play_down.xpm" *************** *** 47,60 **** #endif ! static XFontStruct *font = NULL; ! static Pixmap logo = (Pixmap) NULL, logomask = (Pixmap) NULL; ! static Pixmap progress_left = (Pixmap) NULL, progress_leftmask = ! (Pixmap) NULL; ! static Pixmap progress_middle = (Pixmap) NULL, progress_middlemask = ! (Pixmap) NULL; ! static Pixmap progress_right = (Pixmap) NULL, progress_rightmask = ! (Pixmap) NULL; ! static Pixmap progress_fill = (Pixmap) NULL, progress_fillmask = ! (Pixmap) NULL; static int lastpercent = -1; --- 63,67 ---- #endif ! static int lastpercent = -1; *************** *** 508,511 **** --- 515,519 ---- instance->image_stop); if (instance->panel_height > 16) { + #ifdef GTK2_ENABLED instance->image_play = gtk_image_new_from_pixbuf(instance->pb_play_down); *************** *** 514,519 **** instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_up); ! } else { instance->image_play = gtk_image_new_from_pixbuf(instance->pb_sm_play_down); --- 522,528 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_up); ! #endif } else { + #ifdef GTK2_ENABLED instance->image_play = gtk_image_new_from_pixbuf(instance->pb_sm_play_down); *************** *** 522,526 **** instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_up); ! } gtk_container_add(GTK_CONTAINER(instance->play_event_box), --- 531,535 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_up); ! #endif } gtk_container_add(GTK_CONTAINER(instance->play_event_box), *************** *** 556,559 **** --- 565,569 ---- if (instance->panel_height > 16) { + #ifdef GTK2_ENABLED instance->image_play = gtk_image_new_from_pixbuf(instance->pb_play_up); *************** *** 562,567 **** instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_up); ! } else { instance->image_play = gtk_image_new_from_pixbuf(instance->pb_sm_play_up); --- 572,578 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_up); ! #endif } else { + #ifdef GTK2_ENABLED instance->image_play = gtk_image_new_from_pixbuf(instance->pb_sm_play_up); *************** *** 570,574 **** instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_up); ! } gtk_container_add(GTK_CONTAINER(instance->play_event_box), --- 581,585 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_up); ! #endif } gtk_container_add(GTK_CONTAINER(instance->play_event_box), *************** *** 605,608 **** --- 616,620 ---- if (instance->panel_height > 16) { + #ifdef GTK2_ENABLED instance->image_play = gtk_image_new_from_pixbuf(instance->pb_play_up); *************** *** 611,616 **** instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_down); ! } else { instance->image_play = gtk_image_new_from_pixbuf(instance->pb_sm_play_up); --- 623,629 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_down); ! #endif } else { + #ifdef GTK2_ENABLED instance->image_play = gtk_image_new_from_pixbuf(instance->pb_sm_play_up); *************** *** 619,623 **** instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_down); ! } gtk_container_add(GTK_CONTAINER(instance->play_event_box), --- 632,636 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_down); ! #endif } gtk_container_add(GTK_CONTAINER(instance->play_event_box), *************** *** 661,664 **** --- 674,678 ---- if (instance->panel_height != 0) { if (instance->panel_height > 16) { + #ifdef GTK2_ENABLED if (instance->autostart) { instance->image_play = *************** *** 672,678 **** --- 686,694 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_stop_up); + #endif width = BUTTON_WIDTH; height = BUTTON_HEIGHT; } else { + #ifdef GTK2_ENABLED if (instance->autostart) { instance->image_play = *************** *** 686,689 **** --- 702,706 ---- instance->image_stop = gtk_image_new_from_pixbuf(instance->pb_sm_stop_up); + #endif width = SMALL_BUTTON_WIDTH; height = SMALL_BUTTON_HEIGHT; *************** *** 698,701 **** --- 715,723 ---- G_CALLBACK(play_callback), instance); #endif + #ifdef GTK1_ENABLED + gtk_signal_connect(GTK_OBJECT(instance->play_event_box), + "button_press_event", + GTK_SIGNAL_FUNC(play_callback), instance); + #endif gtk_container_add(GTK_CONTAINER(instance->play_event_box), instance->image_play); *************** *** 709,715 **** --- 731,744 ---- gtk_widget_set_events(instance->pause_event_box, GDK_BUTTON_PRESS_MASK); + #ifdef GTK2_ENABLED g_signal_connect(G_OBJECT(instance->pause_event_box), "button_press_event", G_CALLBACK(pause_callback), instance); + #endif + #ifdef GTK1_ENABLED + gtk_signal_connect(GTK_OBJECT(instance->pause_event_box), + "button_press_event", + GTK_SIGNAL_FUNC(pause_callback), instance); + #endif gtk_container_add(GTK_CONTAINER(instance->pause_event_box), instance->image_pause); *************** *** 723,729 **** --- 752,765 ---- gtk_widget_set_events(instance->stop_event_box, GDK_BUTTON_PRESS_MASK); + #ifdef GTK2_ENABLED g_signal_connect(G_OBJECT(instance->stop_event_box), "button_press_event", G_CALLBACK(stop_callback), instance); + #endif + #ifdef GTK1_ENABLED + gtk_signal_connect(GTK_OBJECT(instance->stop_event_box), + "button_press_event", + GTK_SIGNAL_FUNC(stop_callback), instance); + #endif gtk_container_add(GTK_CONTAINER(instance->stop_event_box), instance->image_stop); Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** plugin.cpp 20 Feb 2004 20:14:26 -0000 1.8 --- plugin.cpp 21 Feb 2004 17:45:04 -0000 1.9 *************** *** 393,397 **** { NPSetWindowCallbackStruct *ws; ! #ifdef GTK2_ENABLED GtkWidget *image; GdkColor color; --- 393,397 ---- { NPSetWindowCallbackStruct *ws; ! #ifdef GTK_ENABLED GtkWidget *image; GdkColor color; *************** *** 436,459 **** --- 436,474 ---- state = STATE_WINDOWSET; + #ifdef GTK_ENABLED #ifdef GTK2_ENABLED gdk_threads_init(); + #endif gdk_threads_enter(); gtkwidget = gtk_plug_new(0); //g_signal_connect(G_OBJECT(gtkwidget),"destroy",G_CALLBACK(gtkwin_destroy),this); + #ifdef GTK2_ENABLED g_signal_connect(G_OBJECT(gtkwidget), "expose_event", G_CALLBACK(gtkwin_expose), this); gtk_widget_set_size_request(gtkwidget, aWindow->width, aWindow->height); + #endif + #ifdef GTK1_ENABLED + gtk_signal_connect(GTK_OBJECT(gtkwidget), "expose_event", + GTK_SIGNAL_FUNC(gtkwin_expose), this); + #endif + color.red = 65535; color.blue = 65535; color.green = 65535; + #ifdef GTK2_ENABLED gtk_widget_modify_bg(gtkwidget, GTK_STATE_NORMAL, &color); + #endif fixed_container = gtk_fixed_new(); if (aWindow->height > 80) { + #ifdef GTK2_ENABLED image = gtk_image_new_from_pixbuf(logo); + #endif gtk_fixed_put(GTK_FIXED(fixed_container), image, 10, 10); progress_bar = GTK_PROGRESS_BAR(gtk_progress_bar_new()); + #ifdef GTK2_ENABLED gtk_widget_set_size_request(GTK_WIDGET(progress_bar), aWindow->width - 20, 15); + #endif gtk_fixed_put(GTK_FIXED(fixed_container), GTK_WIDGET(progress_bar), 10, *************** *** 465,471 **** --- 480,488 ---- gtk_fixed_put(GTK_FIXED(fixed_container), GTK_WIDGET(status), 10, 60); + #ifdef GTK2_ENABLED gtk_widget_set_size_request(GTK_WIDGET(status), aWindow->width - 20, aWindow->height - 125); + #endif gtk_misc_set_alignment(GTK_MISC(status), 0, 0); gtk_label_set_line_wrap(status, TRUE); *************** *** 475,481 **** gtk_widget_show(gtkwidget); XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window), ! GDK_WINDOW_XID(gtkwidget->window), window, 0, 0); XMapWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window), ! GDK_WINDOW_XID(gtkwidget->window)); gdk_threads_leave(); #endif --- 492,498 ---- gtk_widget_show(gtkwidget); XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window), ! GDK_WINDOW_XWINDOW(gtkwidget->window), window, 0, 0); XMapWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window), ! GDK_WINDOW_XWINDOW(gtkwidget->window)); gdk_threads_leave(); #endif *************** *** 844,848 **** (int) ((currdownload / (maxdownload * 1.0)) * 100)); #endif ! #ifdef GTK2_ENABLED gdk_threads_enter(); if (progress_bar != NULL) { --- 861,865 ---- (int) ((currdownload / (maxdownload * 1.0)) * 100)); #endif ! #ifdef GTK_ENABLED gdk_threads_enter(); if (progress_bar != NULL) { Index: plugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** plugin.h 20 Feb 2004 20:14:26 -0000 1.7 --- plugin.h 21 Feb 2004 17:45:04 -0000 1.8 *************** *** 124,132 **** int panel_drawn; ! #ifdef GTK2_ENABLED GtkWidget *gtkwidget; GtkWidget *fixed_container; GtkProgressBar *progress_bar; GtkLabel *status; #endif --- 124,140 ---- int panel_drawn; ! #ifdef GTK_ENABLED GtkWidget *gtkwidget; GtkWidget *fixed_container; GtkProgressBar *progress_bar; GtkLabel *status; + + GtkWidget *play_event_box; + GtkWidget *pause_event_box; + GtkWidget *stop_event_box; + + GtkWidget *image_play; + GtkWidget *image_pause; + GtkWidget *image_stop; #endif *************** *** 136,141 **** pthread_mutex_t playlist_mutex; - // Pixbufs #ifdef GTK2_ENABLED GdkPixbuf *logo; --- 144,149 ---- pthread_mutex_t playlist_mutex; #ifdef GTK2_ENABLED + // Pixbufs - GTK1 does not use Pixbufs GdkPixbuf *logo; *************** *** 153,165 **** GdkPixbuf *pb_sm_stop_up; GdkPixbuf *pb_sm_stop_down; - GtkWidget *play_event_box; - GtkWidget *pause_event_box; - GtkWidget *stop_event_box; - GtkWidget *image_play; - GtkWidget *image_pause; - GtkWidget *image_stop; - #endif // options --- 161,167 ---- GdkPixbuf *pb_sm_stop_up; GdkPixbuf *pb_sm_stop_down; + #endif // options |