diff -ruN --exclude-from=freeciv-1.99+2.0.0beta7+gstreamer/diff_ignore freeciv-1.99+2.0.0beta7.orig/client/audio.c freeciv-1.99+2.0.0beta7+gstreamer/client/audio.c --- freeciv-1.99+2.0.0beta7.orig/client/audio.c 2005-02-03 18:30:00.000000000 +0000 +++ freeciv-1.99+2.0.0beta7+gstreamer/client/audio.c 2005-02-04 06:50:11.000000000 +0000 @@ -44,10 +44,13 @@ #ifdef ALSA #include "audio_alsa.h" #endif +#ifdef GSTREAMER +#include "audio_gstreamer.h" +#endif #include "audio.h" -#define MAX_NUM_PLUGINS 4 +#define MAX_NUM_PLUGINS 5 #define SNDSPEC_SUFFIX ".soundspec" /* keep it open throughout */ @@ -169,6 +172,9 @@ #ifdef AMIGA audio_amiga_init(); #endif +#ifdef GSTREAMER + audio_gstreamer_init(); +#endif } /************************************************************************** @@ -291,6 +297,9 @@ #ifdef AMIGA if (audio_select_plugin("amiga")) return; #endif +#ifdef GSTREAMER + if (audio_select_plugin("gstreamer")) return; +#endif freelog(LOG_ERROR, _("No real audio subsystem managed to initialize!")); freelog(LOG_ERROR, diff -ruN --exclude-from=freeciv-1.99+2.0.0beta7+gstreamer/diff_ignore freeciv-1.99+2.0.0beta7.orig/client/audio_gstreamer.c freeciv-1.99+2.0.0beta7+gstreamer/client/audio_gstreamer.c --- freeciv-1.99+2.0.0beta7.orig/client/audio_gstreamer.c 1970-01-01 01:00:00.000000000 +0100 +++ freeciv-1.99+2.0.0beta7+gstreamer/client/audio_gstreamer.c 2005-02-04 10:37:17.000000000 +0000 @@ -0,0 +1,139 @@ +/********************************************************************** + Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "log.h" +#include "support.h" + +#include "audio.h" + +#include "audio_gstreamer.h" + +bool loop; +GstElement *thread, *play; +gchar uri[PATH_MAX]; + +static void my_stop() +{ + if (gst_element_set_state (thread, GST_STATE_NULL) != GST_STATE_SUCCESS) { + freelog(LOG_ERROR, "Failed to stop."); + } + gst_object_unref (GST_OBJECT (thread)); + /* leak? should we unref sink and play here as well? */ +} + +static void my_wait() +{ + /* not implemented */ +} + +static void my_shutdown() +{ +} + +/* End of stream callback */ +static void eos_cb(GstElement *play, gpointer data) +{ + freelog(LOG_NORMAL, "End of stream."); + + if (loop) { + if (! gst_element_seek (thread, GST_SEEK_METHOD_SET | GST_FORMAT_TIME | GST_SEEK_FLAG_FLUSH, 1)) { + freelog(LOG_ERROR,"Failed to seek to start of sound."); + } + } else { + my_stop(); + } +} + +/* Error callback */ +static void error_cb(GstElement *play, GstElement *src, GError *err, gchar *debug, gpointer data) +{ + freelog(LOG_ERROR, "%s", err->message); + my_stop(); +} + +/* Play a sound */ +static bool my_play(const char *const tag, const char *const fullpath, + bool repeat) +{ + if (fullpath == NULL) { + return FALSE; + } + + //if (repeat) freelog(LOG_NORMAL, "Unable to play sound repeating"); + loop = repeat; + + //char *uri = "file:///home/sam/.freeciv/stdsounds/gong10.wav"; + //char *uri = gst_uri_construct ("file", fullpath); + snprintf(uri, PATH_MAX-1, "file://%s", fullpath); + + freelog(LOG_NORMAL, "Playing %s...\n", uri); + + /* create a pipeline */ + + play = gst_element_factory_make ("playbin", "play"); + g_object_set (G_OBJECT (play), "audio-sink", gst_gconf_get_default_audio_sink(), NULL); + g_object_set (G_OBJECT (play), "uri", uri, NULL); + + thread = gst_thread_new ("mythread"); + g_signal_connect (thread, "eos", G_CALLBACK (eos_cb), NULL); + g_signal_connect (thread, "error", G_CALLBACK (error_cb), NULL); + gst_bin_add (GST_BIN (thread), play); + + if (gst_element_set_state (thread, GST_STATE_PLAYING) != GST_STATE_SUCCESS) { + freelog(LOG_NORMAL, "Failed to play."); + } + + //g_free (uri); + + return TRUE; +} + +static bool my_init(void) +{ + int i; + + for (i=0; i= 0.8.8 gstreamer-gconf-0.8, GSTREAMER=yes, GSTREAMER=no) + if test x"$GSTREAMER" = xyes ; then + dnl GST_ELEMENT_CHECK on playbin ? + SOUND_CFLAGS="$SOUND_CFLAGS $GSTREAMER_CFLAGS" + SOUND_LIBS="$SOUND_LIBS $GSTREAMER_LIBS" + AC_DEFINE(GSTREAMER, 1, [GStreamer sound support]) + fi + fi ])