Mercurial > hg > xmms-sid

comparison src/xs_config.c @ 946:f8e1de328ac1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix various compilation related issues, make includes more POSIX compliant, utilize autoconf detected stuff via conditionals as needed.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 19 Nov 2012 20:32:18 +0200
parents 63342bbeab47
children 5711abf1ff39
comparison
equal deleted inserted replaced
945:600964060bcc 946:f8e1de328ac1
49 #define XS_CFG_GET_STRING(q,z) xmms_cfg_read_string(cfg, XS_CONFIG_IDENT, q, z) 49 #define XS_CFG_GET_STRING(q,z) xmms_cfg_read_string(cfg, XS_CONFIG_IDENT, q, z)
50 #define XS_CFG_GET_FLOAT(q,z) xmms_cfg_read_float(cfg, XS_CONFIG_IDENT, q, z) 50 #define XS_CFG_GET_FLOAT(q,z) xmms_cfg_read_float(cfg, XS_CONFIG_IDENT, q, z)
51 #define XS_CFG_GET_INT(q,z) xmms_cfg_read_int(cfg, XS_CONFIG_IDENT, q, z) 51 #define XS_CFG_GET_INT(q,z) xmms_cfg_read_int(cfg, XS_CONFIG_IDENT, q, z)
52 #define XS_CFG_GET_BOOL(q,z) xmms_cfg_read_boolean(cfg, XS_CONFIG_IDENT, q, z) 52 #define XS_CFG_GET_BOOL(q,z) xmms_cfg_read_boolean(cfg, XS_CONFIG_IDENT, q, z)
53 #endif 53 #endif
54 #include <stdio.h> 54 #include "xs_support.h"
55 #include <ctype.h>
56 #include "xs_glade.h" 55 #include "xs_glade.h"
57 #include "xs_interface.h" 56 #include "xs_interface.h"
58 #include "xs_support.h"
59 #include "xs_backend.h" 57 #include "xs_backend.h"
60 58
61 /* 59 /*
62 * Global widgets 60 * Global widgets
63 */ 61 */
320 xs_cfg.playerEngine = XS_ENG_SIDPLAY2; 318 xs_cfg.playerEngine = XS_ENG_SIDPLAY2;
321 xs_cfg.memoryMode = XS_MPU_REAL; 319 xs_cfg.memoryMode = XS_MPU_REAL;
322 #elif defined(HAVE_SIDPLAY1) 320 #elif defined(HAVE_SIDPLAY1)
323 xs_cfg.playerEngine = XS_ENG_SIDPLAY1; 321 xs_cfg.playerEngine = XS_ENG_SIDPLAY1;
324 xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING; 322 xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
325 #else 323 #elif !defined(HAVE_SIDPLAYFP)
326 #error This should not happen! No emulator engines configured in! 324 #error This should not happen! No emulator engines configured in!
327 #endif 325 #endif
328 326
329 xs_cfg.clockSpeed = XS_CLOCK_PAL; 327 xs_cfg.clockSpeed = XS_CLOCK_PAL;
330 xs_cfg.forceSpeed = FALSE; 328 xs_cfg.forceSpeed = FALSE;