Changes in trunk/settings.h [27:11]

File:

• trunk/settings.h (modified) (6 diffs)

trunk/settings.h

@@ -24 +24 @@
 
 #include "gotcha.h"
+#include "mmio.h"
 #include "./settings/thth_settings.h"
 
@@ -34 +35 @@
 
 enum { SAVESTYLE_CLIPBOARD, SAVESTYLE_FILE, };
-
+#if 0
+enum {
+    BMF_12, BMF_16, BMF_20, BMF_OS13, BMF_OS20, BMF_TIF, BMF_TIFU,
+    BMF_TGA, BMF_PCX, BMF_GIF, BMF_JPG, BMF_DIB,
+    BMF_INVALID
+};
+#else
 enum {
     BMF_JPG, BMF_PNG, BMF_OS20, BMF_TIF, BMF_TGA, BMF_PCX, BMF_GIF,
-    BMF_PBM, BMF_JP2, BMF_DIB,
+    BMF_PBM, BMF_JP2, BMF_JBG, BMF_RAW, BMF_DIB,
     BMF_INVALID
 };
-
+#endif
 enum { FSS_PROMPT, FSS_NUMFILES, FSS_FORCEFILE, };
 
@@ -48 +55 @@
     BOOL     available;
     USHORT   type;
-//    FOURCC   fourcc;
+    FOURCC   fourcc;
     PSZ      label;
     PSZ      extension;
@@ -131 +138 @@
 
     PSZ    GetFileExtension( SHORT type = BMF_INVALID );
-//    FOURCC GetFOURCC( SHORT type = BMF_INVALID );
+    FOURCC GetFOURCC( SHORT type = BMF_INVALID );
     PSZ    GetFileEAType( SHORT type = BMF_INVALID );
 
-    bool idleSetInIni;
-    int saveStyle;
-    PSZ pNumSaveDir;
-    PSZ pForceSaveFile;
-    bool bSerialCapture;
-//    BOOL           IsMMIOAvailable( VOID );
-//    class thth_MMIO      *GetMMIO( VOID );
+    BOOL           IsMMIOAvailable( VOID );
+    class thth_MMIO      *GetMMIO( VOID );
 
 protected:
@@ -176 +178 @@
     static PSZ   pszPageTab[COUNT_PAGES];
     BOOL   fAutoLanguage;
+
+    thth_MMIO    *mmio;
+
     HWND   hwndDlg;
 
@@ -193 +198 @@
 }
 
+inline BOOL Settings :: IsMMIOAvailable( VOID )
+{
+    if( mmio ) return TRUE;
+    return FALSE;
+}
+
+thth_MMIO *Settings :: GetMMIO( VOID ) { return mmio; }
+
 // ************************************************************************
 #endif