Resolving inconsistent state part I

[virtualjaguar] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index f998b8b6040118bea76dd082be691dfa746b1472..68693255d765a30af01a4fffc703ff13bb09b8fb 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -28,13 +28,14 @@ struct VJSettings
        bool useOpenGL;
        uint32 glFilter;
        bool hardwareTypeAlpine;
+       bool audioEnabled;
        uint32 frameSkip;
        uint32 renderType;
 
        // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
 
-       uint16 p1KeyBindings[21];
-       uint16 p2KeyBindings[21];
+       uint32 p1KeyBindings[21];
+       uint32 p2KeyBindings[21];
 
        // Paths
 
@@ -50,14 +51,11 @@ enum { RT_NORMAL = 0, RT_TV = 1 };
 
 // Exported functions
 
-void LoadVJSettings(void);
-void SaveVJSettings(void);
+//void LoadVJSettings(void);
+//void SaveVJSettings(void);
 
 // Exported variables
 
 extern VJSettings vjs;
 
-// Temporary vars...
-extern bool smoothGLOutput;
-
 #endif // __SETTINGS_H__