Mercurial > hg > openttd
changeset 2219:a505c7d2759e draft
(svn r2737) static, const and don't make variables public nobody else needs to know about
author | tron <tron@openttd.org> |
---|---|
date | Thu, 28 Jul 2005 09:41:09 +0000 |
parents | 1e5a1e9725ad |
children | cf8cea142a9a |
files | driver.c hal.h |
diffstat | 2 files changed, 15 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/driver.c +++ b/driver.c @@ -24,22 +24,28 @@ #include "video/sdl_v.h" #include "video/win32_v.h" -typedef struct { +typedef struct DriverDesc { + const char* name; + const char* longname; + const void* drv; +} DriverDesc; + +typedef struct DriverClass { const DriverDesc *descs; const char *name; void *var; } DriverClass; -static DriverClass _driver_classes[] = { +static const DriverDesc _video_driver_descs[]; +static const DriverDesc _sound_driver_descs[]; +static const DriverDesc _music_driver_descs[]; + +static const DriverClass _driver_classes[] = { {_video_driver_descs, "video", &_video_driver}, {_sound_driver_descs, "sound", &_sound_driver}, {_music_driver_descs, "music", &_music_driver}, }; -enum { - DF_PRIORITY_MASK = 0xF, -}; - static const DriverDesc* GetDriverByName(const DriverDesc* dd, const char* name) { for (; dd->name != NULL; dd++) { @@ -156,7 +162,7 @@ } -const DriverDesc _music_driver_descs[] = { +static const DriverDesc _music_driver_descs[] = { #ifdef __BEOS__ { "bemidi", "BeOS MIDI Driver", &_bemidi_music_driver }, #endif @@ -178,7 +184,7 @@ { NULL, NULL, NULL} }; -const DriverDesc _sound_driver_descs[] = { +static const DriverDesc _sound_driver_descs[] = { #ifdef WIN32 { "win32", "Win32 WaveOut Driver", &_win32_sound_driver }, #endif @@ -189,7 +195,7 @@ { NULL, NULL, NULL} }; -const DriverDesc _video_driver_descs[] = { +static const DriverDesc _video_driver_descs[] = { #ifdef WIN32 { "win32", "Win32 GDI Video Driver", &_win32_video_driver }, #endif
--- a/hal.h +++ b/hal.h @@ -37,12 +37,6 @@ void (*set_volume)(byte vol); } HalMusicDriver; -typedef struct { - const char *name; - const char *longname; - const void *drv; -} DriverDesc; - enum { HALERR_OK = 0, HALERR_ERROR = 1, @@ -52,10 +46,6 @@ VARDEF HalSoundDriver *_sound_driver; VARDEF HalVideoDriver *_video_driver; -extern const DriverDesc _video_driver_descs[]; -extern const DriverDesc _sound_driver_descs[]; -extern const DriverDesc _music_driver_descs[]; - enum DriverType { VIDEO_DRIVER = 0, SOUND_DRIVER = 1,