rpms/gecko-mediaplayer/devel gecko-mediaplayer-applefix.patch, NONE, 1.1 gecko-mediaplayer.spec, 1.29, 1.30

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24495

Modified Files:
	gecko-mediaplayer.spec 
Added Files:
	gecko-mediaplayer-applefix.patch 
Log Message:
* Thu Jul 07 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN


gecko-mediaplayer-applefix.patch:
 plugin.cpp |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

--- NEW FILE gecko-mediaplayer-applefix.patch ---
Index: src/plugin.cpp
===================================================================
--- src/plugin.cpp	(wersja 467)
+++ src/plugin.cpp	(wersja 468)
@@ -1320,7 +1320,7 @@
     ListItem *item = (ListItem *) clientp;
     gdouble percent, rate;
     gchar *text;
-    gboolean ok_to_play;
+    gboolean ok_to_play = FALSE;
     gint id;
     gboolean ready;
     gboolean newwindow;
@@ -1364,8 +1364,10 @@
                                         rate);
                 }
                 send_signal_with_string(plugin, item, "SetProgressText", text);
-                if (!item->opened)
-                    send_signal_with_string(plugin, item, "SetURL", item->src);
+                if (!item->opened) {
+                    //open_location (plugin, item, 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 @@
                 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 @@
             }
 
         }
+        */
         // 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");
                 plugin->playlist = list_parse_qt(plugin->playlist, item);
+                plugin->playlist = list_parse_qt2(plugin->playlist, item);
                 plugin->playlist = list_parse_asx(plugin->playlist, item);
                 plugin->playlist = list_parse_qml(plugin->playlist, item);
                 plugin->playlist = list_parse_ram(plugin->playlist, item);
@@ -1456,6 +1462,7 @@
             }
             g_free(path);
         }
+        */
 
     }
 
@@ -1493,13 +1500,13 @@
 
             }
             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", 0.0);
             item->retrieved = TRUE;
         }
 
 
-        if ((!item->opened)) {
+        if (!item->opened) {
             id = item->controlid;
             path = g_strdup(item->path);
             ready = item->playerready;
@@ -1509,13 +1516,14 @@
             if (!item->streaming) {
                 printf("in CURLGetURLNotify\n");
                 plugin->playlist = list_parse_qt(plugin->playlist, item);
+                plugin->playlist = list_parse_qt2(plugin->playlist, item);
                 plugin->playlist = list_parse_asx(plugin->playlist, item);
                 plugin->playlist = list_parse_qml(plugin->playlist, item);
                 plugin->playlist = list_parse_ram(plugin->playlist, item);
             }
             // printf("item->play = %i\n", item->play);
             // printf("item->src = %i\n", item->src);
-            // printf("calling open_location from Write\n");
+            // printf("calling open_location from CURLGetURLNotify\n");
             if (item->play) {
                 send_signal_with_integer(plugin, item, "SetGUIState", PLAYING);
                 open_location(plugin, item, TRUE);


Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gecko-mediaplayer.spec	1 Jul 2011 20:10:20 -0000	1.29
+++ gecko-mediaplayer.spec	7 Jul 2011 19:47:25 -0000	1.30
@@ -1,12 +1,13 @@
 Name:           gecko-mediaplayer
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gnome MPlayer browser plugin
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/gecko-mediaplayer
 Source0:        http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:         %{name}-applefix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .applefix
 
 
 %build
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Thu Jul 07 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-2
+- Fixed apple.com regression using a patch from SVN
+
 * Fri Jul 01 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-1
 - Updated to 1.0.4