Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

add sound card info; remove central detect() call

Browse Source 
This was SVN commit r1357.
This commit is contained in:
janwas 2004-11-19 22:40:00 +00:00
parent 25468f0251
commit 4a9fc1e1d1
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/lib/detect.cpp
View File

@ -33,10 +33,12 @@ extern void ia32_get_cpu_info();
#ifdef _WIN32 #ifdef _WIN32
extern int win_get_gfx_info(); extern int win_get_gfx_info();
extern int win_get_cpu_info(); extern int win_get_cpu_info();
extern int win_get_snd_info();
#endif #endif
extern "C" int ogl_get_gfx_info(); extern "C" int ogl_get_gfx_info();
// //
// memory // memory
// //
@ -71,12 +73,13 @@ void get_mem_status()
#endif #endif
} }
// //
// graphics card // graphics card
// //
char gfx_card[64] = ""; char gfx_card[GFX_CARD_LEN] = "";
char gfx_drv_ver[64] = ""; char gfx_drv_ver[GFX_DRV_VER_LEN] = "";
// attempt to detect graphics card without OpenGL (in case ogl init fails, // attempt to detect graphics card without OpenGL (in case ogl init fails,
@ -106,7 +109,7 @@ void get_gfx_info()
// CPU // CPU
// //
char cpu_type[64] = ""; // processor brand string is 48 chars char cpu_type[49] = ""; // processor brand string is <= 48 chars
double cpu_freq = 0.f; double cpu_freq = 0.f;
// -1 if detect not yet called, or cannot be determined // -1 if detect not yet called, or cannot be determined
@ -116,7 +119,7 @@ int cpu_smp = -1;
// are there actually multiple physical processors, // are there actually multiple physical processors,
// not only logical hyperthreaded CPUs? relevant for wtime. // not only logical hyperthreaded CPUs? relevant for wtime.
static inline void get_cpu_info() inline void get_cpu_info()
{ {
#ifdef _WIN32 #ifdef _WIN32
win_get_cpu_info(); win_get_cpu_info();
@ -128,11 +131,16 @@ static inline void get_cpu_info()
} }
//
// sound
//
char snd_card[SND_CARD_LEN];
char snd_drv_ver[SND_DRV_VER_LEN];
void detect() inline void get_snd_info()
{ {
get_mem_status(); #ifdef _WIN32
get_gfx_info(); win_get_snd_info();
get_cpu_info(); #endif
} }

11
source/lib/detect.h
View File

@ -31,8 +31,17 @@ extern "C" {
#include "sysdep/os.h" #include "sysdep/os.h"
#include "sysdep/cpu.h" #include "sysdep/cpu.h"
extern void get_cpu_info();
extern void detect();
const size_t SND_CARD_LEN = 16;
extern char snd_card[SND_CARD_LEN];
const size_t SND_DRV_VER_LEN = 128;
extern char snd_drv_ver[SND_DRV_VER_LEN];
extern void get_snd_info();
#ifdef __cplusplus #ifdef __cplusplus