search for: g_return_val_if_fail

...bswfdec/swfdec_audio_event.c @@ -50,32 +50,32 @@ swfdec_audio_event_iterate (SwfdecAudio *audio, guint remove) return 0; } -static double +static guint16 swfdec_audio_event_get_envelop_volume (SwfdecAudioEvent *event, guint pos, guint offset, guint channel) { double distance; - g_return_val_if_fail (SWFDEC_IS_AUDIO_EVENT (event), 1); - g_return_val_if_fail (pos <= event->n_envelopes, 1); - g_return_val_if_fail (channel == 0 || channel == 1, 1); + g_return_val_if_fail (SWFDEC_IS_AUDIO_EVENT (event), 32768); + g_return_val_if_fail (pos <= event->n_envelopes, 32768); + g_return_...

...a sane format if a buffer was returned diff --git a/libswfdec/swfdec_codec_audio.c b/libswfdec/swfdec_codec_audio.c index 770027c..5e8b9aa 100644 --- a/libswfdec/swfdec_codec_audio.c +++ b/libswfdec/swfdec_codec_audio.c @@ -276,6 +276,8 @@ swfdec_audio_decoder_pull (SwfdecAudioDecoder *decoder) g_return_val_if_fail (decoder != NULL, NULL); ret = decoder->pull (decoder); + if (ret == NULL) + return NULL; g_return_val_if_fail (SWFDEC_IS_AUDIO_FORMAT (decoder->format), ret); return ret; } commit c99e09aea38c969959691d2198c102ed17871857 Author: Benjamin Otte <otte at gnome.org> Date:...

