Implemented sound playing with test sound

[projects/chimara/chimara.git] / libchimara / schannel.c

diff --git a/libchimara/schannel.c b/libchimara/schannel.c
index 2e741d3fea1f330e1ba7b3abaa290a16e9fe351b..726b08dc9338ca177d33efa162fc8647c28e7e16 100644 (file)
--- a/libchimara/schannel.c
+++ b/libchimara/schannel.c
@@ -1,5 +1,6 @@
 #include <config.h>
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <libchimara/glk.h>
 #ifdef GSTREAMER_SOUND
 #include <gst/gst.h>
@@ -44,8 +45,8 @@ glk_schannel_create(glui32 rock)
        g_free(pipeline_name);
 
        /* Create GStreamer elements to put in the pipeline */
-       s->source = gst_element_factory_make("filesrc", NULL);
-       s->filter = gst_element_factory_make("identity", NULL);
+       s->source = gst_element_factory_make("audiotestsrc", NULL);
+       s->filter = gst_element_factory_make("volume", NULL);
        s->sink = gst_element_factory_make("autoaudiosink", NULL);
        if(!s->source || !s->filter || !s->sink) {
                WARNING("Could not create one or more GStreamer elements");
@@ -82,6 +83,9 @@ glk_schannel_destroy(schanid_t chan)
 
 #ifdef GSTREAMER_SOUND
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
+       if(!gst_element_set_state(chan->pipeline, GST_STATE_NULL))
+               WARNING_S(_("Could not set GstElement state to"), "NULL");
        
        glk_data->schannel_list = g_list_delete_link(glk_data->schannel_list, chan->schannel_list);
 
@@ -92,7 +96,7 @@ glk_schannel_destroy(schanid_t chan)
        }
        
        if(chan->pipeline)
-               g_object_unref(chan->pipeline);
+               gst_object_unref(chan->pipeline);
        
        chan->magic = MAGIC_FREE;
        g_free(chan);
@@ -172,8 +176,6 @@ glk_schannel_get_rock(schanid_t chan)
  *   in which case playing a MOD resource would fail if one was already playing.
  * </para></note>
  *
- * <warning><para>This function is not implemented yet.</para></warning>
- *
  * Returns: 1 on success, 0 on failure.
  */
 glui32 
@@ -215,8 +217,6 @@ glk_schannel_play(schanid_t chan, glui32 snd)
  * %gestalt_SoundNotify selector before you rely on it; see <link
  * linkend="chimara-Testing-for-Sound-Capabilities">Testing for Sound 
  * Capabilities</link>.
- *
- * <warning><para>This function is not implemented yet.</para></warning>
  * 
  * Returns: 1 on success, 0 on failure.
  */
@@ -224,7 +224,15 @@ glui32
 glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify)
 {
        VALID_SCHANNEL(chan, return 0);
+#ifdef GSTREAMER_SOUND
+       if(!gst_element_set_state(chan->pipeline, GST_STATE_PLAYING)) {
+               WARNING_S(_("Could not set GstElement state to"), "PLAYING");
+               return 0;
+       }
+       return 1;
+#else
        return 0;
+#endif
 }
 
 /**
@@ -233,13 +241,15 @@ glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify)
  *
  * Stops any sound playing in the channel. No notification event is generated,
  * even if you requested one. If no sound is playing, this has no effect.
- *
- * <warning><para>This function is not implemented yet.</para></warning>
  */
 void 
 glk_schannel_stop(schanid_t chan)
 {
        VALID_SCHANNEL(chan, return);
+#ifdef GSTREAMER_SOUND
+       if(!gst_element_set_state(chan->pipeline, GST_STATE_READY))
+               WARNING_S(_("Could not set GstElement state to"), "READY");
+#endif
 }
 
 /**
@@ -266,12 +276,20 @@ glk_schannel_stop(schanid_t chan)
  * linkend="chimara-Testing-for-Sound-Capabilities">Testing for Sound
  * Capabilities</link>.
  *
- * <warning><para>This function is not implemented yet.</para></warning>
+ * <note><title>Chimara</title>
+ *   <para>Chimara supports volumes from 0 to 1000&percnt;, that is, values of
+ *   @vol up to 0xA0000.</para>
+ * </note>
  */
 void 
 glk_schannel_set_volume(schanid_t chan, glui32 vol)
 {
        VALID_SCHANNEL(chan, return);
+#ifdef GSTREAMER_SOUND
+       gdouble volume_gst = (gdouble)vol / 0x10000;
+       g_printerr("Volume set to: %f\n", volume_gst);
+       g_object_set(chan->filter, "volume", CLAMP(volume_gst, 0.0, 10.0), NULL);
+#endif
 }
 
 /**