Mercurial > hg > dmlib

diff dmsimple.h @ 105:d5d27f262227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Beging merging of dmsimple2-fork into the main "engine".
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 03 Oct 2012 09:16:26 +0300
parents 4bbfc0274b29
children 8db49a23b393
line wrap: on
line diff
--- a/dmsimple.h	Wed Oct 03 08:30:32 2012 +0300
+++ b/dmsimple.h	Wed Oct 03 09:16:26 2012 +0300
@@ -6,10 +6,12 @@
 #include "dmres.h"
 #include "dmimage.h"
 
+#ifdef DM_USE_JSS
 #include "jss.h"
 #include "jssmod.h"
 #include "jssmix.h"
 #include "jssplr.h"
+#endif
 
 
 typedef struct
@@ -21,10 +23,19 @@
     SDL_Surface *screen;
     SDL_Event event;
 
-    int optScrWidth, optScrHeight, optVFlags, optBitDepth;
+    SDL_AudioSpec optAfmt;
+    int optScrWidth, optScrHeight, optVFlags, optBitDepth, optResFlags;
+    char *optDataPath, *optPackFilename;
 
+#ifdef DM_USE_JSS
     JSSMixer *dev;
     JSSPlayer *plr;
+#endif
+
+#ifdef DM_USE_TREMOR
+    DMResource *audio;
+    int audioPos;
+#endif
 
 #ifdef DM_DEBUG
     BOOL optDebug;