Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18586/Source
Modified Files:
plugin-list.cpp plugin-setup.cpp plugin-threads.cpp
plugin-ui.cpp
Log Message:
Added some additional checks to shift back into blocking mode.
Cleanup the RTSP playlist parser
Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** plugin-threads.cpp 10 Jun 2006 02:10:52 -0000 1.231
--- plugin-threads.cpp 12 Jun 2006 21:44:16 -0000 1.232
***************
*** 852,856 ****
pthread_testcancel();
! if (strstr(buffer, "Cache size") != NULL) {
if (local_td->instance->player != NULL) {
if (DEBUG) {
--- 852,856 ----
pthread_testcancel();
! if (strstr(buffer, "Cache size") != NULL || strstr(buffer, "Starting playback") != NULL ) {
if (local_td->instance->player != NULL) {
if (DEBUG) {
***************
*** 952,955 ****
--- 952,956 ----
pthread_testcancel();
if (strstr(buffer, "VO:") != NULL) {
+ fcntl(fileno(local_td->instance->player), F_SETFL, flags);
if (local_td->instance->mode == NP_EMBED
&& local_td->instance->noembed == 0)
***************
*** 1011,1014 ****
--- 1012,1016 ----
pthread_testcancel();
if (strstr(buffer, "Video: no video") != NULL) {
+ fcntl(fileno(local_td->instance->player), F_SETFL, flags);
if (local_td->instance->panel_height == 0)
local_td->instance->panel_height = 32;
Index: plugin-list.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** plugin-list.cpp 10 Jun 2006 02:10:52 -0000 1.59
--- plugin-list.cpp 12 Jun 2006 21:44:16 -0000 1.60
***************
*** 698,710 ****
}
// simple playlist usually realmedia file
! if (strncasecmp(buffer, "rtsp://", 7) == 0 && found == 0) {
! p = buffer;
while (p != NULL) {
! i = size - ((long) p - (long) buffer);
p = (char *) memmem(p, i, "rtsp://", 7);
if (p == NULL) {
break;
} else {
! snprintf(url, 1024, "%s", p);
sub = strchr(url, 0xd); // terminate on CR
if (sub != NULL)
--- 698,714 ----
}
// simple playlist usually realmedia file
! if (strncasecmp(buffer, "rtsp", 4) == 0 && found == 0) {
! if (DEBUG) {
! printf("Search RTSP File\n");
! }
! p = buffer_lower;
while (p != NULL) {
! i = size - ((long) p - (long) buffer_lower);
p = (char *) memmem(p, i, "rtsp://", 7);
if (p == NULL) {
break;
} else {
! i = (long) p - (long) buffer_lower;
! snprintf(url, 1024, "rtsp://%s", buffer + i + 7);
sub = strchr(url, 0xd); // terminate on CR
if (sub != NULL)
Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** plugin-ui.cpp 1 Jun 2006 17:12:41 -0000 1.225
--- plugin-ui.cpp 12 Jun 2006 21:44:16 -0000 1.226
***************
*** 2565,2568 ****
--- 2565,2571 ----
unlink(buffer);
snprintf(buffer, 1000, "%s", getenv("HOME"));
+ strlcat(buffer, "/.firefox/pluginreg.dat", 1000);
+ unlink(buffer);
+ snprintf(buffer, 1000, "%s", getenv("HOME"));
strlcat(buffer, "/.mozilla/firefox/pluginreg.dat", 1000);
unlink(buffer);
Index: plugin-setup.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** plugin-setup.cpp 14 May 2006 18:52:39 -0000 1.120
--- plugin-setup.cpp 12 Jun 2006 21:44:16 -0000 1.121
***************
*** 444,448 ****
#ifdef QT
! *((const char **) value) = "QuickTime Plug-in 6.0";
#endif
--- 444,448 ----
#ifdef QT
! *((const char **) value) = "QuickTime Plug-in 6.0 / 7";
#endif
|