Merge branch 'sound'

Conflicts:
	tests/Makefile.am

diff --combined tests/Makefile.am
index 5a55db20e75c0a57e615c2a82b56cfaf9cd92381,0fdb5425d8b7daeb06ed27ad857e5357461da4a9..d00d91149de4035983209657221920497096bb1f
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -30,7 -30,7 +30,7 @@@ test_close_CFLAGS = @TEST_CFLAGS@ $(AM_
  test_close_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
  
  noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la \
-       styletest.la test-userstyle.la
 -      styletest.la soundtest.la
++      styletest.la soundtest.la test-userstyle.la
  
  first_la_SOURCES = first.c
  first_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
@@@ -50,5 -50,5 +50,9 @@@ multiwin_la_LDFLAGS = $(TEST_PLUGIN_LIB
  styletest_la_SOURCES = styletest.c
  styletest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
  
 +test_userstyle_la_SOURCES = test-userstyle.c
 +test_userstyle_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
++
+ soundtest_la_SOURCES = soundtest.c
+ soundtest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
++

diff --combined tests/plugin-loader.c
index 1c560ac93875e5d4ddb054cef2d8a45ac0cf7b32,a502af6d9556000d1c33ba89d9a81faf658c8a5d..ab47f8967dad72bc6a3f68d28327995a3d914d38
--- 1/tests/plugin-loader.c
--- 2/tests/plugin-loader.c
+++ b/tests/plugin-loader.c
@@@ -17,7 -17,7 +17,7 @@@
   *    contributor may be used to endorse or promote products derived
   *    from this software without specific prior written permission.
   * 
 - * main.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS
 + * plugin-loader.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS
   * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   * ARE DISCLAIMED.  IN NO EVENT SHALL Philip en Marijn OR ANY OTHER CONTRIBUTORS
@@@ -65,6 -65,19 +65,19 @@@ create_window(void
        gtk_container_add(GTK_CONTAINER(window), glk);
  }
  
+ static gchar *
+ resource_load(ChimaraResourceType usage, guint32 resnum)
+ {
+       char *resstr;
+       if(usage == CHIMARA_RESOURCE_IMAGE)
+               resstr = "PIC";
+       else if(usage == CHIMARA_RESOURCE_SOUND)
+               resstr = "SND";
+       else
+               resstr = "FCK";
+       return g_strdup_printf("%s%d", resstr, resnum);
+ }
+ 
  int
  main(int argc, char *argv[])
  {
@@@ -86,6 -99,8 +99,8 @@@
  
        if(argc < 2)
                g_error("Must provide a plugin\n");
+ 
+       chimara_glk_set_resource_load_callback(CHIMARA_GLK(glk), (ChimaraResourceLoadFunc)resource_load, NULL);
        
      if( !chimara_glk_run(CHIMARA_GLK(glk), argv[1], argc - 1, argv + 1, &error) )
                g_error("Error starting Glk library: %s\n", error->message);