physics: fix and refactor unsticking

[xonotic/darkplaces.git] / cdaudio.h

diff --git a/cdaudio.h b/cdaudio.h
index 5eac430a89a940b9ad97b0e6d85d3486a20e6e8a..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,19 +32,3 @@ int CDAudio_Startup(void);
 void CDAudio_Shutdown(void);
 void CDAudio_Update(void);
 float CDAudio_GetPosition(void);
-void CDAudio_StartPlaylist(qboolean resume);
-
-// Prototypes of the system dependent functions
-void CDAudio_SysEject (void);
-void CDAudio_SysCloseDoor (void);
-int CDAudio_SysGetAudioDiskInfo (void);
-float CDAudio_SysGetVolume (void);
-void CDAudio_SysSetVolume (float volume);
-int CDAudio_SysPlay (int track);
-int CDAudio_SysStop (void);
-int CDAudio_SysPause (void);
-int CDAudio_SysResume (void);
-int CDAudio_SysUpdate (void);
-void CDAudio_SysInit (void);
-int CDAudio_SysStartup (void);
-void CDAudio_SysShutdown (void);