Swfdec - Mar 2007 - 6 commits - doc/swfdec-sections.txt libswfdec-gtk/Makefile.am libswfdec-gtk/swfdec_gtk_player.c libswfdec-gtk/swfdec_gtk_player.h libswfdec/swfdec_loader.c player/swfplay.c swfdec-gtk.pc.in

doc/swfdec-sections.txt           |    6 +++---
 libswfdec-gtk/Makefile.am         |    2 +-
 libswfdec-gtk/swfdec_gtk_player.c |   13 +++++++------
 libswfdec-gtk/swfdec_gtk_player.h |    4 ++--
 libswfdec/swfdec_loader.c         |    1 -
 player/swfplay.c                  |    2 +-
 swfdec-gtk.pc.in                  |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

New commits:
diff-tree 5aa91da71e7235fe7e8507f30de3bb207838bb2c (from
d05a09d1eaaa7643d01e35be398a11631213eeb1)
Author: Benjamin Otte <otte@gnome.org>
Date:   Mon Mar 26 22:06:25 2007 +0200

    set the source to NULL when removing it
    
    Fixes get_playing returning TRUE even though we're paused

diff --git a/libswfdec-gtk/swfdec_gtk_player.c
b/libswfdec-gtk/swfdec_gtk_player.c
index b9d65eb..766f92d 100644
--- a/libswfdec-gtk/swfdec_gtk_player.c
+++ b/libswfdec-gtk/swfdec_gtk_player.c
@@ -241,6 +241,7 @@ swfdec_gtk_player_set_playing (SwfdecGtk
   } else if (!playing && player->source != NULL) {
     g_source_destroy (player->source);
     g_source_unref (player->source);
+    player->source = NULL;
   }
   swfdec_gtk_player_update_audio (player);
   g_object_notify (G_OBJECT (player), "playing");
diff-tree d05a09d1eaaa7643d01e35be398a11631213eeb1 (from
0268fcbb61254e6868b5fa7e95617204f03e3d35)
Author: Benjamin Otte <otte@gnome.org>
Date:   Mon Mar 26 22:05:55 2007 +0200

    s/swfdec_gtk_player_[gs]et_audio/&_enabled/

diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt
index f33b594..a6e2d96 100644
--- a/doc/swfdec-sections.txt
+++ b/doc/swfdec-sections.txt
@@ -57,7 +57,7 @@ swfdec_player_render
 swfdec_player_advance
 swfdec_player_handle_mouse
 swfdec_player_render_audio
-swfdec_player_get_audio
+swfdec_player_get_audio_enabled
 <SUBSECTION Standard>
 SwfdecPlayerClass
 SWFDEC_PLAYER
@@ -117,8 +117,8 @@ swfdec_gtk_player_get_playing
 swfdec_gtk_player_set_playing
 swfdec_gtk_player_get_speed
 swfdec_gtk_player_set_speed
-swfdec_gtk_player_get_audio
-swfdec_gtk_player_set_audio
+swfdec_gtk_player_get_audio_enabled
+swfdec_gtk_player_set_audio_enabled
 <SUBSECTION Standard>
 SwfdecGtkPlayerClass
 swfdec_gtk_player_get_type
