rpms/gnome-mplayer/F-14 gnome-mplayer.spec,1.36,1.37
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7451
Modified Files:
gnome-mplayer.spec
Log Message:
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/gnome-mplayer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-mplayer.spec 1 Jul 2011 20:08:40 -0000 1.36
+++ gnome-mplayer.spec 8 Jul 2011 07:33:17 -0000 1.37
@@ -2,13 +2,14 @@
Name: gnome-mplayer
Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: %{name}-applefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -102,9 +103,11 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
+%patch0 -p0 -d generic -b .applefix
%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+%patch0 -p0 -d minimal -b .applefix
%endif
@@ -250,6 +253,9 @@
%changelog
+* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
+- Fixed apple.com regression using a patch from SVN
+
* Fri Jul 01 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-1
- Updated to 1.0.4
- Enabled gtk3 on Fedora 15 and above
12 years, 9 months
rpms/gnome-mplayer/F-14 gnome-mplayer-applefix.patch,NONE,1.1
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6239
Added Files:
gnome-mplayer-applefix.patch
Log Message:
* Fri Jul 01 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-1
- Updated to 1.0.4
- Enabled gtk3 on Fedora 15 and above
gnome-mplayer-applefix.patch:
gui.c | 5 ++++
libgmtk/gmtk_media_player.c | 54 +++++++++++++++++++++++++++++++++++++-------
libgmtk/gmtk_media_player.h | 13 +++++++++-
main.c | 1
4 files changed, 64 insertions(+), 9 deletions(-)
--- NEW FILE gnome-mplayer-applefix.patch ---
Index: src/libgmtk/gmtk_media_player.h
===================================================================
--- src/libgmtk/gmtk_media_player.h (wersja 2151)
+++ src/libgmtk/gmtk_media_player.h (wersja 2152)
@@ -170,7 +170,8 @@
ATTRIBUTE_ENABLE_FRAME_DROP,
ATTRIBUTE_TITLE,
ATTRIBUTE_ARTIST,
- ATTRIBUTE_ALBUM
+ ATTRIBUTE_ALBUM,
+ ATTRIBUTE_RETRY_ON_FULL_CACHE
} GmtkMediaPlayerMediaAttributes;
typedef enum {
@@ -201,6 +202,13 @@
COMMAND_SWITCH_FRAME_DROP
} GmtkMediaPlayerCommand;
+typedef enum {
+ EVENT_TYPE_INT,
+ EVENT_TYPE_DOUBLE,
+ EVENT_TYPE_BOOLEAN,
+ EVENT_TYPE_ALLOCATION
+} GmtkMediaPlayerEventType;
+
typedef struct _GmtkMediaPlayer GmtkMediaPlayer;
typedef struct _GmtkMediaPlayerClass GmtkMediaPlayerClass;
@@ -222,9 +230,11 @@
typedef struct _GmtkMediaPlayerEvent {
GmtkMediaPlayer *player;
+ GmtkMediaPlayerEventType type;
gchar *event_name;
gint event_data_int;
gdouble event_data_double;
+ gboolean event_data_boolean;
GtkAllocation *event_allocation;
} GmtkMediaPlayerEvent;
@@ -304,6 +314,7 @@
gchar *album;
gboolean enable_divx;
gboolean disable_xvmc;
+ gboolean retry_on_full_cache;
gboolean deinterlace;
gboolean frame_drop;
Index: src/libgmtk/gmtk_media_player.c
===================================================================
--- src/libgmtk/gmtk_media_player.c (wersja 2151)
+++ src/libgmtk/gmtk_media_player.c (wersja 2152)
@@ -69,15 +69,27 @@
if (event && event->event_name != NULL
&& (event->player->restart == FALSE || event->event_data_int == ATTRIBUTE_AF_EXPORT_FILENAME)) {
- if (g_strcasecmp(event->event_name, "position-changed") == 0 ||
- g_strcasecmp(event->event_name, "cache-percent-changed") == 0) {
- g_signal_emit_by_name(event->player, event->event_name, event->event_data_double);
- } else if (g_strcasecmp(event->event_name, "size_allocate") == 0) {
- g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
- } else {
- g_signal_emit_by_name(event->player, event->event_name, event->event_data_int);
- }
+ switch (event->type) {
+ case EVENT_TYPE_INT:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_int);
+ break;
+
+ case EVENT_TYPE_DOUBLE:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_double);
+ break;
+
+ case EVENT_TYPE_BOOLEAN:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_boolean);
+ break;
+
+ case EVENT_TYPE_ALLOCATION:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
+ break;
+
+ default:
+ printf("undefined event %s\n", event->event_name);
+ }
g_free(event->event_name);
}
if (event)
@@ -93,6 +105,7 @@
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_INT;
event->event_name = g_strdup(name);
event->event_data_int = value;
g_idle_add(signal_event, event);
@@ -104,17 +117,31 @@
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_DOUBLE;
event->event_name = g_strdup(name);
event->event_data_double = value;
g_idle_add(signal_event, event);
}
+void create_event_boolean(GmtkMediaPlayer * player, const gchar * name, gboolean value)
+{
+ GmtkMediaPlayerEvent *event;
+
+ event = g_new0(GmtkMediaPlayerEvent, 1);
+ event->player = player;
+ event->type = EVENT_TYPE_BOOLEAN;
+ event->event_name = g_strdup(name);
+ event->event_data_boolean = value;
+ g_idle_add(signal_event, event);
+}
+
void create_event_allocation(GmtkMediaPlayer * player, const gchar * name, GtkAllocation * allocation)
{
GmtkMediaPlayerEvent *event;
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_ALLOCATION;
event->event_name = g_strdup(name);
event->event_allocation = allocation;
g_idle_add(signal_event, event);
@@ -300,6 +327,7 @@
player->channel_in = NULL;
player->channel_out = NULL;
player->channel_err = NULL;
+ player->retry_on_full_cache = FALSE;
}
static void gmtk_media_player_dispose(GObject * object)
@@ -993,6 +1021,10 @@
ret = player->hardware_ac3;
break;
+ case ATTRIBUTE_RETRY_ON_FULL_CACHE:
+ ret = player->retry_on_full_cache;
+ break;
+
default:
if (player->debug)
printf("Unsupported Attribute\n");
@@ -1788,6 +1820,7 @@
player->title_is_menu = FALSE;
player->enable_divx = TRUE;
player->disable_xvmc = FALSE;
+ player->retry_on_full_cache = FALSE;
g_mutex_lock(player->thread_running);
@@ -2477,6 +2510,11 @@
error_msg = g_strdup_printf(_("Compressed SWF format not supported"));
}
+ if (strstr(mplayer_output->str, "MOV: missing header (moov/cmov) chunk") != NULL) {
+ player->retry_on_full_cache = TRUE;
+ create_event_boolean(player, "attribute-changed", ATTRIBUTE_RETRY_ON_FULL_CACHE);
+ }
+
if (strstr(mplayer_output->str, "Title: ") != 0) {
buf = strstr(mplayer_output->str, "Title:");
buf = strstr(mplayer_output->str, "Title: ") + strlen("Title: ");
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 2151)
+++ src/gui.c (wersja 2152)
@@ -6052,6 +6052,11 @@
g_strlcpy(idledata->media_info, text, 1024);
g_thread_create(get_cover_art, metadata, FALSE, NULL);
break;
+
+ case ATTRIBUTE_RETRY_ON_FULL_CACHE:
+ idledata->retry_on_full_cache = gmtk_media_player_get_attribute_boolean (GMTK_MEDIA_PLAYER(media), ATTRIBUTE_RETRY_ON_FULL_CACHE);
+ break;
+
default:
if (verbose) {
printf("Unhandled attribute change %i\n", attribute);
Index: src/main.c
===================================================================
--- src/main.c (wersja 2151)
+++ src/main.c (wersja 2152)
@@ -534,6 +534,7 @@
idledata->width = width;
idledata->height = height;
+ idledata->retry_on_full_cache = FALSE;
idledata->cachepercent = -1.0;
g_strlcpy(idledata->info, uri, 1024);
set_media_info(idledata);
12 years, 9 months
rpms/gnome-mplayer/F-15 gnome-mplayer-applefix.patch,NONE,1.1
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5960
Added Files:
gnome-mplayer-applefix.patch
Log Message:
Added a forgotten patch
gnome-mplayer-applefix.patch:
gui.c | 5 ++++
libgmtk/gmtk_media_player.c | 54 +++++++++++++++++++++++++++++++++++++-------
libgmtk/gmtk_media_player.h | 13 +++++++++-
main.c | 1
4 files changed, 64 insertions(+), 9 deletions(-)
--- NEW FILE gnome-mplayer-applefix.patch ---
Index: src/libgmtk/gmtk_media_player.h
===================================================================
--- src/libgmtk/gmtk_media_player.h (wersja 2151)
+++ src/libgmtk/gmtk_media_player.h (wersja 2152)
@@ -170,7 +170,8 @@
ATTRIBUTE_ENABLE_FRAME_DROP,
ATTRIBUTE_TITLE,
ATTRIBUTE_ARTIST,
- ATTRIBUTE_ALBUM
+ ATTRIBUTE_ALBUM,
+ ATTRIBUTE_RETRY_ON_FULL_CACHE
} GmtkMediaPlayerMediaAttributes;
typedef enum {
@@ -201,6 +202,13 @@
COMMAND_SWITCH_FRAME_DROP
} GmtkMediaPlayerCommand;
+typedef enum {
+ EVENT_TYPE_INT,
+ EVENT_TYPE_DOUBLE,
+ EVENT_TYPE_BOOLEAN,
+ EVENT_TYPE_ALLOCATION
+} GmtkMediaPlayerEventType;
+
typedef struct _GmtkMediaPlayer GmtkMediaPlayer;
typedef struct _GmtkMediaPlayerClass GmtkMediaPlayerClass;
@@ -222,9 +230,11 @@
typedef struct _GmtkMediaPlayerEvent {
GmtkMediaPlayer *player;
+ GmtkMediaPlayerEventType type;
gchar *event_name;
gint event_data_int;
gdouble event_data_double;
+ gboolean event_data_boolean;
GtkAllocation *event_allocation;
} GmtkMediaPlayerEvent;
@@ -304,6 +314,7 @@
gchar *album;
gboolean enable_divx;
gboolean disable_xvmc;
+ gboolean retry_on_full_cache;
gboolean deinterlace;
gboolean frame_drop;
Index: src/libgmtk/gmtk_media_player.c
===================================================================
--- src/libgmtk/gmtk_media_player.c (wersja 2151)
+++ src/libgmtk/gmtk_media_player.c (wersja 2152)
@@ -69,15 +69,27 @@
if (event && event->event_name != NULL
&& (event->player->restart == FALSE || event->event_data_int == ATTRIBUTE_AF_EXPORT_FILENAME)) {
- if (g_strcasecmp(event->event_name, "position-changed") == 0 ||
- g_strcasecmp(event->event_name, "cache-percent-changed") == 0) {
- g_signal_emit_by_name(event->player, event->event_name, event->event_data_double);
- } else if (g_strcasecmp(event->event_name, "size_allocate") == 0) {
- g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
- } else {
- g_signal_emit_by_name(event->player, event->event_name, event->event_data_int);
- }
+ switch (event->type) {
+ case EVENT_TYPE_INT:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_int);
+ break;
+
+ case EVENT_TYPE_DOUBLE:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_double);
+ break;
+
+ case EVENT_TYPE_BOOLEAN:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_boolean);
+ break;
+
+ case EVENT_TYPE_ALLOCATION:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
+ break;
+
+ default:
+ printf("undefined event %s\n", event->event_name);
+ }
g_free(event->event_name);
}
if (event)
@@ -93,6 +105,7 @@
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_INT;
event->event_name = g_strdup(name);
event->event_data_int = value;
g_idle_add(signal_event, event);
@@ -104,17 +117,31 @@
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_DOUBLE;
event->event_name = g_strdup(name);
event->event_data_double = value;
g_idle_add(signal_event, event);
}
+void create_event_boolean(GmtkMediaPlayer * player, const gchar * name, gboolean value)
+{
+ GmtkMediaPlayerEvent *event;
+
+ event = g_new0(GmtkMediaPlayerEvent, 1);
+ event->player = player;
+ event->type = EVENT_TYPE_BOOLEAN;
+ event->event_name = g_strdup(name);
+ event->event_data_boolean = value;
+ g_idle_add(signal_event, event);
+}
+
void create_event_allocation(GmtkMediaPlayer * player, const gchar * name, GtkAllocation * allocation)
{
GmtkMediaPlayerEvent *event;
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_ALLOCATION;
event->event_name = g_strdup(name);
event->event_allocation = allocation;
g_idle_add(signal_event, event);
@@ -300,6 +327,7 @@
player->channel_in = NULL;
player->channel_out = NULL;
player->channel_err = NULL;
+ player->retry_on_full_cache = FALSE;
}
static void gmtk_media_player_dispose(GObject * object)
@@ -993,6 +1021,10 @@
ret = player->hardware_ac3;
break;
+ case ATTRIBUTE_RETRY_ON_FULL_CACHE:
+ ret = player->retry_on_full_cache;
+ break;
+
default:
if (player->debug)
printf("Unsupported Attribute\n");
@@ -1788,6 +1820,7 @@
player->title_is_menu = FALSE;
player->enable_divx = TRUE;
player->disable_xvmc = FALSE;
+ player->retry_on_full_cache = FALSE;
g_mutex_lock(player->thread_running);
@@ -2477,6 +2510,11 @@
error_msg = g_strdup_printf(_("Compressed SWF format not supported"));
}
+ if (strstr(mplayer_output->str, "MOV: missing header (moov/cmov) chunk") != NULL) {
+ player->retry_on_full_cache = TRUE;
+ create_event_boolean(player, "attribute-changed", ATTRIBUTE_RETRY_ON_FULL_CACHE);
+ }
+
if (strstr(mplayer_output->str, "Title: ") != 0) {
buf = strstr(mplayer_output->str, "Title:");
buf = strstr(mplayer_output->str, "Title: ") + strlen("Title: ");
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 2151)
+++ src/gui.c (wersja 2152)
@@ -6052,6 +6052,11 @@
g_strlcpy(idledata->media_info, text, 1024);
g_thread_create(get_cover_art, metadata, FALSE, NULL);
break;
+
+ case ATTRIBUTE_RETRY_ON_FULL_CACHE:
+ idledata->retry_on_full_cache = gmtk_media_player_get_attribute_boolean (GMTK_MEDIA_PLAYER(media), ATTRIBUTE_RETRY_ON_FULL_CACHE);
+ break;
+
default:
if (verbose) {
printf("Unhandled attribute change %i\n", attribute);
Index: src/main.c
===================================================================
--- src/main.c (wersja 2151)
+++ src/main.c (wersja 2152)
@@ -534,6 +534,7 @@
idledata->width = width;
idledata->height = height;
+ idledata->retry_on_full_cache = FALSE;
idledata->cachepercent = -1.0;
g_strlcpy(idledata->info, uri, 1024);
set_media_info(idledata);
12 years, 9 months
rpms/gnome-mplayer/devel gnome-mplayer-applefix.patch,NONE,1.1
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5883
Added Files:
gnome-mplayer-applefix.patch
Log Message:
Added a forgotten patch
gnome-mplayer-applefix.patch:
gui.c | 5 ++++
libgmtk/gmtk_media_player.c | 54 +++++++++++++++++++++++++++++++++++++-------
libgmtk/gmtk_media_player.h | 13 +++++++++-
main.c | 1
4 files changed, 64 insertions(+), 9 deletions(-)
--- NEW FILE gnome-mplayer-applefix.patch ---
Index: src/libgmtk/gmtk_media_player.h
===================================================================
--- src/libgmtk/gmtk_media_player.h (wersja 2151)
+++ src/libgmtk/gmtk_media_player.h (wersja 2152)
@@ -170,7 +170,8 @@
ATTRIBUTE_ENABLE_FRAME_DROP,
ATTRIBUTE_TITLE,
ATTRIBUTE_ARTIST,
- ATTRIBUTE_ALBUM
+ ATTRIBUTE_ALBUM,
+ ATTRIBUTE_RETRY_ON_FULL_CACHE
} GmtkMediaPlayerMediaAttributes;
typedef enum {
@@ -201,6 +202,13 @@
COMMAND_SWITCH_FRAME_DROP
} GmtkMediaPlayerCommand;
+typedef enum {
+ EVENT_TYPE_INT,
+ EVENT_TYPE_DOUBLE,
+ EVENT_TYPE_BOOLEAN,
+ EVENT_TYPE_ALLOCATION
+} GmtkMediaPlayerEventType;
+
typedef struct _GmtkMediaPlayer GmtkMediaPlayer;
typedef struct _GmtkMediaPlayerClass GmtkMediaPlayerClass;
@@ -222,9 +230,11 @@
typedef struct _GmtkMediaPlayerEvent {
GmtkMediaPlayer *player;
+ GmtkMediaPlayerEventType type;
gchar *event_name;
gint event_data_int;
gdouble event_data_double;
+ gboolean event_data_boolean;
GtkAllocation *event_allocation;
} GmtkMediaPlayerEvent;
@@ -304,6 +314,7 @@
gchar *album;
gboolean enable_divx;
gboolean disable_xvmc;
+ gboolean retry_on_full_cache;
gboolean deinterlace;
gboolean frame_drop;
Index: src/libgmtk/gmtk_media_player.c
===================================================================
--- src/libgmtk/gmtk_media_player.c (wersja 2151)
+++ src/libgmtk/gmtk_media_player.c (wersja 2152)
@@ -69,15 +69,27 @@
if (event && event->event_name != NULL
&& (event->player->restart == FALSE || event->event_data_int == ATTRIBUTE_AF_EXPORT_FILENAME)) {
- if (g_strcasecmp(event->event_name, "position-changed") == 0 ||
- g_strcasecmp(event->event_name, "cache-percent-changed") == 0) {
- g_signal_emit_by_name(event->player, event->event_name, event->event_data_double);
- } else if (g_strcasecmp(event->event_name, "size_allocate") == 0) {
- g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
- } else {
- g_signal_emit_by_name(event->player, event->event_name, event->event_data_int);
- }
+ switch (event->type) {
+ case EVENT_TYPE_INT:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_int);
+ break;
+
+ case EVENT_TYPE_DOUBLE:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_double);
+ break;
+
+ case EVENT_TYPE_BOOLEAN:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_data_boolean);
+ break;
+
+ case EVENT_TYPE_ALLOCATION:
+ g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
+ break;
+
+ default:
+ printf("undefined event %s\n", event->event_name);
+ }
g_free(event->event_name);
}
if (event)
@@ -93,6 +105,7 @@
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_INT;
event->event_name = g_strdup(name);
event->event_data_int = value;
g_idle_add(signal_event, event);
@@ -104,17 +117,31 @@
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_DOUBLE;
event->event_name = g_strdup(name);
event->event_data_double = value;
g_idle_add(signal_event, event);
}
+void create_event_boolean(GmtkMediaPlayer * player, const gchar * name, gboolean value)
+{
+ GmtkMediaPlayerEvent *event;
+
+ event = g_new0(GmtkMediaPlayerEvent, 1);
+ event->player = player;
+ event->type = EVENT_TYPE_BOOLEAN;
+ event->event_name = g_strdup(name);
+ event->event_data_boolean = value;
+ g_idle_add(signal_event, event);
+}
+
void create_event_allocation(GmtkMediaPlayer * player, const gchar * name, GtkAllocation * allocation)
{
GmtkMediaPlayerEvent *event;
event = g_new0(GmtkMediaPlayerEvent, 1);
event->player = player;
+ event->type = EVENT_TYPE_ALLOCATION;
event->event_name = g_strdup(name);
event->event_allocation = allocation;
g_idle_add(signal_event, event);
@@ -300,6 +327,7 @@
player->channel_in = NULL;
player->channel_out = NULL;
player->channel_err = NULL;
+ player->retry_on_full_cache = FALSE;
}
static void gmtk_media_player_dispose(GObject * object)
@@ -993,6 +1021,10 @@
ret = player->hardware_ac3;
break;
+ case ATTRIBUTE_RETRY_ON_FULL_CACHE:
+ ret = player->retry_on_full_cache;
+ break;
+
default:
if (player->debug)
printf("Unsupported Attribute\n");
@@ -1788,6 +1820,7 @@
player->title_is_menu = FALSE;
player->enable_divx = TRUE;
player->disable_xvmc = FALSE;
+ player->retry_on_full_cache = FALSE;
g_mutex_lock(player->thread_running);
@@ -2477,6 +2510,11 @@
error_msg = g_strdup_printf(_("Compressed SWF format not supported"));
}
+ if (strstr(mplayer_output->str, "MOV: missing header (moov/cmov) chunk") != NULL) {
+ player->retry_on_full_cache = TRUE;
+ create_event_boolean(player, "attribute-changed", ATTRIBUTE_RETRY_ON_FULL_CACHE);
+ }
+
if (strstr(mplayer_output->str, "Title: ") != 0) {
buf = strstr(mplayer_output->str, "Title:");
buf = strstr(mplayer_output->str, "Title: ") + strlen("Title: ");
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 2151)
+++ src/gui.c (wersja 2152)
@@ -6052,6 +6052,11 @@
g_strlcpy(idledata->media_info, text, 1024);
g_thread_create(get_cover_art, metadata, FALSE, NULL);
break;
+
+ case ATTRIBUTE_RETRY_ON_FULL_CACHE:
+ idledata->retry_on_full_cache = gmtk_media_player_get_attribute_boolean (GMTK_MEDIA_PLAYER(media), ATTRIBUTE_RETRY_ON_FULL_CACHE);
+ break;
+
default:
if (verbose) {
printf("Unhandled attribute change %i\n", attribute);
Index: src/main.c
===================================================================
--- src/main.c (wersja 2151)
+++ src/main.c (wersja 2152)
@@ -534,6 +534,7 @@
idledata->width = width;
idledata->height = height;
+ idledata->retry_on_full_cache = FALSE;
idledata->cachepercent = -1.0;
g_strlcpy(idledata->info, uri, 1024);
set_media_info(idledata);
12 years, 9 months
rpms/gecko-mediaplayer/F-14 gecko-mediaplayer-applefix.patch, 1.1, 1.2 gecko-mediaplayer.spec, 1.27, 1.28
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5779
Modified Files:
gecko-mediaplayer-applefix.patch gecko-mediaplayer.spec
Log Message:
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 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-14/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:49 -0000 1.1
+++ gecko-mediaplayer-applefix.patch 8 Jul 2011 07:21:22 -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-14/gecko-mediaplayer.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gecko-mediaplayer.spec 7 Jul 2011 19:47:49 -0000 1.27
+++ gecko-mediaplayer.spec 8 Jul 2011 07:21:22 -0000 1.28
@@ -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> - 1.0.4-3
+- Updated the apple.com fix
+
* Thu Jul 07 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
12 years, 9 months
rpms/gecko-mediaplayer/F-15 gecko-mediaplayer-applefix.patch, 1.1, 1.2 gecko-mediaplayer.spec, 1.30, 1.31
by Julian Sikorski
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> - 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> - 1.0.4-3
+- Updated the apple.com fix
+
* Thu Jul 07 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
12 years, 9 months
rpms/gecko-mediaplayer/devel gecko-mediaplayer-applefix.patch, 1.1, 1.2 gecko-mediaplayer.spec, 1.30, 1.31
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5560
Modified Files:
gecko-mediaplayer-applefix.patch gecko-mediaplayer.spec
Log Message:
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 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/devel/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:24 -0000 1.1
+++ gecko-mediaplayer-applefix.patch 8 Jul 2011 07:21:00 -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/devel/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:25 -0000 1.30
+++ gecko-mediaplayer.spec 8 Jul 2011 07:21:01 -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> - 1.0.4-3
+- Updated the apple.com fix
+
* Thu Jul 07 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
12 years, 9 months
rpms/gnome-mplayer/F-15 gnome-mplayer.spec,1.35,1.36
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5448
Modified Files:
gnome-mplayer.spec
Log Message:
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-15/gnome-mplayer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-mplayer.spec 1 Jul 2011 20:08:30 -0000 1.35
+++ gnome-mplayer.spec 8 Jul 2011 07:19:49 -0000 1.36
@@ -2,13 +2,14 @@
Name: gnome-mplayer
Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: %{name}-applefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -102,9 +103,11 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
+%patch0 -p0 -d generic -b .applefix
%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+%patch0 -p0 -d minimal -b .applefix
%endif
@@ -250,6 +253,9 @@
%changelog
+* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
+- Fixed apple.com regression using a patch from SVN
+
* Fri Jul 01 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-1
- Updated to 1.0.4
- Enabled gtk3 on Fedora 15 and above
12 years, 9 months
rpms/gnome-mplayer/devel gnome-mplayer.spec,1.35,1.36
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5342
Modified Files:
gnome-mplayer.spec
Log Message:
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-mplayer.spec 1 Jul 2011 20:08:20 -0000 1.35
+++ gnome-mplayer.spec 8 Jul 2011 07:19:39 -0000 1.36
@@ -2,13 +2,14 @@
Name: gnome-mplayer
Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: %{name}-applefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -102,9 +103,11 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
+%patch0 -p0 -d generic -b .applefix
%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+%patch0 -p0 -d minimal -b .applefix
%endif
@@ -250,6 +253,9 @@
%changelog
+* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
+- Fixed apple.com regression using a patch from SVN
+
* Fri Jul 01 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-1
- Updated to 1.0.4
- Enabled gtk3 on Fedora 15 and above
12 years, 9 months
rpms/gecko-mediaplayer/F-14 gecko-mediaplayer-applefix.patch, NONE, 1.1 gecko-mediaplayer.spec, 1.26, 1.27
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24711
Modified Files:
gecko-mediaplayer.spec
Added Files:
gecko-mediaplayer-applefix.patch
Log Message:
* Thu Jul 07 2011 Julian Sikorski <belegdol(a)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/F-14/gecko-mediaplayer.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gecko-mediaplayer.spec 1 Jul 2011 20:10:38 -0000 1.26
+++ gecko-mediaplayer.spec 7 Jul 2011 19:47:49 -0000 1.27
@@ -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(a)fedoraproject.org> - 1.0.4-2
+- Fixed apple.com regression using a patch from SVN
+
* Fri Jul 01 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-1
- Updated to 1.0.4
12 years, 9 months