rpms/monkey-bubble/devel monkey-bubble-0.3.2-fixes.patch, NONE, 1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Apr 30 21:59:42 UTC 2006
- Previous message (by thread): rpms/monkey-bubble/devel .cvsignore, 1.2, 1.3 monkey-bubble.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/monkey-bubble/FC-5 monkey-bubble-0.3.2-fixes.patch, NONE, 1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 monkey-bubble.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100
Added Files:
monkey-bubble-0.3.2-fixes.patch
monkey-bubble-0.3.2-gstreamer.patch
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
scrollkeeper-update. Don't call ldconfig as there is no lib.
monkey-bubble-0.3.2-fixes.patch:
--- NEW FILE monkey-bubble-0.3.2-fixes.patch ---
--- monkey-bubble-0.3.2/src/ui/ui-network-client.c.fixes 2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-client.c 2006-04-30 21:02:10.000000000 +0200
@@ -145,21 +145,21 @@
list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
- "text",0);
+ "text",0, (char *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
column = gtk_tree_view_column_new();
column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
- "active",1);
+ "active",1, (char *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
column = gtk_tree_view_column_new();
column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
- "active",2);
+ "active",2, (char *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
--- monkey-bubble-0.3.2/src/ui/ui-network-server.c.fixes 2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-server.c 2006-04-30 21:02:10.000000000 +0200
@@ -155,21 +155,21 @@
list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
- "text",0);
+ "text",0, (char *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
column = gtk_tree_view_column_new();
column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
- "active",1);
+ "active",1, (char *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
column = gtk_tree_view_column_new();
column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
- "active",2);
+ "active",2, (char *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
--- monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c.fixes 2004-06-29 08:53:44.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c 2006-04-30 21:05:22.000000000 +0200
@@ -519,6 +519,7 @@
EggCellRendererKeys *keys;
GtkWidget *label;
GtkWidget *eventbox;
+ GtkWidget **double_ptr;
celltext = GTK_CELL_RENDERER_TEXT (cell);
keys = EGG_CELL_RENDERER_KEYS (cell);
@@ -551,8 +552,9 @@
eventbox = g_object_new (pointless_eventbox_subclass_get_type (),
NULL);
keys->edit_widget = eventbox;
+ double_ptr = &(keys->edit_widget);
g_object_add_weak_pointer (G_OBJECT (keys->edit_widget),
- (void**) &keys->edit_widget);
+ (void**) double_ptr);
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -586,9 +588,9 @@
}
void
-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
- guint keyval,
- GdkModifierType mask)
+egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
+ guint keyval,
+ EggVirtualModifierType mask)
{
char *text;
gboolean changed;
@@ -628,9 +630,9 @@
}
void
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
- guint *keyval,
- GdkModifierType *mask)
+egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
+ guint *keyval,
+ EggVirtualModifierType *mask)
{
g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
monkey-bubble-0.3.2-gstreamer.patch:
--- NEW FILE monkey-bubble-0.3.2-gstreamer.patch ---
--- monkey-bubble-0.3.2/configure.in.gstreamer 2004-07-02 08:37:35.000000000 +0200
+++ monkey-bubble-0.3.2/configure.in 2006-04-30 22:06:54.000000000 +0200
@@ -68,8 +68,7 @@
PKG_CHECK_MODULES(LIBMONKEYAUDIO_A,[
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
])
AC_SUBST(LIBMONKEYAUDIO_A_CFLAGS)
AC_SUBST(LIBMONKEYAUDIO_A_LIBS)
@@ -88,8 +87,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
])
--- monkey-bubble-0.3.2/src/audio/sound-manager.c.gstreamer 2004-07-02 08:30:15.000000000 +0200
+++ monkey-bubble-0.3.2/src/audio/sound-manager.c 2006-04-30 22:26:35.000000000 +0200
@@ -20,7 +20,6 @@
#include "sound-manager.h"
#include "playground.h"
#include <gst/gst.h>
-#include <gst/gconf/gconf.h>
#define PRIVATE(sound_manager) (sound_manager->private)
static GObjectClass* parent_class = NULL;
@@ -28,17 +27,11 @@
struct SoundManagerPrivate {
GstElement * main_bin;
GstElement * filesrc;
- GstElement * oggdemux;
+ GstElement * oggdemux;
GstElement * vorbis_dec;
- GstElement * audioconvert;
+ GstElement * audioconvert;
GstElement * output;
-
- gboolean new_pad_ok;
- gboolean is_playing;
- gint idle_id;
-
- GThread * loop_thread;
- gchar * current_music_path;
+ gchar * current_music_path;
};
@@ -119,16 +112,31 @@
return FALSE;
}
-static void eos(GstElement *e ,gpointer user_data) {
- g_print("end of fie..\n");
-
- // g_idle_add(ck,user_data);
- // g_idle_add(start_play,mbin);
- g_timeout_add(100, restart_play,user_data);
-}
-static void error_handler(GstElement * e,GObject * o,gchar * string,gpointer data) {
- g_print("error : %s\n",string);
+static gboolean
+bus_call (GstBus *bus,
+ GstMessage *msg,
+ gpointer data)
+{
+ switch (GST_MESSAGE_TYPE (msg)) {
+ case GST_MESSAGE_EOS:
+ g_timeout_add(100, restart_play, data);
+ break;
+ case GST_MESSAGE_ERROR: {
+ gchar *debug;
+ GError *err;
+
+ gst_message_parse_error (msg, &err, &debug);
+ g_free (debug);
+
+ g_print ("Error: %s\n", err->message);
+ g_error_free (err);
+ break;
+ }
+ default:
+ break;
+ }
+ return TRUE;
}
@@ -139,8 +147,7 @@
sound_manager = SOUND_MANAGER (g_object_new (TYPE_SOUND_MANAGER, NULL));
dp = PRIVATE(sound_manager);
-
- dp->is_playing = FALSE;
+ dp->main_bin = NULL;
return sound_manager;
}
@@ -148,43 +155,11 @@
static void
stop_play(SoundManager * m)
{
-
- if( sound_active) {
-
- if( PRIVATE(m)->is_playing ) {
-
- PRIVATE(m)->is_playing = FALSE;
- g_thread_join( PRIVATE(m)->loop_thread);
-
- gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
- gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin));
- }
-
-
-
- g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
-
- PRIVATE(m)->output = NULL;
- PRIVATE(m)->main_bin = NULL;
- PRIVATE(m)->vorbis_dec = NULL;
- PRIVATE(m)->filesrc = NULL;
- }
-}
-
-static gpointer
-loop(gpointer data)
-{
- SoundManager * m;
- m = SOUND_MANAGER(data);
- while( PRIVATE(m)->is_playing) {
- g_usleep(10*1000);
- if( gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin)) == FALSE) {
- PRIVATE(m)->is_playing = FALSE;
- }
-
- }
-
- return NULL;
+ if( PRIVATE(m)->main_bin ) {
+ gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
+ g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
+ PRIVATE(m)->main_bin = NULL;
+ }
}
@@ -193,29 +168,9 @@
GObject *new_pad,
SoundManager * m)
{
-
- gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
-
- gst_bin_add_many(GST_BIN(PRIVATE(m)->main_bin),
- PRIVATE(m)->vorbis_dec,
- PRIVATE(m)->audioconvert,
- PRIVATE(m)->output,
- NULL);
-
-
- gst_element_link_many(
- PRIVATE(m)->vorbis_dec,
- PRIVATE(m)->audioconvert,
- PRIVATE(m)->output,
- NULL);
-
- GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
-
- gst_pad_link( GST_PAD(new_pad), pad);
- PRIVATE(m)->new_pad_ok = TRUE;
-
-
- gst_element_set_state (GST_ELEMENT(PRIVATE(m)->main_bin), GST_STATE_PLAYING);
+ GstPad *sinkpad = gst_element_get_pad (PRIVATE(m)->vorbis_dec, "sink");
+ gst_pad_link (GST_PAD(new_pad), sinkpad);
+ gst_object_unref (sinkpad);
}
@@ -223,47 +178,41 @@
start_play(SoundManager *m, gchar * path)
{
if( sound_active) {
- PRIVATE(m)->new_pad_ok = FALSE;
PRIVATE(m)->main_bin = gst_pipeline_new("bin");
PRIVATE(m)->filesrc = gst_element_factory_make("filesrc","filesrc");
PRIVATE(m)->oggdemux = gst_element_factory_make("oggdemux","oggdemux");
PRIVATE(m)->vorbis_dec = gst_element_factory_make("vorbisdec","vorbisdec");
PRIVATE(m)->audioconvert = gst_element_factory_make("audioconvert","audioconvert");
- PRIVATE(m)->output = gst_gconf_get_default_audio_sink();
+ PRIVATE(m)->output = gst_element_factory_make ("alsasink", "alsa-output");
PRIVATE(m)->current_music_path = g_strdup(path);
- g_signal_connect(G_OBJECT(PRIVATE(m)->main_bin),
- "error", GTK_SIGNAL_FUNC(error_handler),NULL);
-
- g_signal_connect( PRIVATE(m)->oggdemux, "new-pad", G_CALLBACK(oggdemux_new_pad),m);
-
- gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
- PRIVATE(m)->filesrc,
- PRIVATE(m)->oggdemux,
- NULL);
-
g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "location",path,NULL);
- g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
-
- g_signal_connect(PRIVATE(m)->filesrc,
- "eos",
- G_CALLBACK(eos),
- m);
-
- gst_element_link_many( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux,NULL);
-
+// g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
+ gst_bus_add_watch (gst_pipeline_get_bus (
+ GST_PIPELINE (PRIVATE(m)->main_bin)),
+ bus_call, m);
+
+ gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
+ PRIVATE(m)->filesrc,
+ PRIVATE(m)->oggdemux,
+ PRIVATE(m)->vorbis_dec,
+ PRIVATE(m)->audioconvert,
+ PRIVATE(m)->output,
+ NULL);
+
+
+ gst_element_link( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux );
+ gst_element_link_many(
+ PRIVATE(m)->vorbis_dec,
+ PRIVATE(m)->audioconvert,
+ PRIVATE(m)->output,
+ NULL);
+ g_signal_connect( PRIVATE(m)->oggdemux, "pad-added",
+ G_CALLBACK(oggdemux_new_pad), m);
gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_PLAYING);
-
- PRIVATE(m)->is_playing = TRUE;
-
- while( !PRIVATE(m)->new_pad_ok && gst_bin_iterate( GST_BIN( PRIVATE(m)->main_bin)) && PRIVATE(m)->is_playing );
-
- PRIVATE(m)->loop_thread =
- g_thread_create( loop,m,TRUE,NULL);
-
}
}
@@ -271,7 +220,7 @@
g_assert(IS_SOUND_MANAGER(m));
- if( PRIVATE(m)->is_playing == TRUE) {
+ if( PRIVATE(m)->main_bin) {
stop_play(m);
}
--- monkey-bubble-0.3.2/configure.gstreamer 2004-07-02 09:07:24.000000000 +0200
+++ monkey-bubble-0.3.2/configure 2006-04-30 22:06:54.000000000 +0200
@@ -20454,21 +20454,18 @@
echo "$as_me:$LINENO: checking for
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
" >&5
echo $ECHO_N "checking for
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
... $ECHO_C" >&6
if $PKG_CONFIG --exists "
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -20479,8 +20476,7 @@
LIBMONKEYAUDIO_A_CFLAGS=`$PKG_CONFIG --cflags "
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
"`
echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_CFLAGS" >&5
echo "${ECHO_T}$LIBMONKEYAUDIO_A_CFLAGS" >&6
@@ -20490,8 +20486,7 @@
LIBMONKEYAUDIO_A_LIBS=`$PKG_CONFIG --libs "
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
"`
echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_LIBS" >&5
echo "${ECHO_T}$LIBMONKEYAUDIO_A_LIBS" >&6
@@ -20503,8 +20498,7 @@
LIBMONKEYAUDIO_A_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
"`
echo $LIBMONKEYAUDIO_A_PKG_ERRORS
fi
@@ -20523,14 +20517,12 @@
{ { echo "$as_me:$LINENO: error: Library requirements (
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
echo "$as_me: error: Library requirements (
gtk+-2.0
gthread-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20731,8 +20723,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
" >&5
@@ -20741,8 +20732,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
... $ECHO_C" >&6
@@ -20752,8 +20742,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
" ; then
@@ -20768,8 +20757,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
"`
@@ -20783,8 +20771,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
"`
@@ -20800,8 +20787,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
"`
@@ -20824,8 +20810,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
@@ -20834,8 +20819,7 @@
gthread-2.0
librsvg-2.0
libgnomeui-2.0
- gstreamer-0.8
- gstreamer-gconf-0.8
+ gstreamer-0.10
gconf-2.0
libglade-2.0
) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- Previous message (by thread): rpms/monkey-bubble/devel .cvsignore, 1.2, 1.3 monkey-bubble.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/monkey-bubble/FC-5 monkey-bubble-0.3.2-fixes.patch, NONE, 1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 monkey-bubble.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list