X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cd_win.c;h=9a446cd3ae8e8d04dc5d7020e218a053c14958bc;hp=dee8ef63eb27950b1006df802575c2a28d70b312;hb=598fddaa9633afd444cb95d8e7eb74d9b05b899d;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2

diff --git a/cd_win.c b/cd_win.c
index dee8ef63..9a446cd3 100644
--- a/cd_win.c
+++ b/cd_win.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 
 #include "quakedef.h"
+#include "cdaudio.h"
 
 
 extern	HWND	mainwindow;
@@ -34,7 +35,7 @@ void CDAudio_SysEject(void)
 	DWORD	dwReturn;
 
 	if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD)NULL)))
-		Con_DPrintf("MCI_SET_DOOR_OPEN failed (%i)\n", dwReturn);
+		Con_Printf("MCI_SET_DOOR_OPEN failed (%i)\n", dwReturn);
 }
 
 
@@ -43,7 +44,7 @@ void CDAudio_SysCloseDoor(void)
 	DWORD	dwReturn;
 
 	if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD)NULL)))
-		Con_DPrintf("MCI_SET_DOOR_CLOSED failed (%i)\n", dwReturn);
+		Con_Printf("MCI_SET_DOOR_CLOSED failed (%i)\n", dwReturn);
 }
 
 int CDAudio_SysGetAudioDiskInfo(void)
@@ -55,12 +56,12 @@ int CDAudio_SysGetAudioDiskInfo(void)
 	dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
 	if (dwReturn)
 	{
-		Con_DPrint("CDAudio: drive ready test - get status failed\n");
+		Con_Print("CDAudio_SysGetAudioDiskInfo: drive ready test - get status failed\n");
 		return -1;
 	}
 	if (!mciStatusParms.dwReturn)
 	{
-		Con_DPrint("CDAudio: drive not ready\n");
+		Con_Print("CDAudio_SysGetAudioDiskInfo: drive not ready\n");
 		return -1;
 	}
 
@@ -68,12 +69,12 @@ int CDAudio_SysGetAudioDiskInfo(void)
 	dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
 	if (dwReturn)
 	{
-		Con_DPrint("CDAudio: get tracks - status failed\n");
+		Con_Print("CDAudio_SysGetAudioDiskInfo: get tracks - status failed\n");
 		return -1;
 	}
 	if (mciStatusParms.dwReturn < 1)
 	{
-		Con_DPrint("CDAudio: no music tracks\n");
+		Con_Print("CDAudio_SysGetAudioDiskInfo: no music tracks\n");
 		return -1;
 	}
 
@@ -81,6 +82,19 @@ int CDAudio_SysGetAudioDiskInfo(void)
 }
 
 
+float CDAudio_SysGetVolume (void)
+{
+	// IMPLEMENTME
+	return -1.0f;
+}
+
+
+void CDAudio_SysSetVolume (float volume)
+{
+	// IMPLEMENTME
+}
+
+
 int CDAudio_SysPlay (qbyte track)
 {
 	DWORD				dwReturn;
@@ -93,12 +107,12 @@ int CDAudio_SysPlay (qbyte track)
 	dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
 	if (dwReturn)
 	{
-		Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn);
+		Con_Printf("CDAudio_SysPlay: MCI_STATUS failed (%i)\n", dwReturn);
 		return -1;
 	}
 	if (mciStatusParms.dwReturn != MCI_CDA_TRACK_AUDIO)
 	{
-		Con_Printf("CDAudio: track %i is not audio\n", track);
+		Con_Printf("CDAudio_SysPlay: track %i is not audio\n", track);
 		return -1;
 	}
 
@@ -111,7 +125,7 @@ int CDAudio_SysPlay (qbyte track)
 	dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
 	if (dwReturn)
 	{
-		Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn);
+		Con_Printf("CDAudio_SysPlay: MCI_STATUS failed (%i)\n", dwReturn);
 		return -1;
 	}
 
@@ -121,7 +135,7 @@ int CDAudio_SysPlay (qbyte track)
 	dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD)(LPVOID) &mciPlayParms);
 	if (dwReturn)
 	{
-		Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
+		Con_Printf("CDAudio_SysPlay: MCI_PLAY failed (%i)\n", dwReturn);
 		return -1;
 	}
 
@@ -135,7 +149,7 @@ int CDAudio_SysStop (void)
 
 	if ((dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD)NULL)))
 	{
-		Con_DPrintf("MCI_STOP failed (%i)\n", dwReturn);
+		Con_Printf("MCI_STOP failed (%i)\n", dwReturn);
 		return -1;
 	}
 	return 0;
@@ -149,7 +163,7 @@ int CDAudio_SysPause (void)
 	mciGenericParms.dwCallback = (DWORD)mainwindow;
 	if ((dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD)(LPVOID) &mciGenericParms)))
 	{
-		Con_DPrintf("MCI_PAUSE failed (%i)\n", dwReturn);
+		Con_Printf("MCI_PAUSE failed (%i)\n", dwReturn);
 		return -1;
 	}
 	return 0;
@@ -167,7 +181,7 @@ int CDAudio_SysResume (void)
 	dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD)(LPVOID) &mciPlayParms);
 	if (dwReturn)
 	{
-		Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
+		Con_Printf("CDAudio_SysResume: MCI_PLAY failed (%i)\n", dwReturn);
 		return -1;
 	}
 	return 0;	
@@ -194,13 +208,13 @@ LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			break;
 
 		case MCI_NOTIFY_FAILURE:
-			Con_DPrint("MCI_NOTIFY_FAILURE\n");
+			Con_Print("MCI_NOTIFY_FAILURE\n");
 			CDAudio_Stop ();
 			cdValid = false;
 			break;
 
 		default:
-			Con_DPrintf("Unexpected MM_MCINOTIFY type (%i)\n", wParam);
+			Con_Printf("Unexpected MM_MCINOTIFY type (%i)\n", wParam);
 			return 1;
 	}
 
@@ -226,7 +240,7 @@ int CDAudio_SysStartup (void)
 	mciOpenParms.lpstrDeviceType = "cdaudio";
 	if ((dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD) (LPVOID) &mciOpenParms)))
 	{
-		Con_Printf("CDAudio_Init: MCI_OPEN failed (%i)\n", dwReturn);
+		Con_Printf("CDAudio_SysStartup: MCI_OPEN failed (%i)\n", dwReturn);
 		return -1;
 	}
 	wDeviceID = mciOpenParms.wDeviceID;
@@ -235,7 +249,7 @@ int CDAudio_SysStartup (void)
 	mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF;
 	if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD)(LPVOID) &mciSetParms)))
 	{
-		Con_Printf("MCI_SET_TIME_FORMAT failed (%i)\n", dwReturn);
+		Con_Printf("CDAudio_SysStartup: MCI_SET_TIME_FORMAT failed (%i)\n", dwReturn);
 		mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD)NULL);
 		return -1;
 	}
@@ -246,5 +260,5 @@ int CDAudio_SysStartup (void)
 void CDAudio_SysShutdown (void)
 {
 	if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD)NULL))
-		Con_DPrint("CDAudio_Shutdown: MCI_CLOSE failed\n");
+		Con_Print("CDAudio_SysShutdown: MCI_CLOSE failed\n");
 }