ericwa / Quakespasm

unofficial mirror of QuakeSpasm SVN with branches for stuff I'm working on
http://quakespasm.sourceforge.net
62 stars 69 forks source link

Opus music does not autoplay #9

Closed magicmyth closed 6 years ago

magicmyth commented 6 years ago

Compiled for SDL2 from this git repo with Opus and Flac support enabled on Linux. If I have flac versions of the track in the music folder they will automatically play on their intended levels (e.g. opening demo plays track02) but the opus versions do not. If I view the console it says "Couldn't find a cdrip for track 2". However if I enter into the terminal music track02 it will play just fine. There is no difference on how the tracks are named between the flac and opus versions (e.g track02.flac, track02.opus).

sezero commented 6 years ago

I will apply the following fix patch to our official sourceforge svn repo soon:

Index: Quake/bgmusic.c
===================================================================
diff --git a/Quake/bgmusic.c b/Quake/bgmusic.c
--- a/Quake/bgmusic.c   (revision 1578)
+++ b/Quake/bgmusic.c   (working copy)
@@ -3,7 +3,7 @@
  * Handles streaming music as raw sound samples and runs the midi driver
  *
  * Copyright (C) 1999-2005 Id Software, Inc.
- * Copyright (C) 2010-2012 O.Sezer <sezero@users.sourceforge.net>
+ * Copyright (C) 2010-2018 O.Sezer <sezero@users.sourceforge.net>
  *
  * 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
@@ -69,7 +69,7 @@
 static music_handler_t *music_handlers = NULL;

 #define ANY_CODECTYPE  0xFFFFFFFF
-#define CDRIP_TYPES    (CODECTYPE_VORBIS | CODECTYPE_MP3 | CODECTYPE_FLAC | CODECTYPE_WAV)
+#define CDRIP_TYPES    (CODECTYPE_VORBIS | CODECTYPE_MP3 | CODECTYPE_FLAC | CODECTYPE_WAV | CODECTYPE_OPUS)
 #define CDRIPTYPE(x)   (((x) & CDRIP_TYPES) != 0)

 static snd_stream_t *bgmstream = NULL;
magicmyth commented 6 years ago

Yep that did the trick thanks!