...ader_set_data_type (load_object->loader, SWFDEC_LOADER_DATA_TEXT); +} + static gboolean swfdec_load_object_load (SwfdecLoadObject *load_object, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *data) { + SwfdecPlayer *player; + SwfdecSecurity *sec; SwfdecAsValue val; g_return_val_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object), FALSE); g_return_val_if_fail (url != NULL, FALSE); + player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (load_object)->context); swfdec_load_object_reset (load_object); - load_object->loader = swfdec_player_load ( - SWFDEC_PLAYER (SWFDEC_AS_OBJECT (l...

...dec_as_object.h" #include "swfdec_as_types.h" #include "swfdec_debug.h" +#include "swfdec_script.h" /*** GTK_DOC ***/ @@ -67,7 +69,7 @@ swfdec_as_context_abort (SwfdecAsContext gboolean swfdec_as_context_use_mem (SwfdecAsContext *context, gsize len) { - g_return_val_if_fail (SWFDEC_AS_IS_CONTEXT (context), FALSE); + g_return_val_if_fail (SWFDEC_IS_AS_CONTEXT (context), FALSE); g_return_val_if_fail (len > 0, FALSE); context->memory += len; @@ -77,7 +79,7 @@ swfdec_as_context_use_mem (SwfdecAsConte void swfdec_as_context_unuse_mem (SwfdecAsContext *cont...

...hu Aug 2 19:53:54 2007 +0200 fix compile issues diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 9193f0b..c5b4de5 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -246,7 +246,7 @@ swfdec_loader_load (SwfdecLoader *loader SwfdecURL *url; g_return_val_if_fail (SWFDEC_IS_LOADER (loader), NULL); - g_return_val_if_fail (url != NULL, NULL); + g_return_val_if_fail (url_string != NULL, NULL); g_return_val_if_fail (data != NULL || data_len == 0, NULL); klass = SWFDEC_LOADER_GET_CLASS (loader); @@ -422,7 +422,7 @@ swfdec_loader_get_filename (SwfdecLoa...

...fdec_as_frame_init (SwfdecAsFrame *fra } SwfdecAsFrame * -swfdec_as_frame_new (SwfdecAsObject *thisp, SwfdecScript *script) +swfdec_as_frame_new (SwfdecAsContext *context, SwfdecScript *script) { - SwfdecAsContext *context; SwfdecAsFrame *frame; SwfdecAsStack *stack; gsize size; - g_return_val_if_fail (SWFDEC_IS_AS_OBJECT (thisp), NULL); - g_return_val_if_fail (thisp->properties, NULL); + g_return_val_if_fail (SWFDEC_IS_AS_CONTEXT (context), NULL); g_return_val_if_fail (script != NULL, NULL); - context = thisp->context; stack = swfdec_as_stack_new (context, 100); /* FIXME: inv...

...GNOME_VFS_OPEN_READ, GNOME_VFS_PRIORITY_DEFAULT, swfdec_gtk_loader_open_cb, gtk); } static void @@ -235,13 +219,16 @@ swfdec_gtk_loader_init (SwfdecGtkLoader SwfdecLoader * swfdec_gtk_loader_new (const char *uri) { - GnomeVFSURI *guri; + SwfdecURL *url; + SwfdecLoader *loader; g_return_val_if_fail (uri != NULL, NULL); - gnome_vfs_init (); - guri = gnome_vfs_uri_new (uri); - return swfdec_gtk_loader_new_from_uri (guri); + url = swfdec_url_new (uri); + g_return_val_if_fail (url == NULL, NULL); /* FIXME */ + loader = g_object_new (SWFDEC_TYPE_GTK_LOADER, NULL); + swfdec_gtk_loader_load...

...decAsObject); } SwfdecAsFunction * -swfdec_as_function_do_create (SwfdecAsContext *context) +swfdec_as_function_create (SwfdecAsContext *context, GType type, guint size) { SwfdecAsValue val; SwfdecAsObject *fun; - if (!swfdec_as_context_use_mem (context, sizeof (SwfdecAsFunction))) + g_return_val_if_fail (SWFDEC_IS_AS_CONTEXT (context), NULL); + g_return_val_if_fail (g_type_is_a (type, SWFDEC_TYPE_AS_FUNCTION), NULL); + g_return_val_if_fail (size >= sizeof (SwfdecAsFunction), NULL); + + if (!swfdec_as_context_use_mem (context, size)) return NULL; - fun = g_object_new (SWFDEC_TYPE_AS_FUN...

...val->timeout); + + player->intervals = + g_list_prepend (player->intervals, interval); + + return interval->id; +} + +guint +swfdec_interval_new_function (SwfdecPlayer *player, guint msecs, gboolean repeat, + SwfdecAsFunction *fun, guint n_args, const SwfdecAsValue *args) +{ + g_return_val_if_fail (SWFDEC_IS_PLAYER (player), 0); + g_return_val_if_fail (msecs > 0, 0); + g_return_val_if_fail (SWFDEC_IS_AS_FUNCTION (fun), 0); + g_return_val_if_fail (n_args == 0 || args != NULL, 0); + + return swfdec_interval_new (player, msecs, repeat, SWFDEC_AS_OBJECT (fun), NULL, n_args, args); +} + +g...

...L); - - G_OBJECT_CLASS (swfdec_scriptable_parent_class)->dispose (object); -} - -static JSObject * -swfdec_scriptable_create_js_object (SwfdecScriptable *scriptable) -{ - SwfdecScriptableClass *klass; - JSContext *cx; - JSObject *obj; - - klass = SWFDEC_SCRIPTABLE_GET_CLASS (scriptable); - g_return_val_if_fail (klass->jsclass != NULL, NULL); - cx = scriptable->jscx; - - obj = JS_NewObject (cx, (JSClass *) klass->jsclass, NULL, NULL); - if (obj == NULL) { - SWFDEC_ERROR ("failed to create JS object for %s %p", - G_OBJECT_TYPE_NAME (scriptable), scriptable); - return NULL; - }...

libswfdec/swfdec_html_parser.c | 89 +++++++++++++++++++++++------------- libswfdec/swfdec_text_field_movie.c | 1 2 files changed, 60 insertions(+), 30 deletions(-) New commits: commit b4c20d7519ae5d93c9ba3258bde8444aebdd1be6 Author: Pekka Lampila <pekka.lampila at iki.fi> Date: Fri Oct 19 15:32:39 2007 +0300 If closing tag doesn't match in the HTML parser, close tags

...#include "swfdec_as_internal.h" @@ -297,10 +298,25 @@ swfdec_style_sheet_construct (SwfdecAsContext *cx, SwfdecAsObject *object, static SwfdecTextFormat * swfdec_style_sheet_get_format (SwfdecStyleSheet *style, const char *name) { + SwfdecAsObject *styles; + SwfdecAsValue val; + g_return_val_if_fail (SWFDEC_IS_STYLESHEET (style), NULL); g_return_val_if_fail (name != NULL, NULL); - return NULL; + swfdec_as_object_get_variable (SWFDEC_AS_OBJECT (style), + SWFDEC_AS_STR__styles, &val); + if (!SWFDEC_AS_VALUE_IS_OBJECT (&val)) + return NULL; + styles = SWFDEC_AS_VALUE_GET_...

...gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index fa2cf44..d2ec771 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -172,11 +172,13 @@ SwfdecLoader * swfdec_gtk_loader_new (const char *uri) { SwfdecLoader *loader; + SwfdecURL *url; g_return_val_if_fail (uri != NULL, NULL); - loader = g_object_new (SWFDEC_TYPE_GTK_LOADER, NULL); - loader->url = swfdec_url_new (uri); + url = swfdec_url_new (uri); + loader = g_object_new (SWFDEC_TYPE_GTK_LOADER, "url", url, NULL); + swfdec_url_free (url); swfdec_gtk_loader_load (loader, SWFDEC...

..._object) { } -static void +static gboolean swfdec_load_object_load (SwfdecLoadObject *load_object, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *data) { SwfdecAsValue val; - g_return_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object)); - g_return_if_fail (url != NULL); + g_return_val_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object), FALSE); + g_return_val_if_fail (url != NULL, FALSE); swfdec_load_object_reset (load_object); load_object->loader = swfdec_player_load ( SWFDEC_PLAYER (SWFDEC_AS_OBJECT (load_object)->context), url, request, data); + if (load_object->lo...

...- * priviliges for accessing the operation. Use g_object_unref() after - * use. + * Returns: %TRUE if access was granted, %FALSE otherwise. **/ -SwfdecSecurity * +gboolean swfdec_security_allow (SwfdecSecurity *guard, SwfdecSecurity *key) { SwfdecSecurityClass *klass; - g_return_val_if_fail (SWFDEC_IS_SECURITY (guard), NULL); - g_return_val_if_fail (SWFDEC_IS_SECURITY (key), NULL); + g_return_val_if_fail (SWFDEC_IS_SECURITY (guard), FALSE); + g_return_val_if_fail (SWFDEC_IS_SECURITY (key), FALSE); klass = SWFDEC_SECURITY_GET_CLASS (guard); - g_return_val_if_fail (klass->al...

...} -const char * -swfdec_text_field_movie_get_variable_text (SwfdecTextFieldMovie *text) +void +swfdec_text_field_movie_set_listen_variable (SwfdecTextFieldMovie *text, + const char *value) { - SwfdecAsObject *parent; - SwfdecAsValue val; + SwfdecAsObject *object; + const char *name; - g_return_val_if_fail (SWFDEC_IS_TEXT_FIELD_MOVIE (text), NULL); - g_return_val_if_fail (text->variable != NULL, NULL); + // FIXME: case-insensitive when v < 7? + if (text->variable == value) + return; - // FIXME: proper variable lookup - parent = SWFDEC_AS_OBJECT (SWFDEC_MOVIE (text)->parent); +...

thumbnailer/swfdec-thumbnailer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a31d0686b78df2da96b9d8d1e3220e63978bba30 Author: Benjamin Otte <otte at gnome.org> Date: Wed Nov 7 20:02:04 2007 +0100 s/swfdec_player_get_image_size/swfdec_player_get_default_size/ diff --git a/thumbnailer/swfdec-thumbnailer.c b/thumbnailer/swfdec-thumbnailer.c index

...ec_url_has_protocol: + * @url: a url + * @protocol: protocol name to check for + * + * Checks if the given @url references the given @protocol + * + * Returns: %TRUE if both protocols match, %FALSE otherwise + **/ +gboolean +swfdec_url_has_protocol (const SwfdecURL *url, const char *protocol) +{ + g_return_val_if_fail (url != NULL, FALSE); + g_return_val_if_fail (protocol != NULL, FALSE); + + return g_str_equal (url->protocol, protocol); +} + +/** * swfdec_url_get_host: * @url: a #SwfdecURL * diff --git a/libswfdec/swfdec_url.h b/libswfdec/swfdec_url.h index d3c4e24..6bf46fc 100644 --- a/libswfdec/swf...

...l, g_free, g_object_unref); } @@ -376,20 +363,11 @@ swfdec_swf_decoder_get_export (SwfdecSwf } gpointer -swfdec_swf_decoder_get_character (SwfdecSwfDecoder * s, int id) +swfdec_swf_decoder_get_character (SwfdecSwfDecoder * s, unsigned int id) { - SwfdecCharacter *character; - GList *g; - g_return_val_if_fail (SWFDEC_IS_SWF_DECODER (s), NULL); - for (g = s->characters; g; g = g_list_next (g)) { - character = SWFDEC_CHARACTER (g->data); - if (character->id == id) - return character; - } - - return NULL; + return g_hash_table_lookup (s->characters, GUINT_TO_POINTER (id)); }...

...s[SWF }; gboolean -swfdec_amf_parse_one (JSContext *cx, SwfdecBits *bits, SwfdecAmfType expected_type, - jsval *rval) +swfdec_amf_parse_one (SwfdecAsContext *context, SwfdecBits *bits, + SwfdecAmfType expected_type, SwfdecAsValue *rval) { SwfdecAmfParseFunc func; guint type; - g_return_val_if_fail (cx != NULL, FALSE); + g_return_val_if_fail (SWFDEC_IS_AS_CONTEXT (context), 0); g_return_val_if_fail (bits != NULL, FALSE); g_return_val_if_fail (rval != NULL, FALSE); g_return_val_if_fail (expected_type < SWFDEC_AMF_N_TYPES, FALSE); @@ -205,23 +202,24 @@ swfdec_amf_parse_one (JSConte...