X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.c;h=8cd7b526bddb86b8f401ec3879255b6b3470293f;hb=28c6b69cb8e971a9959066fe896edcc4ae412935;hp=4ec75c0985c1df4ea8555ffc2434a0fa2155dc1c;hpb=88f7453ab167aa1a61cc3e53c6647c6c3b3318bd;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/schannel.c b/libchimara/schannel.c index 4ec75c0..8cd7b52 100644 --- a/libchimara/schannel.c +++ b/libchimara/schannel.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #ifdef GSTREAMER_SOUND #include @@ -11,6 +11,7 @@ #include "gi_dispa.h" #include "gi_blorb.h" #include "resource.h" +#include "event.h" extern GPrivate *glk_data_key; @@ -70,9 +71,21 @@ on_pipeline_message(GstBus *bus, GstMessage *message, schanid_t s) g_free(debug_message); } break; - case GST_MESSAGE_EOS: - /* end-of-stream */ - clean_up_after_playing_sound(s); + 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); + /* Sound ended normally, send a notification if requested */ + if(s->notify) + event_throw(s->glk, evtype_SoundNotify, NULL, s->resource, s->notify); + } break; default: /* unhandled message */ @@ -101,18 +114,15 @@ 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) - { + 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) - { + 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)) - { + if(!gst_element_link(s->typefind, s->demux) || !gst_element_link(s->decode, s->convert)) { WARNING(_("Could not link GStreamer elements")); goto finally; } @@ -120,24 +130,29 @@ on_type_found(GstElement *typefind, guint probability, GstCaps *caps, schanid_t 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) - { + } else if(strcmp(type, "audio/x-aiff") == 0) { s->decode = gst_element_factory_make("aiffparse", NULL); - if(!s->decode) - { + 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)) - { + if(!gst_element_link_many(s->typefind, s->decode, s->convert, NULL)) { WARNING(_("Could not link GStreamer elements")); goto finally; } - } - else - { + } else if(strcmp(type, "audio/x-mod") == 0) { + s->decode = gst_element_factory_make("modplug", NULL); + if(!s->decode) { + WARNING(_("Could not create 'modplug' 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_S(_("Unexpected audio type in blorb"), type); } @@ -173,6 +188,9 @@ glk_schannel_create(glui32 rock) glk_data->schannel_list = g_list_prepend(glk_data->schannel_list, s); s->schannel_list = glk_data->schannel_list; + /* Add a pointer to the ChimaraGlk widget, for convenience */ + s->glk = glk_data->self; + /* Create a GStreamer pipeline for the sound channel */ gchar *pipeline_name = g_strdup_printf("pipeline-%p", s); s->pipeline = gst_pipeline_new(pipeline_name); @@ -371,26 +389,58 @@ 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); } - GInputStream *stream = g_memory_input_stream_new_from_data(resource.data.ptr, resource.length, NULL); + + chan->repeats = repeats; + chan->resource = snd; + chan->notify = notify; 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"); @@ -470,10 +520,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 */ }