[Swfdec] 4 commits - libswfdec/swfdec_bits.c libswfdec/swfdec_bits.h NEWS README

[Benjamin Otte]

 NEWS                    |    2 +-
 README                  |    9 +++++++--
 libswfdec/swfdec_bits.c |   11 +++++++----
 libswfdec/swfdec_bits.h |    6 +++---
 4 files changed, 18 insertions(+), 10 deletions(-)

New commits:
diff-tree 7594421b547a4243b11398b22c5ff8f6039c623d (from parents)
Merge: 1b3218d01850f729f0d99ffa06c462c40c451dfe 7f977c08a2fb481fb736609068fc9f10d428edab
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Apr 26 20:55:41 2007 +0200

    Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec

diff-tree 1b3218d01850f729f0d99ffa06c462c40c451dfe (from 0c861d377acb51205a72f0629c1f445f6bf9d07c)
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Apr 26 20:54:58 2007 +0200

    update README

diff --git a/README b/README
index d314463..af90cf7 100644
--- a/README
+++ b/README
@@ -3,6 +3,10 @@ Swfdec is a decoder/renderer for Macrome
 rendering engine is provided in a library that can be used by other 
 applications.  
 
+An additional library named libswfdec-gtk is provided for easy integration of
+Swfdec into Gtk applications. This library is what developers most likely want 
+to target their applications at. Building this library can be disabled.
+
 The library is still in heavy development. The intended audience are developers
 or people using it for pretested Flash animations (think embedded here). If you
 use it on unknown content, expect it to have issues and don't be surprised if 
@@ -63,9 +67,10 @@ Dependencies:
   zlib (>= 1.1.4)
 
   FFMpeg (>= 0.4.8 - optional, required for various audio and video formats)
+  GStreamer (>= 0.10.11 - optional, required for various audio and video formats)
   MAD (>= 0.15.1b - optional, required for MP3 audio format support)
 
-  GTK+ (>= 2.0 - optional)
-  ALSA (>= 1.0 - optional)
+  GTK+ (>= 2.0 - used by libswfdec-gtk)
+  ALSA (>= 1.0 - used by libswfdec-gtk)
 
 
diff-tree 0c861d377acb51205a72f0629c1f445f6bf9d07c (from 690c645eeb1b93e26dd12c2ef7c3eb2f2b4c037a)
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Apr 26 20:49:17 2007 +0200

    add release name

diff --git a/NEWS b/NEWS
index a719ed3..114721b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 
- 0.4.4 ()
+ 0.4.4 ("Birthday Cards")
 
 This is a stability release. The number of new supported Flash features
 is limited.
diff-tree 690c645eeb1b93e26dd12c2ef7c3eb2f2b4c037a (from 8977e39ad9aac26c936fb40acb2080d0101b75c3)
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Apr 24 10:57:17 2007 +0200

    constify const functions (James A. Morrison)

diff --git a/libswfdec/swfdec_bits.c b/libswfdec/swfdec_bits.c
index 7077cdc..b74846e 100644
--- a/libswfdec/swfdec_bits.c
+++ b/libswfdec/swfdec_bits.c
@@ -125,7 +125,7 @@ swfdec_bits_init_data (SwfdecBits *bits,
 }
 
 guint 
-swfdec_bits_left (SwfdecBits *b)
+swfdec_bits_left (const SwfdecBits *b)
 {
   if (b->ptr == NULL)
     return 0;
@@ -179,7 +179,7 @@ swfdec_bits_getbits (SwfdecBits * b, gui
 }
 
 guint
-swfdec_bits_peekbits (SwfdecBits * b, guint n)
+swfdec_bits_peekbits (const SwfdecBits * b, guint n)
 {
   SwfdecBits tmp = *b;
 
@@ -201,9 +201,12 @@ swfdec_bits_getsbits (SwfdecBits * b, gu
 }
 
 guint
-swfdec_bits_peek_u8 (SwfdecBits * b)
+swfdec_bits_peek_u8 (const SwfdecBits * b)
 {
-  SWFDEC_BYTES_CHECK (b, 1);
+  g_assert (b->idx == 0);
+  g_assert (b->ptr <= b->end);
+  if (b->ptr == b->end)
+    return 0;
 
   return *b->ptr;
 }
diff --git a/libswfdec/swfdec_bits.h b/libswfdec/swfdec_bits.h
index 9e14628..a86e705 100644
--- a/libswfdec/swfdec_bits.h
+++ b/libswfdec/swfdec_bits.h
@@ -39,12 +39,12 @@ struct _SwfdecBits
 void swfdec_bits_init (SwfdecBits *bits, SwfdecBuffer *buffer);
 void swfdec_bits_init_data (SwfdecBits *bits, const guint8 *data, guint len);
 void swfdec_bits_init_bits (SwfdecBits *bits, SwfdecBits *from, guint bytes);
-guint swfdec_bits_left (SwfdecBits *b);
+guint swfdec_bits_left (const SwfdecBits *b);
 int swfdec_bits_getbit (SwfdecBits * b);
 guint swfdec_bits_getbits (SwfdecBits * b, guint n);
-guint swfdec_bits_peekbits (SwfdecBits * b, guint n);
+guint swfdec_bits_peekbits (const SwfdecBits * b, guint n);
 int swfdec_bits_getsbits (SwfdecBits * b, guint n);
-guint swfdec_bits_peek_u8 (SwfdecBits * b);
+guint swfdec_bits_peek_u8 (const SwfdecBits * b);
 guint swfdec_bits_get_u8 (SwfdecBits * b);
 guint swfdec_bits_get_u16 (SwfdecBits * b);
 int swfdec_bits_get_s16 (SwfdecBits * b);