Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-threads.cpp,1.185,1.186 plugin.cpp,1.252,1.253 plu
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2005-10-26 21:39:27
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6633/Source Modified Files: plugin-threads.cpp plugin.cpp plugin.h Log Message: More aggressivly try an get the media length and percent Index: plugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.h,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** plugin.h 21 Oct 2005 17:46:31 -0000 1.88 --- plugin.h 26 Oct 2005 21:39:18 -0000 1.89 *************** *** 186,189 **** --- 186,190 ---- int mediaPercent; // percentage of media played float mediaTime; // time in seconds + float mediaPos; // seconds into the media int nomediacache; int controlsvisible; Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -d -r1.185 -r1.186 *** plugin-threads.cpp 26 Oct 2005 19:31:28 -0000 1.185 --- plugin-threads.cpp 26 Oct 2005 21:39:18 -0000 1.186 *************** *** 955,958 **** --- 955,976 ---- } + pthread_testcancel(); + // mplayer answer back messages + if (strstr(buffer, "ANS_TIME_POSITION") != 0) { + msg = strstr(buffer, "ANS_TIME_POSITION"); + sscanf(msg, "ANS_TIME_POSITION=%f", + &(local_td->instance->mediaPos)); + if (DEBUG > 1) + printf("Media Position = %f\n", + local_td->instance->mediaPos); + if (local_td->instance->mediaLength != 0) + local_td->instance->mediaPercent = + (int) ((local_td->instance->mediaPos * 100) / + local_td->instance->mediaLength); + #ifdef GTK_ENABLED + g_idle_add(gtkgui_drawMediaProgress, local_td->instance); + #endif + } + pthread_testcancel(); if (strstr(buffer, "ANS_PERCENT_POSITION") != 0) { *************** *** 963,967 **** if (local_td->instance->mediaLength != 0) local_td->instance->mediaPercent = ! (int) ((local_td->instance->mediaTime * 100) / local_td->instance->mediaLength); } --- 981,985 ---- if (local_td->instance->mediaLength != 0) local_td->instance->mediaPercent = ! (int) ((local_td->instance->mediaPos * 100) / local_td->instance->mediaLength); } *************** *** 1015,1019 **** control_mutex)); pthread_mutex_lock(&(local_td->instance->control_mutex)); ! sendCommand(local_td->instance, "get_percent_pos"); pthread_mutex_unlock(&(local_td->instance->control_mutex)); pthread_cleanup_pop(0); --- 1033,1040 ---- control_mutex)); pthread_mutex_lock(&(local_td->instance->control_mutex)); ! // sendCommand(local_td->instance, "get_percent_pos"); ! sendCommand(local_td->instance, "get_time_pos"); ! if (local_td->instance->mediaLength == 0) ! sendCommand(local_td->instance, "get_time_length"); pthread_mutex_unlock(&(local_td->instance->control_mutex)); pthread_cleanup_pop(0); Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.252 retrieving revision 1.253 diff -C2 -d -r1.252 -r1.253 *** plugin.cpp 26 Oct 2005 17:45:36 -0000 1.252 --- plugin.cpp 26 Oct 2005 21:39:18 -0000 1.253 *************** *** 208,211 **** --- 208,212 ---- mediaPercent = 0; mediaTime = 0.0; + mediaPos = 0.0; nomediacache = 0; controlsvisible = 0; |