X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.c;h=8cd7b526bddb86b8f401ec3879255b6b3470293f;hb=7d92dddcf2eb2ab47092d0b17c06611716601f39;hp=d2df4892a49d77a3b724d23e89cc116fd2c5914d;hpb=993f3a070baa8131ddd159a55d5cde43a91d2154;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/schannel.c b/libchimara/schannel.c
index d2df489..8cd7b52 100644
--- a/libchimara/schannel.c
+++ b/libchimara/schannel.c
@@ -1,6 +1,6 @@
 #include <config.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <libchimara/glk.h>
 #ifdef GSTREAMER_SOUND
 #include <gst/gst.h>
@@ -11,6 +11,7 @@
 #include "gi_dispa.h"
 #include "gi_blorb.h"
 #include "resource.h"
+#include "event.h"
 
 extern GPrivate *glk_data_key;
 
@@ -81,6 +82,9 @@ on_pipeline_message(GstBus *bus, GstMessage *message, schanid_t 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:
@@ -110,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;
 		}
@@ -129,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);
 	}
 
@@ -182,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);
@@ -400,8 +409,23 @@ glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify)
 			WARNING(_("No resource map has been loaded yet."));
 			return 0;
 		}
-		WARNING(_("Loading sound resources from alternative location not yet supported."));
-		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);
@@ -413,7 +437,10 @@ glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify)
 	}
 
 	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");