From 4dbd07fb9aa8f08320c77ac433d5f4869eeb7a86 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Fri, 27 Apr 2018 17:30:38 +0000
Subject: [PATCH] bgmusic.c: mark *.opus files as cdrip types.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1579 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Linux/sgml/Quakespasm.sgml | 1 +
 Quake/bgmusic.c            | 4 ++--
 Quakespasm.html            | 5 +++--
 Quakespasm.txt             | 7 +++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Linux/sgml/Quakespasm.sgml b/Linux/sgml/Quakespasm.sgml
index f8d29d1e..b534f3f4 100644
--- a/Linux/sgml/Quakespasm.sgml
+++ b/Linux/sgml/Quakespasm.sgml
@@ -161,6 +161,7 @@ these patched libSDL binaries may help.
 <item> Fixed buttons crushing players in 64-bit builds.
 <item> Change controller movement to use cubic easing by default; added "joy_exponent_move" cvar.
 <item> config.cfg is no longer written in case of a Sys_Error.
+<item> Fixed Opus encoded cd tracks not being recognized as ripped tracks.
 <item> Update the third-party libraries. Other fixes/cleanups.
 </itemize>
 </p>
diff --git a/Quake/bgmusic.c b/Quake/bgmusic.c
index 33344961..65df3ca9 100644
--- a/Quake/bgmusic.c
+++ b/Quake/bgmusic.c
@@ -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 wanted_handlers[] =
 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;
diff --git a/Quakespasm.html b/Quakespasm.html
index 777a4d01..30d2743e 100644
--- a/Quakespasm.html
+++ b/Quakespasm.html
@@ -253,8 +253,9 @@ these patched libSDL binaries may help.
 <LI> Fixed a fog regression which was introduced in 0.93.0.</LI>
 <LI> Fixed a crash (buffer overflow) with invalid vis data.</LI>
 <LI> Fixed buttons crushing players in 64-bit builds.</LI>
-<LI> Change controller movement to use cubic easing by default; added "joy_exponent_move" cvar.</LI> 
-<LI> config.cfg is no longer written in case of a Sys_Error.</LI> 
+<LI> Change controller movement to use cubic easing by default; added "joy_exponent_move" cvar.</LI>
+<LI> config.cfg is no longer written in case of a Sys_Error.</LI>
+<LI> Fixed Opus encoded cd tracks not being recognized as ripped tracks.</LI>
 <LI> Update the third-party libraries. Other fixes/cleanups.</LI>
 </UL>
 </P>
diff --git a/Quakespasm.txt b/Quakespasm.txt
index a2e8031e..65fec3e0 100644
--- a/Quakespasm.txt
+++ b/Quakespasm.txt
@@ -291,11 +291,18 @@
   6.1.  Changes in 0.93.1
 
   o  Fixed a fog regression which was introduced in 0.93.0.
+
   o  Fixed a crash (buffer overflow) with invalid vis data.
+
   o  Fixed buttons crushing players in 64-bit builds.
+
   o  Change controller movement to use cubic easing by default; added
     "joy_exponent_move" cvar.
+
   o  config.cfg is no longer written in case of a Sys_Error.
+
+  o  Fixed Opus encoded cd tracks not being recognized as ripped tracks.
+
   o  Update the third-party libraries. Other fixes/cleanups.