Swfdec - Mar 2007 - 5 commits - doc/Makefile.am doc/swfdec-docs.sgml doc/swfdec-sections.txt libswfdec/swfdec_loader.c libswfdec/swfdec_player.c

doc/Makefile.am           |   20 ++++++++++++++++++--
 doc/swfdec-docs.sgml      |    1 +
 doc/swfdec-sections.txt   |   18 +++++++++++++++++-
 libswfdec/swfdec_loader.c |   15 +++++++++++++++
 libswfdec/swfdec_player.c |    8 ++++++++
 5 files changed, 59 insertions(+), 3 deletions(-)

New commits:
diff-tree 00252e7f75acd6466c2ae7c6fc446f4741dab7a1 (from
07b4bd5159998882ec3b665b5a0f8216663d8b43)
Author: Benjamin Otte <otte@gnome.org>
Date:   Sat Mar 17 00:15:16 2007 +0100

    document SwfdecLoaderDataType

diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c
index 29abd3f..9087748 100644
--- a/libswfdec/swfdec_loader.c
+++ b/libswfdec/swfdec_loader.c
@@ -54,6 +54,21 @@
  * subclass to provide your input.
  */
 
+/**
+ * SwfdecLoaderDataType:
+ * @SWFDEC_LOADER_DATA_UNKNOWN: Unidentified data or data that cannot be 
+ *                              identified.
+ * @SWFDEC_LOADER_DATA_SWF: Data describing a normal Flash file.
+ * @SWFDEC_LOADER_DATA_FLV: Data describing a Flash video stream.
+ * @SWFDEC_LOADER_DATA_XML: Data in XML format.
+ * @SWFDEC_LOADER_DATA_TEXT: Textual data.
+ *
+ * This type describes the different types of data that can be loaded inside 
+ * Swfdec. Swfdec identifies its data streams and you can use the 
+ * swfdec_loader_get_data_type() to acquire more information about the data
+ * inside a #SwfdecLoader.
+ */
+
 /*** SwfdecLoader ***/
 
 enum {
diff-tree 07b4bd5159998882ec3b665b5a0f8216663d8b43 (from
8e4bbb3208a40867f2ec0300598e00a03eea744f)
Author: Benjamin Otte <otte@gnome.org>
Date:   Sat Mar 17 00:14:56 2007 +0100

    add an intro for the new Enumerations section in the docs

diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c
index fd528fa..b9bf7e9 100644
--- a/libswfdec/swfdec_player.c
+++ b/libswfdec/swfdec_player.c
@@ -79,6 +79,14 @@
  */
 
 /**
+ * SECTION:Enumerations
+ * @title: Enumerations
+ * @short_description: enumerations used in Swfdec
+ *
+ * This file lists all of the enumerations used in various parts of Swfdec.
+ */
+
+/**
  * SwfdecMouseCursor:
  * @SWFDEC_MOUSE_CURSOR_NORMAL: a normal mouse cursor
  * @SWFDEC_MOUSE_CURSOR_NONE: no mouse image
diff-tree 8e4bbb3208a40867f2ec0300598e00a03eea744f (from
2a0c5d3d9e82fe181e7800c8a32ab84847c97b6a)
Author: Benjamin Otte <otte@gnome.org>
Date:   Sat Mar 17 00:14:26 2007 +0100

    add new functions to the docs

diff --git a/doc/swfdec-docs.sgml b/doc/swfdec-docs.sgml
index d599132..95ec0ba 100644
--- a/doc/swfdec-docs.sgml
+++ b/doc/swfdec-docs.sgml
@@ -8,6 +8,7 @@
 
   <chapter>
     <title>Public API</title>
+    <xi:include href="xml/Enumerations.xml"/>
     <xi:include href="xml/SwfdecPlayer.xml"/>
     <xi:include href="xml/SwfdecAudio.xml"/>
     <xi:include href="xml/SwfdecBuffer.xml"/>
diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt
index 4a45ff4..e0bb55f 100644
--- a/doc/swfdec-sections.txt
+++ b/doc/swfdec-sections.txt
@@ -4,6 +4,7 @@
 SwfdecAudio
 swfdec_audio_render
 <SUBSECTION Standard>
+SwfdecAudioClass
 SWFDEC_AUDIO
 SWFDEC_IS_AUDIO
 SWFDEC_TYPE_AUDIO
@@ -20,8 +21,11 @@ SwfdecLoader
 swfdec_loader_new_from_file
 swfdec_loader_push
 swfdec_loader_eof
+swfdec_loader_error
 swfdec_loader_get_filename
+swfdec_loader_get_data_type
 <SUBSECTION Standard>
+SwfdecLoaderClass
 SWFDEC_LOADER
 SWFDEC_IS_LOADER
 SWFDEC_TYPE_LOADER
@@ -34,7 +38,6 @@ SWFDEC_LOADER_GET_CLASS
 <SECTION>
 <FILE>SwfdecPlayer</FILE>
 <TITLE>SwfdecPlayer</TITLE>
-SwfdecMouseCursor
 SwfdecPlayer
 swfdec_init
 swfdec_player_new
@@ -53,6 +56,7 @@ swfdec_player_handle_mouse
 swfdec_player_render_audio
 swfdec_player_get_audio
 <SUBSECTION Standard>
+SwfdecPlayerClass
 SWFDEC_PLAYER
 SWFDEC_IS_PLAYER
 SWFDEC_TYPE_PLAYER
@@ -86,3 +90,15 @@ swfdec_buffer_queue_pull_buffer
 swfdec_buffer_queue_peek
 </SECTION>
 
+<SECTION>
+<FILE>Enumerations</FILE>
+<TITLE>Enumerations</TITLE>
+SwfdecLoaderDataType
+swfdec_loader_data_type_get_extension
+SwfdecMouseCursor
+<SUBSECTION Standard>
+SWFDEC_TYPE_LOADER_DATA_TYPE
+swfdec_loader_data_type_get_type
+SWFDEC_TYPE_MOUSE_CURSOR
+swfdec_mouse_cursor_get_type
+</SECTION>
diff-tree 2a0c5d3d9e82fe181e7800c8a32ab84847c97b6a (from
653a85ad459e538c7f1ea7aa4785aaf6f411781e)
Author: Benjamin Otte <otte@gnome.org>
Date:   Fri Mar 16 23:59:44 2007 +0100

    update the list of header files to exclude

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d4dca5..afe0261 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -56,36 +56,45 @@ IGNORE_HFILES= \
 	jpeg \
 	swfdec_audio_internal.h \
 	swfdec_audio_event.h \
+	swfdec_audio_flv.h \
 	swfdec_audio_stream.h \
 	swfdec_bits.h \
 	swfdec_button.h \
 	swfdec_button_movie.h \
 	swfdec_cache.h \
+	swfdec_cached.h \
 	swfdec_character.h \
 	swfdec_codec.h \
 	swfdec_color.h \
-	swfdec_compiler.h \
+	swfdec_connection.h \
 	swfdec_debug.h \
 	swfdec_debugger.h \
 	swfdec_decoder.h \
 	swfdec_edittext.h \
 	swfdec_edittext_movie.h \
 	swfdec_event.h \
+	swfdec_flv_decoder.h \
 	swfdec_font.h \
 	swfdec_graphic.h \
 	swfdec_graphic_movie.h \
 	swfdec_image.h \
 	swfdec_js.h \
+	swfdec_listener.h \
 	swfdec_loader_internal.h \
+	swfdec_loadertarget.h \
 	swfdec_marshal.h \
 	swfdec_morph_movie.h \
 	swfdec_morphshape.h \
 	swfdec_movie.h \
+	swfdec_net_stream.h \
 	swfdec_pattern.h \
 	swfdec_player_internal.h \
 	swfdec_rect.h \
 	swfdec_ringbuffer.h \
 	swfdec_root_movie.h \
+	swfdec_root_sprite.h \
+	swfdec_script.h \
+	swfdec_scriptable.h \
 	swfdec_shape.h \
 	swfdec_sound.h \
 	swfdec_sprite.h \
@@ -93,7 +102,10 @@ IGNORE_HFILES= \
 	swfdec_swf_decoder.h \
 	swfdec_tag.h \
 	swfdec_text.h \
-	swfdec_types.h
+	swfdec_types.h \
+	swfdec_video.h \
+	swfdec_video_movie.h \
+	swfdec_xml.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff-tree 653a85ad459e538c7f1ea7aa4785aaf6f411781e (from
154596318676ff838f8acc47d3bc62bf3967868b)
Author: Benjamin Otte <otte@gnome.org>
Date:   Fri Mar 16 23:54:59 2007 +0100

    (attempt to) work around http://bugzilla.gnome.org/show_bug.cgi?id=156643

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 63390ba..6d4dca5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,6 +3,10 @@
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 
+# This works around a bug in gtk-doc. See
http://bugzilla.gnome.org/show_bug.cgi?id=156643
+tmpl/*.sgml:
+	@true
+
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables
to
 # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples