X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.c;h=e0695b82390db831f33d3915ef3205df5bb48ca5;hb=fc25ba60eb14b16fe5bba7ff94e29e70ac1d9955;hp=696aaa2a7351f225ea9a009e44c1d0e3741d43f4;hpb=b026b1ac697815f2bd67e11a8718478dc1d3aed6;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/schannel.c b/libchimara/schannel.c index 696aaa2..e0695b8 100644 --- a/libchimara/schannel.c +++ b/libchimara/schannel.c @@ -1,5 +1,6 @@ #include #include +#include #include #ifdef GSTREAMER_SOUND #include @@ -8,9 +9,97 @@ #include "schannel.h" #include "chimara-glk-private.h" #include "gi_dispa.h" +#include "gi_blorb.h" +#include "resource.h" extern GPrivate *glk_data_key; +#ifdef GSTREAMER_SOUND +static void +on_pipeline_message(GstBus *bus, GstMessage *message, schanid_t s) +{ + /* g_print("Got %s message\n", GST_MESSAGE_TYPE_NAME(message)); */ + + switch(GST_MESSAGE_TYPE(message)) { + case GST_MESSAGE_ERROR: { + GError *err; + gchar *debug; + + gst_message_parse_error(message, &err, &debug); + g_print("Error: %s\n", err->message); + g_error_free(err); + g_free(debug); + break; + } + case GST_MESSAGE_EOS: + /* end-of-stream */ + break; + default: + /* unhandled message */ + break; + } +} + +static void +on_ogg_demuxer_pad_added(GstElement *demux, GstPad *pad, schanid_t s) +{ + GstPad *sinkpad; + + /* We can now link this pad with the vorbis-decoder sink pad */ + sinkpad = gst_element_get_static_pad(s->decode, "sink"); + gst_pad_link(pad, sinkpad); + gst_object_unref(sinkpad); +} + +static void +on_type_found(GstElement *typefind, guint probability, GstCaps *caps, schanid_t s) +{ + gchar *type = gst_caps_to_string(caps); + if(strcmp(type, "application/ogg") == 0) + { + s->demux = gst_element_factory_make("oggdemux", NULL); + s->decode = gst_element_factory_make("vorbisdec", NULL); + if(!s->demux || !s->decode) + { + WARNING(_("Could not create one or more GStreamer elements")); + goto finally; + } + gst_bin_add_many(GST_BIN(s->pipeline), s->demux, s->decode, NULL); + if(!gst_element_link(s->typefind, s->demux) || !gst_element_link(s->decode, s->convert)) + { + WARNING(_("Could not link GStreamer elements")); + goto finally; + } + /* We link the demuxer and decoder together dynamically, since the + demuxer doesn't know what source pads it will have until it starts + demuxing the stream */ + g_signal_connect(s->demux, "pad-added", G_CALLBACK(on_ogg_demuxer_pad_added), s); + } + else if(strcmp(type, "audio/x-aiff") == 0) + { + s->decode = gst_element_factory_make("aiffparse", NULL); + if(!s->decode) + { + WARNING(_("Could not create 'aiffparse' GStreamer element")); + goto finally; + } + gst_bin_add(GST_BIN(s->pipeline), s->decode); + if(!gst_element_link_many(s->typefind, s->decode, s->convert, NULL)) + { + WARNING(_("Could not link GStreamer elements")); + goto finally; + } + } + else + { + WARNING("Can't play that type, you FOOL!"); + } + +finally: + g_free(type); +} +#endif /* GSTREAMER_SOUND */ + /** * glk_schannel_create: * @rock: The rock value to give the new sound channel. @@ -43,13 +132,30 @@ glk_schannel_create(glui32 rock) s->pipeline = gst_pipeline_new(pipeline_name); g_free(pipeline_name); + /* Watch for messages from the pipeline */ + GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(s->pipeline)); + gst_bus_add_signal_watch(bus); + g_signal_connect(bus, "message", G_CALLBACK(on_pipeline_message), s); + gst_object_unref(bus); + /* Create GStreamer elements to put in the pipeline */ - s->source = gst_element_factory_make("fakesrc", NULL); - s->filter = gst_element_factory_make("identity", NULL); - s->sink = gst_element_factory_make("fakesink", NULL); - gst_bin_add_many(GST_BIN(s->pipeline), s->source, s->filter, s->sink, NULL); - if(!gst_element_link_many(s->source, s->filter, s->sink, NULL)) + s->source = gst_element_factory_make("giostreamsrc", NULL); + s->typefind = gst_element_factory_make("typefind", NULL); + s->convert = gst_element_factory_make("audioconvert", NULL); + s->filter = gst_element_factory_make("volume", NULL); + s->sink = gst_element_factory_make("autoaudiosink", NULL); + if(!s->source || !s->typefind || !s->convert || !s->filter || !s->sink) { + WARNING(_("Could not create one or more GStreamer elements")); goto fail; + } + + gst_bin_add_many(GST_BIN(s->pipeline), s->source, s->typefind, s->convert, s->filter, s->sink, NULL); + /* Link elements: Source -> typefinder -> ??? -> Converter -> Volume filter -> Sink */ + if(!gst_element_link(s->source, s->typefind) || !gst_element_link_many(s->convert, s->filter, s->sink, NULL)) { + WARNING(_("Could not link GStreamer elements")); + goto fail; + } + g_signal_connect(s->typefind, "have-type", G_CALLBACK(on_type_found), s); return s; @@ -73,7 +179,11 @@ glk_schannel_destroy(schanid_t chan) { VALID_SCHANNEL(chan, return); +#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); @@ -84,10 +194,11 @@ 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); +#endif } /** @@ -109,6 +220,7 @@ glk_schannel_iterate(schanid_t chan, glui32 *rockptr) { VALID_SCHANNEL_OR_NULL(chan, return NULL); +#ifdef GSTREAMER_SOUND ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GList *retnode; @@ -123,6 +235,9 @@ glk_schannel_iterate(schanid_t chan, glui32 *rockptr) *rockptr = glk_schannel_get_rock(retval); return retval; +#else + return NULL; +#endif /* GSTREAMER_SOUND */ } /** @@ -159,15 +274,12 @@ 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 glk_schannel_play(schanid_t chan, glui32 snd) { - VALID_SCHANNEL(chan, return 0); - return 0; + return glk_schannel_play_ext(chan, snd, 1, 0); } /** @@ -203,8 +315,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. */ @@ -212,7 +322,36 @@ glui32 glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify) { VALID_SCHANNEL(chan, return 0); +#ifdef GSTREAMER_SOUND + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + + if(!glk_data->resource_map) { + if(!glk_data->resource_load_callback) { + WARNING(_("No resource map has been loaded yet.")); + return 0; + } + WARNING(_("Loading sound resources from alternative location not yet supported.")); + return 0; + } + + giblorb_result_t resource; + giblorb_err_t result = giblorb_load_resource(glk_data->resource_map, giblorb_method_Memory, &resource, giblorb_ID_Snd, snd); + if(result != giblorb_err_None) { + WARNING_S( _("Error loading resource"), giblorb_get_error_message(result) ); + return 0; + } + g_printerr("playing sound resource %d on channel %p\n", snd, chan); + GInputStream *stream = g_memory_input_stream_new_from_data(resource.data.ptr, resource.length, NULL); + g_object_set(chan->source, "stream", stream, NULL); + + 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 } /** @@ -221,13 +360,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 } /** @@ -254,12 +395,20 @@ glk_schannel_stop(schanid_t chan) * linkend="chimara-Testing-for-Sound-Capabilities">Testing for Sound * Capabilities. * - * This function is not implemented yet. + * Chimara + * Chimara supports volumes from 0 to 1000%, that is, values of + * @vol up to 0xA0000. + * */ 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 } /**