diff options
| author | Benjamin Otte <otte@gnome.org> | 2008-07-16 21:02:52 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2008-07-16 21:03:51 +0200 |
| commit | a814464d9cedecea3d7c22c3211a36476fe98d45 (patch) | |
| tree | 31b84b1cbef8df3b686748d7c87c4acac18b2508 | |
| parent | f4edc13520d44d35d6fe73485d30642b62c1a4f5 (diff) | |
rework to recent API changes
also make the output of the status line more useful
| -rw-r--r-- | src/plugin.c | 2 | ||||
| -rw-r--r-- | src/swfmoz_player.c | 11 | ||||
| -rw-r--r-- | src/swfmoz_player.h | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/plugin.c b/src/plugin.c index 3d9bf88..598ef24 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -340,7 +340,7 @@ plugin_destroy_stream_cb (NPP instance, NPStream* stream, NPReason reason) return NPERR_INVALID_INSTANCE_ERROR; swfmoz_loader_ensure_open (stream->pdata); - swfdec_stream_eof (stream->pdata); + swfdec_stream_close (stream->pdata); SWFMOZ_LOADER (stream->pdata)->stream = NULL; g_object_unref (stream->pdata); return NPERR_NO_ERROR; diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c index 806ead7..f62694e 100644 --- a/src/swfmoz_player.c +++ b/src/swfmoz_player.c @@ -493,8 +493,7 @@ swfmoz_player_init (SwfmozPlayer *player) player->context = g_main_context_default (); player->loaders = GTK_TREE_MODEL (gtk_list_store_new (SWFMOZ_LOADER_N_COLUMNS, - SWFMOZ_TYPE_LOADER, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING)); + SWFMOZ_TYPE_LOADER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING)); } SwfdecPlayer * @@ -521,7 +520,7 @@ static void swfmoz_player_loaders_update (GtkListStore *store, GtkTreeIter *iter, SwfdecLoader *loader) { goffset loaded, size; - gboolean eof, error; + gboolean error; const SwfdecURL *url; const char *url_string; char *str_loaded, *str_size; @@ -531,7 +530,7 @@ swfmoz_player_loaders_update (GtkListStore *store, GtkTreeIter *iter, SwfdecLoad size = swfdec_loader_get_size (loader); /* FIXME: swfdec needs a function for this */ - g_object_get (G_OBJECT (loader), "eof", &eof, "error", &error, NULL); + g_object_get (G_OBJECT (loader), "error", &error, NULL); if (error == TRUE) { status = g_strdup("error"); @@ -539,7 +538,7 @@ swfmoz_player_loaders_update (GtkListStore *store, GtkTreeIter *iter, SwfdecLoad str_loaded = g_format_size_for_display(loaded); str_size = g_format_size_for_display(size); - if (size == loaded) + if (swfdec_stream_is_complete (SWFDEC_STREAM (loader))) status = g_strdup_printf("%s", str_loaded); else if (size < 0) status = g_strdup_printf("at %s", str_loaded); @@ -563,8 +562,6 @@ swfmoz_player_loaders_update (GtkListStore *store, GtkTreeIter *iter, SwfdecLoad gtk_list_store_set (store, iter, SWFMOZ_LOADER_COLUMN_LOADER, loader, SWFMOZ_LOADER_COLUMN_URL, url_string, - SWFMOZ_LOADER_COLUMN_EOF, eof, - SWFMOZ_LOADER_COLUMN_ERROR, error, SWFMOZ_LOADER_COLUMN_TYPE, swfmoz_loader_get_data_type_string (loader), SWFMOZ_LOADER_COLUMN_STATUS, status, -1); diff --git a/src/swfmoz_player.h b/src/swfmoz_player.h index d9967f1..bd747a9 100644 --- a/src/swfmoz_player.h +++ b/src/swfmoz_player.h @@ -31,8 +31,6 @@ enum { SWFMOZ_LOADER_COLUMN_LOADER, SWFMOZ_LOADER_COLUMN_URL, SWFMOZ_LOADER_COLUMN_TYPE, - SWFMOZ_LOADER_COLUMN_EOF, - SWFMOZ_LOADER_COLUMN_ERROR, SWFMOZ_LOADER_COLUMN_STATUS, SWFMOZ_LOADER_N_COLUMNS }; |