From: Philip Chimento Date: Wed, 19 Jan 2011 18:32:33 +0000 (+0100) Subject: Implemented sound playing with test sound X-Git-Tag: v0.9~152^2~13 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=0a6b83f80b277780a2c23aaa9c2c433a234f16b3;p=projects%2Fchimara%2Fchimara.git Implemented sound playing with test sound Implemented glk_schannel_play() and glk_schannel_stop() with a 440 Hz sine wave as a test sound. This sound is played no matter what resource number you pass to glk_schannel_play() and keeps going until you call glk_schannel_stop(). --- diff --git a/libchimara/schannel.c b/libchimara/schannel.c index 730e033..726b08d 100644 --- a/libchimara/schannel.c +++ b/libchimara/schannel.c @@ -1,5 +1,6 @@ #include #include +#include #include #ifdef GSTREAMER_SOUND #include @@ -44,7 +45,7 @@ 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->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) { @@ -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); @@ -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. * * - * This function is not implemented yet. - * * 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 Testing for Sound * Capabilities. - * - * This function is not implemented yet. * * 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. - * - * This function is not implemented yet. */ 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 } /** diff --git a/tests/soundtest.c b/tests/soundtest.c index 18c36fa..a4aae14 100644 --- a/tests/soundtest.c +++ b/tests/soundtest.c @@ -1,5 +1,6 @@ #include #include +#include void glk_main(void) @@ -18,14 +19,23 @@ glk_main(void) fprintf(stderr, "Could not create sound channel.\n"); return; } + + if(!glk_schannel_play(sc, 0)) { /* resource number doesn't matter right now */ + fprintf(stderr, "Could not start sound channel.\n"); + return; + } glk_schannel_set_volume(sc, 0x10000); + sleep(1); glk_schannel_set_volume(sc, 0x08000); + sleep(1); glk_schannel_set_volume(sc, 0x04000); + sleep(1); glk_schannel_set_volume(sc, 0x00000); glk_schannel_set_volume(sc, 0xA0000); /* max supported volume */ glk_schannel_set_volume(sc, 0xB0000); /* should be coerced */ glk_schannel_set_volume(sc, 0x10000); - + + glk_schannel_stop(sc); glk_schannel_destroy(sc); }