diff tests/plrtest.c @ 730:3d813c81f33c

More work on resources API.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 21 Apr 2013 19:29:00 +0300
parents f9f98a0f4e9a
children ed60a7ee3ebb
line wrap: on
line diff
--- a/tests/plrtest.c	Sun Apr 21 18:34:13 2013 +0300
+++ b/tests/plrtest.c	Sun Apr 21 19:29:00 2013 +0300
@@ -2,7 +2,6 @@
 #include "jssmod.h"
 #include "jssmix.h"
 #include "jssplr.h"
-#include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <SDL.h>
@@ -111,22 +110,25 @@
 {
     SDL_AudioSpec afmt;
     DMResource *file = NULL;
-    char *sname = NULL;
+    char *inFilename = NULL;
     int result = -1;
     JSSModule *mod = NULL;
     JSSMixer *dev = NULL;
     JSSPlayer *plr = NULL;
 
     if (argc > 1)
-        sname = argv[1];
+        inFilename = argv[1];
 
     // Open the files
-    if (sname == NULL)
-        file = dmf_create_stdio_stream(stdin);
-    else if ((file = dmf_create_stdio(sname, "rb")) == NULL)
+    if (inFilename == NULL)
+        result = dmf_create_stdio_stream(stdin, &file);
+    else
+        result = dmf_create_stdio(inFilename, "rb", &file);
+    
+    if (result != DMERR_OK)
     {
-        fprintf(stderr, "Error opening input file '%s'. (%s)\n",
-            sname, strerror(errno));
+        fprintf(stderr, "Error opening input file '%s', #%d: %s\n",
+            inFilename, result, dmErrorStr(result));
         return 1;
     }
         
@@ -136,7 +138,7 @@
 
     
     // Read module file
-    fprintf(stderr, "Reading file: %s\n", sname);
+    fprintf(stderr, "Reading file: %s\n", inFilename);
 #ifdef JSS_SUP_XM
     fprintf(stderr, "* Trying XM...\n");
     result = jssLoadXM(file, &mod);