]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Fix snd_xmp.c compiling in VS2019 - can't have empty structs.
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 29 Jun 2020 00:07:39 +0000 (00:07 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 29 Jun 2020 00:07:39 +0000 (00:07 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12747 d7cf8633-e32d-0410-b094-e92efae38249

snd_xmp.c

index f19f78b5bb167d82ea24dacaa8fb229ef27d5421..5b4e3945966448f5fae94d441e6cf57b80750844 100644 (file)
--- a/snd_xmp.c
+++ b/snd_xmp.c
@@ -143,11 +143,11 @@ static const char **qxmp_version;
 static const unsigned int *qxmp_vercode;
 
 struct xmp_channel {
-//     int pan;                        /* Channel pan (0x80 is center) */
-//     int vol;                        /* Channel volume */
-//#define XMP_CHANNEL_SYNTH    (1 << 0)  /* Channel is synthesized */
-//#define XMP_CHANNEL_MUTE     (1 << 1)  /* Channel is muted */
-//     int flg;                        /* Channel flags */
+       int pan;                        /* Channel pan (0x80 is center) */
+       int vol;                        /* Channel volume */
+#define XMP_CHANNEL_SYNTH      (1 << 0)  /* Channel is synthesized */
+#define XMP_CHANNEL_MUTE       (1 << 1)  /* Channel is muted */
+       int flg;                        /* Channel flags */
 };
 
 //struct xmp_sequence {
@@ -191,7 +191,8 @@ struct xmp_module_info {
        struct xmp_sequence *seq_data;  /* Pointer to sequence data */
 };
 
-struct xmp_frame_info {                        /* Current frame information */
+struct xmp_frame_info
+// {                   /* Current frame information */
 //     int pos;                        /* Current position */
 //     int pattern;                    /* Current pattern */
 //     int row;                        /* Current row in pattern */
@@ -223,7 +224,8 @@ struct xmp_frame_info {                     /* Current frame information */
 //             unsigned char reserved; /* Reserved */
 //             struct xmp_event event; /* Current track event */
 //     } channel_info[XMP_MAX_CHANNELS];
-};
+//}
+;
 
 // Functions exported from libxmp
 static xmp_context (*qxmp_create_context)  (void);