diff options
| author | Benjamin Otte <otte@gnome.org> | 2007-10-17 11:34:45 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2007-10-17 11:34:45 +0200 |
| commit | 5007f2aedb6e97a53c7a1d391de27d58a359a04e (patch) | |
| tree | 0ced493dd568f25d50c217d18c6e4936a5691ca7 | |
| parent | 42f1dcc0e604d0ddba306039b0b5e566d8ed3561 (diff) | |
Ha, we don't need case sensitivity options.
I can't read tests...
| -rw-r--r-- | libswfdec/swfdec_as_interpret.c | 4 | ||||
| -rw-r--r-- | libswfdec/swfdec_player.c | 7 | ||||
| -rw-r--r-- | libswfdec/swfdec_player_internal.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/libswfdec/swfdec_as_interpret.c b/libswfdec/swfdec_as_interpret.c index d0814fdd..1f7faaf8 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -1149,7 +1149,7 @@ swfdec_action_get_url (SwfdecAsContext *cx, guint action, const guint8 *data, gu } else if (swfdec_player_fscommand (SWFDEC_PLAYER (cx), url, target)) { /* nothing to do here */ } else { - SwfdecSpriteMovie *movie = swfdec_player_get_level (SWFDEC_PLAYER (cx), target, TRUE, TRUE); + SwfdecSpriteMovie *movie = swfdec_player_get_level (SWFDEC_PLAYER (cx), target, TRUE); if (movie) { if (SWFDEC_MOVIE (movie)->swf == NULL) { swfdec_sprite_movie_load (movie, url, SWFDEC_LOADER_REQUEST_DEFAULT, NULL); @@ -1198,7 +1198,7 @@ swfdec_action_get_url2 (SwfdecAsContext *cx, guint action, const guint8 *data, g } else if (internal || variables) { SwfdecSpriteMovie *movie; /* FIXME: This code looks wrong - figure out how levels are handled */ - movie = swfdec_player_get_level (SWFDEC_PLAYER (cx), target, TRUE, !variables); + movie = swfdec_player_get_level (SWFDEC_PLAYER (cx), target, !variables); if (movie == NULL) { movie = (SwfdecSpriteMovie *) swfdec_player_get_movie_from_string ( SWFDEC_PLAYER (cx), target); diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index ace4c452..80379279 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -1573,8 +1573,6 @@ swfdec_player_invalidate (SwfdecPlayer *player, const SwfdecRect *rect) * swfdec_player_get_level: * @player: a #SwfdecPlayer * @name: name of the level to request - * @ignore_case: %TRUE to always be case insensitive, otherwise use the version - * to determine case sensitivity * @create: %TRUE to create if it doesn't exist * * This function is used to look up root movies in the given @player. The @@ -1588,8 +1586,7 @@ swfdec_player_invalidate (SwfdecPlayer *player, const SwfdecRect *rect) * fully initialized (yes, this function sucks). **/ SwfdecSpriteMovie * -swfdec_player_get_level (SwfdecPlayer *player, const char *name, gboolean ignore_case, - gboolean create) +swfdec_player_get_level (SwfdecPlayer *player, const char *name, gboolean create) { SwfdecSpriteMovie *movie; GList *walk; @@ -1602,7 +1599,7 @@ swfdec_player_get_level (SwfdecPlayer *player, const char *name, gboolean ignore g_return_val_if_fail (name != NULL, NULL); /* check name starts with "_level" */ - if (swfdec_strncmp (ignore_case ? 6 : SWFDEC_AS_CONTEXT (player)->version, name, "_level", 6) != 0) + if (swfdec_strncmp (SWFDEC_AS_CONTEXT (player)->version, name, "_level", 6) != 0) return NULL; name += 6; /* extract depth from rest string (or fail if it's not a depth) */ diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_player_internal.h index f25f7821..f5c25577 100644 --- a/libswfdec/swfdec_player_internal.h +++ b/libswfdec/swfdec_player_internal.h @@ -198,7 +198,6 @@ void swfdec_player_stop_all_sounds (SwfdecPlayer * player); SwfdecSpriteMovie * swfdec_player_get_level (SwfdecPlayer * player, const char * name, - gboolean ignore_case, gboolean create); SwfdecMovie * swfdec_player_add_level_from_loader (SwfdecPlayer * player, |