mmedia @

Author: Peter Kosyh

Makefile.common

@@ -24,7 +24,7 @@ install: all
 	$(INSTALLD) $(DESTDIR)/$(BIN)
 	$(INSTALLB) instead-cli$(EXE) $(DESTDIR)/$(BIN)/instead-cli$(EXE)
 	$(INSTALLD) $(DESTDIR)/$(STEADPATH)
-	for d in stead2 stead3 stead3/ext; do \
+	for d in stead2 stead3 stead2/ext stead3/ext; do \
 		$(INSTALLD) $(DESTDIR)/$(STEADPATH)/$$d; \
 		$(INSTALL) instead/stead/$$d/*.lua $(DESTDIR)/$(STEADPATH)/$$d/; \
 	done

instead

@@ -211,6 +211,31 @@ static void show_err(void)
 	}
 }
 
+static char *media[] = { NULL, NULL };
+static char *media_fn[] = {
+	"instead.get_picture",
+	"instead.get_music"
+};
+
+static void mmedia(int t)
+{
+	char *mm;
+	instead_lock();
+	instead_function(media_fn[t], NULL);
+	mm = instead_retval(0);
+        instead_clear();
+        instead_unlock();
+	if (!mm && !media[t])
+		return;
+	if ((!media[t] && mm) || (media[t] && !mm) ||
+	    strcmp(media[t], mm)) {
+		free(media[t]);
+		media[t] = mm;
+		if (mm && *mm) { /* changed */
+			printf("@ %s\n", mm);
+		}
+	}
+}
 int main(int argc, const char **argv)
 {
 	int rc, i;
@@ -297,6 +322,7 @@ int main(int argc, const char **argv)
 		fprintf(stdout, "Can not load game: %s\n", instead_err());
 		exit(1);
 	}
+	mmedia(0); mmedia(1);
 	if (opt_autoload) {
 		snprintf(cmd, sizeof(cmd), "load %s", opt_autoload);
 		printf("%s\n", cmd);
@@ -322,7 +348,6 @@ int main(int argc, const char **argv)
 			break;
 		if (!strcmp(p, "/quit"))
 			break;
-
 		rc = 1; str = NULL;
 
 		if (*p == '/') {
@@ -356,6 +381,7 @@ int main(int argc, const char **argv)
 			str = instead_cmd(cmd, &rc);
 		}
 		if (str) {
+			mmedia(0); mmedia(1);
 			fmt(trim(str), opt_width);
 			free(str);
 		}

main.c

@@ -6,11 +6,14 @@
 
 if API == 'stead3' then
 	require 'tiny3'
+	require "ext/sound"
 	local instead = std '@instead'
 	local iface = std '@iface'
+	instead.music_callback = function() end
 	instead.restart = instead_restart
 	instead.menu = instead_menu
 	instead.savepath = function() return "./" end
+
 	function iface:em(str)
 		if type(str) == 'string' then
 			return '/'..str..'/'
@@ -21,6 +24,13 @@ if API == 'stead3' then
 			return '*'..str..'*'
 		end
 	end
+	instead.get_picture = function()
+		local s = stead.call(std.here(), 'pic')
+		if not s then
+			s = stead.call(std.ref 'game', 'pic')
+		end
+		return s and std.tostr(s)
+	end
 	std.mod_start(function()
 		std.mod_init(function()
 			std.rawset(_G, 'instead', instead)
@@ -33,4 +43,5 @@ if API == 'stead3' then
 	end)
 else
 	require 'tiny2'
+	require "ext/sound"
 end