X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.c;h=e9f705245111d5418c939bee0949c7744f61c315;hb=2dfa6eb26fe1b7e34e9ecf16b02a6f3254aded81;hp=3e33f235256887b128a813cf9fc00c5308f6681b;hpb=37afe8768ae9031937291854e0866c10cbe2c0d4;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/schannel.c b/libchimara/schannel.c index 3e33f23..e9f7052 100644 --- a/libchimara/schannel.c +++ b/libchimara/schannel.c @@ -15,37 +15,73 @@ extern GPrivate *glk_data_key; #ifdef GSTREAMER_SOUND +/* Stop any currently playing sound on this channel, and remove any + format-specific GStreamer elements from the channel. */ +static void +clean_up_after_playing_sound(schanid_t chan) +{ + if(!gst_element_set_state(chan->pipeline, GST_STATE_NULL)) + WARNING_S(_("Could not set GstElement state to"), "NULL"); + if(chan->demux) + { + gst_bin_remove(GST_BIN(chan->pipeline), chan->demux); + chan->demux = NULL; + } + if(chan->decode) + { + gst_bin_remove(GST_BIN(chan->pipeline), chan->decode); + chan->decode = NULL; + } +} + +/* This signal is thrown whenever the GStreamer pipeline generates a message. + Most messages are harmless. */ static void on_pipeline_message(GstBus *bus, GstMessage *message, schanid_t s) { - g_print("Got %s message\n", GST_MESSAGE_TYPE_NAME(message)); + /* g_printerr("Got %s message\n", GST_MESSAGE_TYPE_NAME(message)); */ + GError *err; + gchar *debug_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); + gst_message_parse_error(message, &err, &debug_message); + IO_WARNING(_("GStreamer error"), err->message, debug_message); g_error_free(err); - g_free(debug); + g_free(debug_message); + clean_up_after_playing_sound(s); } break; - case GST_MESSAGE_STATE_CHANGED: + case GST_MESSAGE_WARNING: { - GstState old_state, new_state; - gst_message_parse_state_changed(message, &old_state, &new_state, NULL); - g_print("Element %s changed state from %s to %s.\n", - GST_OBJECT_NAME(message->src), - gst_element_state_get_name(old_state), - gst_element_state_get_name(new_state)); + gst_message_parse_warning(message, &err, &debug_message); + IO_WARNING(_("GStreamer warning"), err->message, debug_message); + g_error_free(err); + g_free(debug_message); } break; - case GST_MESSAGE_EOS: - /* end-of-stream */ - if(!gst_element_set_state(s->pipeline, GST_STATE_READY)) - WARNING_S(_("Could not set GstElement state to"), "READY"); + case GST_MESSAGE_INFO: + { + gst_message_parse_info(message, &err, &debug_message); + g_message("GStreamer info \"%s\": %s", err->message, debug_message); + g_error_free(err); + g_free(debug_message); + } + break; + case GST_MESSAGE_EOS: /* End of stream */ + /* Decrease repeats if not set to forever */ + if(s->repeats != (glui32)-1) + s->repeats--; + if(s->repeats > 0) { + if(!gst_element_seek_simple(s->pipeline, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, 0)) { + WARNING(_("Could not execute GStreamer seek")); + clean_up_after_playing_sound(s); + } + } else { + clean_up_after_playing_sound(s); + } break; default: /* unhandled message */ @@ -53,17 +89,23 @@ on_pipeline_message(GstBus *bus, GstMessage *message, schanid_t s) } } +/* This signal is thrown when the OGG demuxer element has decided what kind of + outputs it will output. We connect the decoder element dynamically. */ 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); + if(gst_pad_link(pad, sinkpad) != GST_PAD_LINK_OK) + WARNING(_("Could not link OGG demuxer with Vorbis decoder")); gst_object_unref(sinkpad); } +/* This signal is thrown when the typefinder element has found the type of its + input. Now that we know what kind of input stream we have, we can connect the + proper demuxer/decoder elements. */ static void on_type_found(GstElement *typefind, guint probability, GstCaps *caps, schanid_t s) { @@ -105,7 +147,7 @@ on_type_found(GstElement *typefind, guint probability, GstCaps *caps, schanid_t } else { - WARNING("Can't play that type, you FOOL!"); + WARNING_S(_("Unexpected audio type in blorb"), type); } finally: @@ -161,7 +203,9 @@ glk_schannel_create(glui32 rock) WARNING(_("Could not create one or more GStreamer elements")); goto fail; } - + + /* Put the elements in the pipeline and link as many together as we can + without knowing the type of the audio stream */ 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)) { @@ -205,7 +249,8 @@ glk_schannel_destroy(schanid_t chan) (*glk_data->unregister_obj)(chan, gidisp_Class_Schannel, chan->disprock); chan->disprock.ptr = NULL; } - + + /* This also frees all the objects inside the pipeline */ if(chan->pipeline) gst_object_unref(chan->pipeline); @@ -335,27 +380,56 @@ glui32 glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify) { VALID_SCHANNEL(chan, return 0); + g_printerr("Play sound %d with repeats %d and notify %d\n", snd, repeats, notify); #ifdef GSTREAMER_SOUND ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - + GInputStream *stream; + + /* Stop the previous sound */ + clean_up_after_playing_sound(chan); + + /* Don't play if repeats = 0 */ + if(repeats == 0) { + chan->repeats = 0; + return 1; + } + + /* Load the sound into a GInputStream, by whatever method */ 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; + gchar *filename = glk_data->resource_load_callback(CHIMARA_RESOURCE_SOUND, snd, glk_data->resource_load_callback_data); + if(!filename) { + WARNING(_("Error loading resource from alternative location.")); + return 0; + } + + GError *err = NULL; + GFile *file = g_file_new_for_path(filename); + stream = G_INPUT_STREAM(g_file_read(file, NULL, &err)); + if(!stream) { + IO_WARNING(_("Error loading resource from file"), filename, err->message); + g_free(filename); + g_object_unref(file); + return 0; + } + g_free(filename); + g_object_unref(file); + } else { + 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; + } + stream = g_memory_input_stream_new_from_data(resource.data.ptr, resource.length, NULL); } - 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); + + chan->repeats = repeats; g_object_set(chan->source, "stream", stream, NULL); + g_object_unref(stream); /* Now owned by GStreamer element */ if(!gst_element_set_state(chan->pipeline, GST_STATE_PLAYING)) { WARNING_S(_("Could not set GstElement state to"), "PLAYING"); @@ -379,8 +453,7 @@ 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"); + clean_up_after_playing_sound(chan); #endif } @@ -436,10 +509,41 @@ glk_schannel_set_volume(schanid_t chan, glui32 vol) * @flag is zero, the library may release memory or other resources associated * with the sound. Calling this function is always optional, and it has no * effect on what the library actually plays. - * - * This function is not implemented yet. */ void glk_sound_load_hint(glui32 snd, glui32 flag) { +#ifdef GSTREAMER_SOUND + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + giblorb_result_t resource; + giblorb_err_t result; + + /* Sound load hints only work for Blorb resource maps */ + if(!glk_data->resource_map) + return; + + if(flag) { + /* The sound load hint simply loads the resource from the resource map; + loading a chunk more than once does nothing */ + 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; + } + } else { + /* Get the Blorb chunk number by loading the resource with + method_DontLoad, then unload that chunk - has no effect if the chunk + isn't loaded */ + result = giblorb_load_resource(glk_data->resource_map, giblorb_method_DontLoad, &resource, giblorb_ID_Snd, snd); + if(result != giblorb_err_None) { + WARNING_S( _("Error loading resource"), giblorb_get_error_message(result) ); + return; + } + result = giblorb_unload_chunk(glk_data->resource_map, resource.chunknum); + if(result != giblorb_err_None) { + WARNING_S( _("Error unloading chunk"), giblorb_get_error_message(result) ); + return; + } + } +#endif /* GSTREAMER_SOUND */ }