X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.c;h=e9f705245111d5418c939bee0949c7744f61c315;hb=2dfa6eb26fe1b7e34e9ecf16b02a6f3254aded81;hp=036c76094b4b1939373d7f6ca4e382ba90cef6a3;hpb=f3d667ede27d019fc0728cc6d2bcf71854cf2d03;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/schannel.c b/libchimara/schannel.c
index 036c760..e9f7052 100644
--- a/libchimara/schannel.c
+++ b/libchimara/schannel.c
@@ -70,9 +70,18 @@ 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);
+		}
 		break;
 	default:
 		/* unhandled message */
@@ -371,29 +380,56 @@ glui32
 glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify)
 {
 	VALID_SCHANNEL(chan, return 0);
-#ifdef GSTREAMER_SOUND	
+	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;
 	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");
@@ -473,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.
- *
- * <warning><para>This function is not implemented yet.</para></warning>
  */
 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 */
 }