Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11631/include
Modified Files:
data.h proto.h sound.h
Removed Files:
audio.h
Log Message:
Completely gutted the old windows sound system. Resulting in removal of
nt_intro.wav (yay!), audio.h and winsndlib.c (bigger yay!). All the clunky old
windows code for loading sound, checking if sound is enabled, and changing
volume is now handled by 20x less code using SDL. And it's done better,
too. All references to "newSound" have been renamed to "sound". No
longer support the old sound menu/loading of sounds, so that got gutted too.
Still todo: menu option for removing other ship's sounds, ability to toggle
certain sound categories on/off, and to control starting volume. All to be
netrekrc entries.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- data.h 28 Feb 2007 07:44:00 -0000 1.50
+++ data.h 28 Feb 2007 09:35:19 -0000 1.51
@@ -697,11 +697,10 @@
extern int richText; /* temporary variable to enable/disable rich text windows */
extern int newQuit; /* new quit clock */
-extern int newSound; /* Use new SDL sound interface */
-extern int newSoundEffects; /* Use SDL sound effects playback */
-extern int newSoundMusic; /* Use SDL music playback */
-extern int newSoundMusicBkgd; /* Play random background music continuously */
-extern int newSoundAngles; /* Use SDL with angular 3D sound */
+extern int soundEffects; /* Use sound effects playback */
+extern int soundMusic; /* Use music playback */
+extern int soundMusicBkgd; /* Play random background music continuously */
+extern int soundAngles; /* Use 3D sound */
extern int useFullShipInfo; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */
#endif /* _h_data */
--- audio.h DELETED ---
Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sound.h 17 Feb 2007 01:58:50 -0000 1.14
+++ sound.h 28 Feb 2007 09:35:19 -0000 1.15
@@ -61,10 +61,8 @@
extern void Play_Sound_Loc (int type, int angle, int distance);
extern void Play_Music (int type);
extern void Play_Music_Bkgd (void);
-extern void ChangeNewsoundVolume (int vol);
-extern void Abort_Sound (int type);
+extern void ChangeVolume (int vol);
extern void Init_Sound (void);
-extern void Exit_Sound (void);
enum {
CLOAKED_WAV,
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- proto.h 28 Feb 2007 07:44:00 -0000 1.33
+++ proto.h 28 Feb 2007 09:35:19 -0000 1.34
@@ -779,8 +779,6 @@
//static void handleMessageWindowButton(W_Event * event);
void newwin (char *hostmon,
char *progname);
-void newsoundwin (char *hostmon,
- char *progname);
void mapAll (void);
void savebitmaps (void);
void entrywindow (int *team,
@@ -1266,18 +1264,4 @@
void HideConsoleWindow (void);
BOOL CALLBACK EnumWindowsProc (HWND hwnd, LPARAM lparam);
-/******************************************************************************/
-/*** winsndlib.c
-/******************************************************************************/
-int ParseSoundFile (char *fname,
- PCMWAVEFORMAT * header,
- DWORD * datalen,
- char **data);
-struct sound *GetSound (char *name);
-void ExitSound ();
-int InitSound ();
-void StopSound ();
-int StartSound (char *name);
-int SoundPlaying ();
-void CheckVolumeSettings ();
#endif /* __INCLUDED_proto_h__ */