Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.31,1.32 plugin-setup.h,1.33,1.34 plugi
Brought to you by:
kdekorte
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14948/Source Modified Files: plugin-setup.cpp plugin-setup.h plugin-support.cpp plugin-threads.cpp plugin-ui.cpp plugin.cpp plugin.h Log Message: Recognize and ignore "statuspanel" for realplayer Index: plugin-ui.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** plugin-ui.cpp 9 Jul 2004 17:02:10 -0000 1.91 --- plugin-ui.cpp 13 Jul 2004 14:09:47 -0000 1.92 *************** *** 1346,1350 **** } ! void menuitem_save_callback(GtkCheckMenuItem * menuitem, nsPluginInstance * instance) { --- 1346,1350 ---- } ! void menuitem_save_callback(GtkMenuItem * menuitem, nsPluginInstance * instance) { *************** *** 1415,1418 **** --- 1415,1444 ---- } + void menuitem_copy_callback(GtkMenuItem * menuitem, + nsPluginInstance * instance) + { + Node *n, *lastplayed; + GtkClipboard *clipboard; + char localurl[1024]; + + lastplayed = NULL; + + if (instance->currentnode != NULL) { + lastplayed = instance->currentnode; + } else { + n = instance->list; + while (n != NULL) { + if (n->played == 1) + lastplayed = n; + n = n->next; + } + } + + if (lastplayed != NULL) { + fullyQualifyURL(instance, lastplayed->url, localurl); + clipboard = gtk_clipboard_get(GDK_NONE); + gtk_clipboard_set_text(clipboard,localurl,strlen(localurl)); + } + } Index: plugin-support.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-support.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** plugin-support.cpp 8 Jul 2004 16:59:24 -0000 1.42 --- plugin-support.cpp 13 Jul 2004 14:09:47 -0000 1.43 *************** *** 362,365 **** --- 362,366 ---- pthread_join(instance->player_thread, &thread_return); instance->js_state = JS_STATE_UNDEFINED; + //FIXME status = 0; *************** *** 377,382 **** count++; } ! if (instance->player == NULL) instance->pid = 0; if (instance->pid != 0) { --- 378,387 ---- count++; } ! if (instance->player == NULL) { instance->pid = 0; + } else { + fclose(instance->player); + instance->player = NULL; + } if (instance->pid != 0) { *************** *** 413,421 **** } - if (instance->player) { - fclose(instance->player); - instance->player = NULL; - } - //wait(&status); } --- 418,421 ---- Index: plugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** plugin.h 14 Jun 2004 18:35:56 -0000 1.46 --- plugin.h 13 Jul 2004 14:09:48 -0000 1.47 *************** *** 187,190 **** --- 187,191 ---- GtkMenuItem *menuitem_fullscreen; GtkMenuItem *menuitem_save; + GtkMenuItem *menuitem_copy; #endif Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** plugin-setup.cpp 1 Jul 2004 14:53:17 -0000 1.31 --- plugin-setup.cpp 13 Jul 2004 14:09:47 -0000 1.32 *************** *** 483,486 **** --- 483,487 ---- || strstr(parameters->argv[i], "all") || strstr(parameters->argv[i], "statusfield") + || strstr(parameters->argv[i], "statuspanel") || strstr(parameters->argv[i], "playbutton") || strstr(parameters->argv[i], "volumeslider") Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** plugin-threads.cpp 1 Jul 2004 14:53:17 -0000 1.104 --- plugin-threads.cpp 13 Jul 2004 14:09:47 -0000 1.105 *************** *** 569,573 **** char buffer[1024]; - char message[1024]; int notfound; --- 569,572 ---- *************** *** 630,637 **** g_idle_add(gtkgui_save_enable, local_td->instance); #endif if (fgets(buffer, 1024, local_td->instance->player) == NULL) { continue; } - pthread_testcancel(); --- 629,637 ---- g_idle_add(gtkgui_save_enable, local_td->instance); #endif + + pthread_testcancel(); if (fgets(buffer, 1024, local_td->instance->player) == NULL) { continue; } pthread_testcancel(); Index: plugin-setup.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** plugin-setup.h 14 Jun 2004 18:35:56 -0000 1.33 --- plugin-setup.h 13 Jul 2004 14:09:47 -0000 1.34 *************** *** 193,197 **** void menuitem_showcontrols_callback(GtkCheckMenuItem *menuitem, nsPluginInstance* instance); void menuitem_fullscreen_callback(GtkCheckMenuItem *menuitem, nsPluginInstance* instance); ! void menuitem_save_callback(GtkCheckMenuItem * menuitem, nsPluginInstance * instance); #endif --- 193,198 ---- void menuitem_showcontrols_callback(GtkCheckMenuItem *menuitem, nsPluginInstance* instance); void menuitem_fullscreen_callback(GtkCheckMenuItem *menuitem, nsPluginInstance* instance); ! void menuitem_save_callback(GtkMenuItem * menuitem, nsPluginInstance * instance); ! void menuitem_copy_callback(GtkMenuItem * menuitem, nsPluginInstance * instance); #endif Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** plugin.cpp 1 Jul 2004 17:13:16 -0000 1.120 --- plugin.cpp 13 Jul 2004 14:09:48 -0000 1.121 *************** *** 274,278 **** } - if (mScriptablePeer != NULL) { mScriptablePeer->InitControls(NULL); --- 274,277 ---- *************** *** 595,598 **** --- 594,601 ---- gtk_menu_append(popup_menu, GTK_WIDGET(menuitem_sep2)); gtk_widget_show(GTK_WIDGET(menuitem_sep2)); + menuitem_copy = + GTK_MENU_ITEM(gtk_menu_item_new_with_label("Copy URL")); + gtk_menu_append(popup_menu, GTK_WIDGET(menuitem_copy)); + gtk_widget_show(GTK_WIDGET(menuitem_copy)); menuitem_save = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Save")); *************** *** 618,621 **** --- 621,626 ---- g_signal_connect(GTK_OBJECT(menuitem_save), "activate", G_CALLBACK(menuitem_save_callback), this); + g_signal_connect(GTK_OBJECT(menuitem_copy), "activate", + G_CALLBACK(menuitem_copy_callback), this); #endif *************** *** 640,643 **** --- 645,650 ---- gtk_signal_connect(GTK_OBJECT(menuitem_save), "activate", GTK_SIGNAL_FUNC(menuitem_save_callback), this); + gtk_signal_connect(GTK_OBJECT(menuitem_copy), "activate", + GTK_SIGNAL_FUNC(menuitem_copy_callback), this); #endif *************** *** 857,861 **** printf("*********Exiting NewStream Callback*****************\n"); - return NPERR_NO_ERROR; } --- 864,867 ---- *************** *** 871,876 **** reason, stream->url); - - if (reason == NPRES_DONE) { playable = 0; --- 877,880 ---- |