Changeset - r5988:7f6f0097eeb1
[Not reviewed]
master
0 14 0
Darkvater - 18 years ago 2007-02-12 21:55:10
darkvater@openttd.org
(svn r8691) -Cleanup: Some proper #endif comments for sound/music/video files, and a little elimination of magic numbers in Win32SoundStart
14 files changed with 22 insertions and 26 deletions:
0 comments (0 inline, 0 general)
src/music/dmusic.cpp
Show inline comments
 
@@ -4,7 +4,6 @@
 

	
 
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
 

	
 
#include "../openttd.h"
 
#include "../debug.h"
 
#include "../win32.h"
 
#include "dmusic.h"
 
@@ -218,7 +217,7 @@ static void DMusicMidiSetVolume(byte vol
 
}
 

	
 

	
 
extern "C" const HalMusicDriver _dmusic_midi_driver = {
 
const HalMusicDriver _dmusic_midi_driver = {
 
	DMusicMidiStart,
 
	DMusicMidiStop,
 
	DMusicMidiPlaySong,
 
@@ -227,4 +226,4 @@ extern "C" const HalMusicDriver _dmusic_
 
	DMusicMidiSetVolume,
 
};
 

	
 
#endif
 
#endif /* WIN32_ENABLE_DIRECTMUSIC_SUPPORT */
src/music/dmusic.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalMusicDriver _dmusic_midi_driver;
 

	
 
#endif
 
#endif /* MUSIC_DMUSIC_H */
src/music/null_m.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalMusicDriver _null_music_driver;
 

	
 
#endif
 
#endif /* MUSIC_NULL_H */
src/music/win32_m.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalMusicDriver _win32_music_driver;
 

	
 
#endif
 
#endif /* MUSIC_WIN32_H */
src/sound/null_s.cpp
Show inline comments
 
/* $Id$ */
 

	
 
#include "../stdafx.h"
 
#include "../openttd.h"
 
#include "null_s.h"
 

	
 
static const char *NullSoundStart(const char * const *parm) { return NULL; }
src/sound/null_s.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalSoundDriver _null_sound_driver;
 

	
 
#endif
 
#endif /* SOUND_NULL_H */
src/sound/sdl_s.cpp
Show inline comments
 
@@ -44,4 +44,4 @@ const HalSoundDriver _sdl_sound_driver =
 
	SdlSoundStop,
 
};
 

	
 
#endif
 
#endif /* WITH_SDL */
src/sound/sdl_s.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalSoundDriver _sdl_sound_driver;
 

	
 
#endif
 
#endif /* SOUND_SDL_H */
src/sound/win32_s.cpp
Show inline comments
 
@@ -42,29 +42,27 @@ static void CALLBACK waveOutProc(HWAVEOU
 
{
 
	switch (uMsg) {
 
		case WOM_DONE:
 
			if (_waveout) FillHeaders();
 
			if (_waveout != NULL) FillHeaders();
 
			break;
 

	
 
		default:
 
			break;
 
		default: break;
 
	}
 
}
 

	
 
static const char *Win32SoundStart(const char* const* parm)
 
{
 
	WAVEFORMATEX wfex;
 
	int hz;
 

	
 
	_bufsize = GetDriverParamInt(parm, "bufsize", 1024);
 
	hz = GetDriverParamInt(parm, "hz", 11025);
 
	wfex.wFormatTag = WAVE_FORMAT_PCM;
 
	wfex.nChannels = 2;
 
	wfex.nSamplesPerSec = hz;
 
	wfex.nAvgBytesPerSec = hz * 2 * 2;
 
	wfex.nBlockAlign = 4;
 
	wfex.wBitsPerSample = 16;
 
	wfex.nSamplesPerSec = GetDriverParamInt(parm, "hz", 11025);
 
	wfex.nBlockAlign = (wfex.nChannels * wfex.wBitsPerSample) / 8;
 
	wfex.nAvgBytesPerSec = wfex.nSamplesPerSec * wfex.nBlockAlign;
 

	
 
	_bufsize = GetDriverParamInt(parm, "bufsize", 1024);
 

	
 
	if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD_PTR)&waveOutProc, 0, CALLBACK_FUNCTION) != MMSYSERR_NOERROR)
 
		return "waveOutOpen failed";
 

	
 
	PrepareHeader(&_wave_hdr[0]);
 
	PrepareHeader(&_wave_hdr[1]);
 
	FillHeaders();
src/video/dedicated_v.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalVideoDriver _dedicated_video_driver;
 

	
 
#endif
 
#endif /* VIDEO_DEDICATED_H */
src/video/null_v.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalVideoDriver _null_video_driver;
 

	
 
#endif
 
#endif /* VIDEO_NULL_H */
src/video/sdl_v.cpp
Show inline comments
 
@@ -510,4 +510,4 @@ const HalVideoDriver _sdl_video_driver =
 
	SdlVideoFullScreen,
 
};
 

	
 
#endif
 
#endif /* WITH_SDL */
src/video/sdl_v.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalVideoDriver _sdl_video_driver;
 

	
 
#endif
 
#endif /* VIDEO_SDL_H */
src/video/win32_v.h
Show inline comments
 
@@ -7,4 +7,4 @@
 

	
 
extern const HalVideoDriver _win32_video_driver;
 

	
 
#endif
 
#endif /* VIDEO_WIN32_H */
0 comments (0 inline, 0 general)