Merge branch 'Mario/dpk_support' of gitlab.com:xonotic/darkplaces

[xonotic/darkplaces.git] / cdaudio.h

diff --git a/cdaudio.h b/cdaudio.h
index 3fed67fa5132167238aa84ebb5ba05f5ced6a691..09099190e1fa2c4cd0a7b70de94fc8818fcd3595 100644 (file)
--- a/cdaudio.h
+++ b/cdaudio.h
@@ -18,29 +18,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-typedef struct cl_cdstate_s
-{
-       qboolean Valid;
-       qboolean Playing;
-       qboolean PlayLooping;
-       unsigned char PlayTrack;
-}
-cl_cdstate_t;
-
-//extern cl_cdstate_t cd;
-
-extern qboolean cdValid;
-extern qboolean cdPlaying;
-extern qboolean cdPlayLooping;
-extern unsigned char cdPlayTrack;
+#include "qtypes.h"
+#include "cvar.h"
 
 extern cvar_t cdaudioinitialized;
 
 int CDAudio_Init(void);
-void CDAudio_Open(void);
-void CDAudio_Close(void);
-void CDAudio_Play(int track, qboolean looping);
-void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryreal, float startposition);
+void CDAudio_Play(int track, qbool looping);
 void CDAudio_Stop(void);
 void CDAudio_Pause(void);
 void CDAudio_Resume(void);
@@ -48,4 +32,3 @@ int CDAudio_Startup(void);
 void CDAudio_Shutdown(void);
 void CDAudio_Update(void);
 float CDAudio_GetPosition(void);
-void CDAudio_StartPlaylist(qboolean resume);