diff --git a/libswfdec-gtk/swfdec_gtk_player.c
b/libswfdec-gtk/swfdec_gtk_player.c
index 60d391b..b9d65eb 100644
--- a/libswfdec-gtk/swfdec_gtk_player.c
+++ b/libswfdec-gtk/swfdec_gtk_player.c
@@ -106,7 +106,7 @@ swfdec_gtk_player_set_property (GObject 
       swfdec_gtk_player_set_playing (player, g_value_get_boolean (value));
       break;
     case PROP_AUDIO:
-      swfdec_gtk_player_set_audio (player, g_value_get_boolean (value));
+      swfdec_gtk_player_set_audio_enabled (player, g_value_get_boolean
(value));
       break;
     case PROP_SPEED:
       swfdec_gtk_player_set_speed (player, g_value_get_double (value));
@@ -263,14 +263,14 @@ swfdec_gtk_player_get_playing (SwfdecGtk
 }
 
 /**
- * swfdec_gtk_player_set_audio:
+ * swfdec_gtk_player_set_audio_enabled:
  * @player: a #SwfdecGtkPlayer
  * @enabled: %TRUE to enable audio
  *
  * Enables or disables automatic audio playback.
  **/
 void
-swfdec_gtk_player_set_audio (SwfdecGtkPlayer *player, gboolean enabled)
+swfdec_gtk_player_set_audio_enabled (SwfdecGtkPlayer *player, gboolean enabled)
 {
   g_return_if_fail (SWFDEC_IS_GTK_PLAYER (player));
 
@@ -282,7 +282,7 @@ swfdec_gtk_player_set_audio (SwfdecGtkPl
 }
 
 /**
- * swfdec_gtk_player_get_audio:
+ * swfdec_gtk_player_get_audio_enabled:
  * @player: a #SwfdecGtkPlayer
  *
  * Queries if audio playback for @player is enabled or not.
@@ -290,7 +290,7 @@ swfdec_gtk_player_set_audio (SwfdecGtkPl
  * Returns: %TRUE if audio playback is enabled
  **/
 gboolean
-swfdec_gtk_player_get_audio (SwfdecGtkPlayer *player)
+swfdec_gtk_player_get_audio_enabled (SwfdecGtkPlayer *player)
 {
   g_return_val_if_fail (SWFDEC_IS_GTK_PLAYER (player), FALSE);
 
diff --git a/libswfdec-gtk/swfdec_gtk_player.h
b/libswfdec-gtk/swfdec_gtk_player.h
index c5a9c17..715259b 100644
--- a/libswfdec-gtk/swfdec_gtk_player.h
+++ b/libswfdec-gtk/swfdec_gtk_player.h
@@ -43,9 +43,9 @@ SwfdecPlayer *	swfdec_gtk_player_new_fro
 void		swfdec_gtk_player_set_playing 	(SwfdecGtkPlayer *	player,
 						 gboolean		playing);
 gboolean	swfdec_gtk_player_get_playing 	(SwfdecGtkPlayer *	player);
-void		swfdec_gtk_player_set_audio	(SwfdecGtkPlayer *	player,
+void		swfdec_gtk_player_set_audio_enabled	(SwfdecGtkPlayer *	player,
 						 gboolean		enabled);
-gboolean	swfdec_gtk_player_get_audio 	(SwfdecGtkPlayer *	player);
+gboolean	swfdec_gtk_player_get_audio_enabled 	(SwfdecGtkPlayer *	player);
 void		swfdec_gtk_player_set_speed	(SwfdecGtkPlayer *	player,
 						 double			speed);
 double		swfdec_gtk_player_get_speed 	(SwfdecGtkPlayer *	player);
diff --git a/player/swfplay.c b/player/swfplay.c
index db08066..81bbd3c 100644
--- a/player/swfplay.c
+++ b/player/swfplay.c
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
   }
 
   if (no_sound)
-    swfdec_gtk_player_set_audio (SWFDEC_GTK_PLAYER (player), FALSE);
+    swfdec_gtk_player_set_audio_enabled (SWFDEC_GTK_PLAYER (player), FALSE);
 
   swfdec_gtk_player_set_speed (SWFDEC_GTK_PLAYER (player), speed / 100.);
   swfdec_gtk_player_set_playing (SWFDEC_GTK_PLAYER (player), TRUE);
diff-tree 0268fcbb61254e6868b5fa7e95617204f03e3d35 (from
5006bb563101b32301eeb4a25f58ffa8189f40a8)
Author: Benjamin Otte <otte@gnome.org>
Date:   Mon Mar 26 21:15:32 2007 +0200

    install headers into the right directory

diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am
index 93b6897..eb16f88 100644
--- a/libswfdec-gtk/Makefile.am
+++ b/libswfdec-gtk/Makefile.am
@@ -27,7 +27,7 @@ libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_LDF
 	-version-info $(SWFDEC_LIBVERSION) \
 	-export-symbols-regex '^(swfdec_.*)' \
 	$(GTK_LIBS) $(SWFDEC_LIBS) $(AUDIO_LIBS)
-libswfdec_@SWFDEC_MAJORMINOR@includedir =
$(includedir)/swfdec-@SWFDEC_MAJORMINOR@/libswfdec
+libswfdec_@SWFDEC_MAJORMINOR@includedir =
$(includedir)/swfdec-@SWFDEC_MAJORMINOR@/libswfdec-gtk
 libswfdec_@SWFDEC_MAJORMINOR@include_HEADERS = \
 	swfdec-gtk.h \
 	swfdec_gtk_player.h \
diff-tree 5006bb563101b32301eeb4a25f58ffa8189f40a8 (from
5925dd88bf66d0773b1ae6060205742d64ebd4a4)
Author: Benjamin Otte <otte@gnome.org>
Date:   Mon Mar 26 21:15:18 2007 +0200

    remove debugging g_print
    
    And that was even in the release...

diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c
index 69c460f..81d536c 100644
--- a/libswfdec/swfdec_loader.c
+++ b/libswfdec/swfdec_loader.c
@@ -496,7 +496,6 @@ swfdec_loader_get_filename (SwfdecLoader
       char *dot = strrchr (ret, '.');
       char *real;
       guint len = dot ? strlen (dot) : G_MAXUINT;
-      g_print ("ret: %s, dot: %s, ext: %s\n", ret, dot, ext);
       if (len <= 5)
 	*dot = '\0';
       real = g_strdup_printf ("%s.%s", ret, ext);
diff-tree 5925dd88bf66d0773b1ae6060205742d64ebd4a4 (from
00a2f65fd9ff9f2ab7770837c26da2a1634125b9)
Author: Benjamin Otte <otte@gnome.org>
Date:   Mon Mar 26 21:14:54 2007 +0200

    WE want libswfdec-gtk.so not libswfdec.so

diff --git a/swfdec-gtk.pc.in b/swfdec-gtk.pc.in
index 1b866f0..37e507b 100644
--- a/swfdec-gtk.pc.in
+++ b/swfdec-gtk.pc.in
@@ -7,5 +7,5 @@ Name: swfdec-gtk
 Description: Support for playing Flash files in Gtk using Swfdec
 Version: @VERSION@
 Requires: swfdec-@SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >=
@GTK_REQUIRES@
-Libs: -L${libdir} -lswfdec-@SWFDEC_MAJORMINOR@
+Libs: -L${libdir} -lswfdec-gtk-@SWFDEC_MAJORMINOR@
 Cflags: -I${includedir}
diff-tree 00a2f65fd9ff9f2ab7770837c26da2a1634125b9 (from
58cd315b3b41e451e7f94b282e8a4fe8e787069e)
Author: Benjamin Otte <otte@gnome.org>
Date:   Mon Mar 26 21:14:33 2007 +0200

    copy/paste ...

diff --git a/libswfdec-gtk/swfdec_gtk_player.c
b/libswfdec-gtk/swfdec_gtk_player.c
index 475cd3f..60d391b 100644
--- a/libswfdec-gtk/swfdec_gtk_player.c
+++ b/libswfdec-gtk/swfdec_gtk_player.c
@@ -188,7 +188,7 @@ swfdec_gtk_player_new (void)
  * Returns: a new player or %NULL on error.
  **/
 SwfdecPlayer *
-swfdec_player_new_from_file (const char *filename, GError **error)
+swfdec_gtk_player_new_from_file (const char *filename, GError **error)
 {
   SwfdecLoader *loader;
   SwfdecPlayer *player;