Author: belegdol Update of /cvs/free/rpms/gecko-mediaplayer/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5667 Modified Files: gecko-mediaplayer-applefix.patch gecko-mediaplayer.spec Log Message: * Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0.4-3 - Updated the apple.com fix gecko-mediaplayer-applefix.patch: plugin.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) Index: gecko-mediaplayer-applefix.patch =================================================================== RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/gecko-mediaplayer-applefix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gecko-mediaplayer-applefix.patch 7 Jul 2011 19:47:37 -0000 1.1 +++ gecko-mediaplayer-applefix.patch 8 Jul 2011 07:21:11 -0000 1.2 @@ -1,7 +1,7 @@ Index: src/plugin.cpp =================================================================== --- src/plugin.cpp (wersja 467) -+++ src/plugin.cpp (wersja 468) ++++ src/plugin.cpp (wersja 470) @@ -1320,7 +1320,7 @@ ListItem *item = (ListItem *) clientp; gdouble percent, rate; @@ -11,7 +11,7 @@ gint id; gboolean ready; gboolean newwindow; -@@ -1364,8 +1364,10 @@ +@@ -1364,8 +1364,11 @@ rate); } send_signal_with_string(plugin, item, "SetProgressText", text); @@ -19,29 +19,37 @@ - send_signal_with_string(plugin, item, "SetURL", item->src); + if (!item->opened) { + //open_location (plugin, item, TRUE); ++ //item->opened = TRUE; + //send_signal_with_string(plugin, item, "SetURL", item->src); + } if (plugin->post_dom_events && plugin->id != NULL) { postDOMEvent(plugin->mInstance, plugin->id, "qt_progress"); postDOMEvent(plugin->mInstance, plugin->id, "qt_durationchange"); -@@ -1376,6 +1378,7 @@ +@@ -1376,6 +1379,7 @@ item->lastsize = item->localsize; } } -+ /* ++ if (!item->opened) { if ((item->localsize >= (plugin->cache_size * 1024)) && (percent >= 0.2)) { printf("Setting to play because %i > %i\n", item->localsize, -@@ -1407,7 +1410,9 @@ +@@ -1391,7 +1395,7 @@ + if (ok_to_play == FALSE) { + if (item->bitrate == 0 && item->bitrate_requests < 5 + && ((gint) (percent * 100) > item->bitrate_requests)) { +- item->bitrate = request_bitrate(plugin, item, item->local); ++ //item->bitrate = request_bitrate(plugin, item, item->local); + item->bitrate_requests++; + } + if (item->bitrate > 0) { +@@ -1407,6 +1411,7 @@ } } -+ */ ++ // if not opened, over cache level and not an href target then try and open it -+ /* if ((!item->opened) && ok_to_play == TRUE) { id = item->controlid; - path = g_strdup(item->path); @@ -1418,6 +1423,7 @@ if (!item->streaming) { printf("in progress_callback\n"); @@ -54,16 +62,17 @@ } g_free(path); } -+ */ ++ } -@@ -1493,13 +1500,13 @@ +@@ -1493,13 +1500,14 @@ } fclose(local); - printf("fetched %s to %s\n", item->src, item->local); + printf("fetched %s to %s opened = %i\n", item->src, item->local, item->opened); ++ send_signal_with_double(plugin, item, "SetCachePercent", 1.0); send_signal_with_double(plugin, item, "SetCachePercent", 0.0); item->retrieved = TRUE; } @@ -74,7 +83,7 @@ id = item->controlid; path = g_strdup(item->path); ready = item->playerready; -@@ -1509,13 +1516,14 @@ +@@ -1509,13 +1517,14 @@ if (!item->streaming) { printf("in CURLGetURLNotify\n"); plugin->playlist = list_parse_qt(plugin->playlist, item); Index: gecko-mediaplayer.spec =================================================================== RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/gecko-mediaplayer.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gecko-mediaplayer.spec 7 Jul 2011 19:47:37 -0000 1.30 +++ gecko-mediaplayer.spec 8 Jul 2011 07:21:11 -0000 1.31 @@ -1,6 +1,6 @@ Name: gecko-mediaplayer Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gnome MPlayer browser plugin Group: Applications/Multimedia @@ -98,6 +98,9 @@ %changelog +* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0.4-3 +- Updated the apple.com fix + * Thu Jul 07 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0.4-2 - Fixed apple.com regression using a patch from SVN