- updated resources to DX9
- completely rewritten headers (DX9 compat.; look much nicer now ;=)
- removed IDirectMusicSong and IDirectMusicMelodyFormulationTrack
(which are removed from DX9; weren't implemented in DX8 anyway)
- combined/simplified IDirectMusicSomething / IDirectMusicObject /
IPersistStream for objects that support loading
- implemented IDirectMusicObject on all such objects; via generic
functions
- combined IDirectMusicTrack(8)/IPersistStream on all tracks
- fully implemented IDirectMusicContainer (at least 90% if there are
no private interfaces)
- implemented IDirectMusicCollection (99% work & MS compliant
behaviour; except for instruments)
- tried to implement IDirectMusicInstrument (unfortunately uses some
dirty private interfaces... :(
- added dswave.dll; DirectMusic Wave
- some changes in style
- many, many more ;)
diff --git a/include/dmusbuff.h b/include/dmusbuff.h
index 6008fdc..c4fa408 100644
--- a/include/dmusbuff.h
+++ b/include/dmusbuff.h
@@ -1,6 +1,6 @@
/* DirectMusic Buffer Format
*
- * Copyright (C) 2003 Rok Mandeljc
+ * Copyright (C) 2003-2004 Rok Mandeljc
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,26 +20,31 @@
#ifndef __WINE_DMUSIC_BUFFER_H
#define __WINE_DMUSIC_BUFFER_H
-#include <pshpack4.h>
-
/*****************************************************************************
- * Definitions
+ * Misc. definitions
*/
-#define DMUS_EVENT_STRUCTURED 0x00000001
#define QWORD_ALIGN(x) (((x) + 7) & ~7)
#define DMUS_EVENT_SIZE(cb) QWORD_ALIGN(sizeof(DMUS_EVENTHEADER) + cb)
/*****************************************************************************
+ * Flags
+ */
+#define DMUS_EVENT_STRUCTURED 0x1
+
+/*****************************************************************************
* Structures
*/
-typedef struct _DMUS_EVENTHEADER
-{
+/* typedef definitions */
+typedef struct _DMUS_EVENTHEADER DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER;
+
+/* actual structure*/
+#include <pshpack4.h>
+struct _DMUS_EVENTHEADER {
DWORD cbEvent;
DWORD dwChannelGroup;
REFERENCE_TIME rtDelta;
DWORD dwFlags;
-} DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER;
-
+};
#include <poppack.h>
#endif /* __WINE_DMUSIC_BUFFER_H */
