[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.99,1.100 plugin-threads.cpp,1.190,1.19
Brought to you by:
kdekorte
Menu
▾
▴
[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.99,1.100 plugin-threads.cpp,1.190,1.191 plugin-ui.cpp,1.171,1.172 plugin.cpp,1.253,1.254 plugin.h,1.89,1.90
|
From: Kevin D. <kde...@us...> - 2005-11-08 14:23:09
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22612/Source Modified Files: plugin-setup.cpp plugin-threads.cpp plugin-ui.cpp plugin.cpp plugin.h Log Message: Show media time in progress bar Enable/Disable showing of time via config option "showtime" Add showtime to config window Change specfile buildrequires from XFree86-devel to xorg-x11-devel Updated Norwegian Bokmål translation by Alexander N. Sørnes Add DivX mimetype media support Index: plugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.h,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** plugin.h 26 Oct 2005 21:39:18 -0000 1.89 --- plugin.h 8 Nov 2005 14:22:04 -0000 1.90 *************** *** 191,194 **** --- 191,195 ---- int fullscreen; int showlogo; + int showtime; int DPMSEnabled; int hidden; *************** *** 251,254 **** --- 252,256 ---- GtkWidget *conf_cachesize; GtkWidget *conf_cachepercent; + GtkWidget *conf_showtime; GtkWidget *conf_enable_smil; GtkWidget *conf_enable_helix; Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.190 retrieving revision 1.191 diff -C2 -d -r1.190 -r1.191 *** plugin-threads.cpp 3 Nov 2005 22:59:22 -0000 1.190 --- plugin-threads.cpp 8 Nov 2005 14:22:04 -0000 1.191 *************** *** 714,717 **** --- 714,718 ---- int c; int length_request_count = 0; + float lastmedialength = -1.0; #ifdef GTK_ENABLED int fsupdated = 0; *************** *** 739,742 **** --- 740,744 ---- pthread_mutex_lock(&(local_td->instance->control_mutex)); sendCommand(local_td->instance, "get_time_length"); + local_td->instance->mediaLength = 0.0; pthread_mutex_unlock(&(local_td->instance->control_mutex)); pthread_cleanup_pop(0); *************** *** 953,956 **** --- 955,960 ---- // mplayer answer back messages if (strstr(buffer, "ANS_LENGTH") != 0) { + if ((int)local_td->instance->mediaLength != 0) + lastmedialength = local_td->instance->mediaLength; msg = strstr(buffer, "ANS_LENGTH"); sscanf(msg, "ANS_LENGTH=%f", *************** *** 1043,1049 **** if ((int)local_td->instance->mediaLength > 1) sendCommand(local_td->instance, "get_time_pos"); ! if ((int)local_td->instance->mediaLength == 0 && length_request_count < 10) { ! sendCommand(local_td->instance, "get_time_length"); ! length_request_count++; } pthread_mutex_unlock(&(local_td->instance->control_mutex)); --- 1047,1057 ---- if ((int)local_td->instance->mediaLength > 1) sendCommand(local_td->instance, "get_time_pos"); ! if (local_td->instance->mediaLength > lastmedialength) { ! sendCommand(local_td->instance, "get_time_length"); ! } else { ! if (length_request_count < 10) { ! sendCommand(local_td->instance, "get_time_length"); ! length_request_count++; ! } } pthread_mutex_unlock(&(local_td->instance->control_mutex)); Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.253 retrieving revision 1.254 diff -C2 -d -r1.253 -r1.254 *** plugin.cpp 26 Oct 2005 21:39:18 -0000 1.253 --- plugin.cpp 8 Nov 2005 14:22:04 -0000 1.254 *************** *** 213,216 **** --- 213,217 ---- fullscreen = 0; showlogo = 1; + showtime = 1; DPMSEnabled = 0; black_background = 0; Index: plugin-ui.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** plugin-ui.cpp 1 Nov 2005 16:34:14 -0000 1.171 --- plugin-ui.cpp 8 Nov 2005 14:22:04 -0000 1.172 *************** *** 1470,1473 **** --- 1470,1476 ---- { nsPluginInstance *instance; + int hour=0,min=0; + long int seconds; + char display[30]; if (DEBUG > 1) *************** *** 1488,1491 **** --- 1491,1509 ---- gtk_progress_bar_update(instance->mediaprogress_bar, instance->mediaPercent / 100.0); + + if (((int)instance->mediaTime > 0) && (instance->showtime == 1)) { + seconds = (int)instance->mediaTime; + if (seconds >= 3600) { + hour = seconds / 3600; + seconds = seconds - (hour * 3600); + } + if (seconds >= 60) { + min = seconds / 60; + seconds = seconds - (min * 60); + } + snprintf(display,30,"%i:%02i:%02i",hour,min,(int)seconds); + gtk_progress_bar_set_text(instance->mediaprogress_bar,display); + } + } else { gtk_widget_hide(GTK_WIDGET(instance->mediaprogress_bar)); *************** *** 1902,1905 **** --- 1920,1926 ---- (GTK_ENTRY(GTK_BIN(instance->conf_dir)->child))); + instance->showtime = + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (instance->conf_showtime)); instance->enable_wmp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON *************** *** 1969,1972 **** --- 1990,1994 ---- if (strlen(instance->download_dir) > 0) fprintf(output, "dload-dir=%s\n", instance->download_dir); + fprintf(output, "showtime=%i\n", instance->showtime); fprintf(output, "enable-wmp=%i\n", instance->enable_wmp); fprintf(output, "enable-qt=%i\n", instance->enable_qt); *************** *** 1988,1991 **** --- 2010,2014 ---- } else if (strncasecmp(buffer, "cache-percent", 13) == 0) { } else if (strncasecmp(buffer, "dload-dir", 9) == 0) { + } else if (strncasecmp(buffer, "showtime", 8) == 0) { } else if (strncasecmp(buffer, "enable-wmp", 10) == 0) { } else if (strncasecmp(buffer, "enable-qt", 9) == 0) { *************** *** 2036,2039 **** --- 2059,2063 ---- if (strlen(instance->download_dir) > 0) fprintf(output, "dload-dir=%s\n", instance->download_dir); + fprintf(output, "showtime=%i\n", instance->showtime); fprintf(output, "enable-wmp=%i\n", instance->enable_wmp); fprintf(output, "enable-qt=%i\n", instance->enable_qt); *************** *** 2235,2238 **** --- 2259,2274 ---- row = 5; + instance->conf_showtime = + gtk_check_button_new_with_label(_ + ("Show time in progress bar")); + gtk_table_attach_defaults(GTK_TABLE(conf_table), + instance->conf_showtime, 1, 2, row, + row + 1); + row++; + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON + (instance->conf_showtime), + instance->showtime); + gtk_widget_show(instance->conf_showtime); + instance->conf_enable_wmp = gtk_check_button_new_with_label(_ Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** plugin-setup.cpp 27 Oct 2005 22:35:13 -0000 1.99 --- plugin-setup.cpp 8 Nov 2005 14:22:04 -0000 1.100 *************** *** 338,341 **** --- 338,345 ---- "application/x-nsv-vp3-mp3:nsv:Nullsoft Streaming Video;", sizeof(MimeTypes)); + // DIVX + strlcat(MimeTypes, + "video/vnd.divx:divx:DivX Media Format;", + sizeof(MimeTypes)); #endif // Google Video *************** *** 1077,1080 **** --- 1081,1093 ---- } + if (strncasecmp(buffer, "showtime", 8) == 0) { + snprintf(parse, 1000, "%s", strtok(buffer, "=")); + snprintf(parse, 1000, "%s", strtok(NULL, "=")); + sscanf(parse, "%i", &instance->showtime); + if (instance->showtime != 0) + instance->showtime = 1; + continue; + } + if (strncasecmp(buffer, "hidestatus", 10) == 0) { snprintf(parse, 1000, "%s", strtok(buffer, "=")); |