[Swfdec-commits] Branch '0.6' - 2 commits - swfdec-gtk/swfdec_playback_oss.c swfdec/Makefile.am swfdec/swfdec_movie.c
Benjamin Otte
company at kemper.freedesktop.org
Fri Apr 11 15:39:41 PDT 2008
swfdec-gtk/swfdec_playback_oss.c | 1 -
swfdec/Makefile.am | 2 +-
swfdec/swfdec_movie.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit af9f920058a3f546996b725574927e189bab12bb
Author: Benjamin Otte <otte at gnome.org>
Date: Sat Apr 12 00:33:13 2008 +0200
remove assertion
our only user claims it fixes playback for him, so we're nice and don't care
why it was there.
diff --git a/swfdec-gtk/swfdec_playback_oss.c b/swfdec-gtk/swfdec_playback_oss.c
index 88ce8fd..160f26d 100644
--- a/swfdec-gtk/swfdec_playback_oss.c
+++ b/swfdec-gtk/swfdec_playback_oss.c
@@ -84,7 +84,6 @@ handle_stream (GIOChannel *source, GIOCondition cond, gpointer data)
free(frag);
return FALSE;
}
- g_assert(spaceinfo.fragsize == stream->fragsize);
if (spaceinfo.fragments == 0)
break;
commit d8e8d6ca169417de6551c32effa21abd8cd98b1e
Author: Benjamin Otte <otte at gnome.org>
Date: Sat Apr 12 00:32:18 2008 +0200
a $ is not a valid character for identifiers
gcc allows it for compatibility reasons, but other compilers don't.
diff --git a/swfdec/Makefile.am b/swfdec/Makefile.am
index 217b5c0..d05145e 100644
--- a/swfdec/Makefile.am
+++ b/swfdec/Makefile.am
@@ -367,7 +367,7 @@ swfdec_as_strings.h: swfdec_as_strings.c
&& echo "extern const char swfdec_as_strings[];" \
&& grep " SWFDEC_AS_CONSTANT_STRING" swfdec_as_strings.c \
| sed "s/.*(\"\(.*\)\").*/\1/" \
- | LC_ALL="C" $(AWK) '{ if ($$0 == "") name = "EMPTY"; else if ($$0 == ",") name = "COMMA"; else if ($$0 == "/") name = "SLASH"; else name = $$0; gsub("[^a-zA-Z0-9\\$$]","_",name); print "#define SWFDEC_AS_STR_" name " &swfdec_as_strings[" x + 1 "]"; x = x + length ($$0) + 2 }' \
+ | LC_ALL="C" $(AWK) '{ if ($$0 == "") name = "EMPTY"; else if ($$0 == ",") name = "COMMA"; else if ($$0 == "/") name = "SLASH"; else name = $$0; gsub("[^a-zA-Z0-9]","_",name); print "#define SWFDEC_AS_STR_" name " &swfdec_as_strings[" x + 1 "]"; x = x + length ($$0) + 2 }' \
&& echo "#endif" ) > xgen-sas \
&& (cmp -s xgen-sas swfdec_as_strings.h || cp xgen-sas swfdec_as_strings.h ) \
&& rm -f xgen-sas
diff --git a/swfdec/swfdec_movie.c b/swfdec/swfdec_movie.c
index c4d0b55..34e5eef 100644
--- a/swfdec/swfdec_movie.c
+++ b/swfdec/swfdec_movie.c
@@ -1526,7 +1526,7 @@ swfdec_movie_set_version (SwfdecMovie *movie)
o = SWFDEC_AS_OBJECT (movie);
cx = o->context;
SWFDEC_AS_VALUE_SET_STRING (&val, swfdec_as_context_get_string (cx, SWFDEC_PLAYER (cx)->priv->system->version));
- swfdec_as_object_set_variable (o, SWFDEC_AS_STR_$version, &val);
+ swfdec_as_object_set_variable (o, SWFDEC_AS_STR__version, &val);
}
/**
More information about the Swfdec-commits
mailing list