Skip to content

W
wine-winehq
Commit b02f65d5 authored by Geoff Clare's avatar Geoff Clare Committed by Alexandre Julliard
Browse files
Options

Several internal functions won't compile when the conditional

#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) comes out false. I moved the conditionals around so that the file would at least compile. Not sure if it does the right thing on non-linux/FreeBSD/NetBSD systems.
parent bf310b8b
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 20 deletions
multimedia/mcicda.c
View file @ b02f65d5
...@@ -81,6 +81,7 @@ static WINE_CDAUDIO CDADev[MAX_CDAUDIODRV]; ...@@ -81,6 +81,7 @@ static WINE_CDAUDIO CDADev[MAX_CDAUDIODRV];
/************************************************************************** /**************************************************************************
* CDAUDIO_mciGetOpenDrv [internal] * CDAUDIO_mciGetOpenDrv [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static WINE_CDAUDIO* CDAUDIO_mciGetOpenDrv(UINT16 wDevID) static WINE_CDAUDIO* CDAUDIO_mciGetOpenDrv(UINT16 wDevID)
{ {
if (wDevID >= MAX_CDAUDIODRV || CDADev[wDevID].nUseCount == 0 || if (wDevID >= MAX_CDAUDIODRV || CDADev[wDevID].nUseCount == 0 ||
...@@ -90,13 +91,14 @@ static WINE_CDAUDIO* CDAUDIO_mciGetOpenDrv(UINT16 wDevID) ...@@ -90,13 +91,14 @@ static WINE_CDAUDIO* CDAUDIO_mciGetOpenDrv(UINT16 wDevID)
} }
return &CDADev[wDevID]; return &CDADev[wDevID];
} }
#endif
/************************************************************************** /**************************************************************************
* CDAUDIO_GetNumberOfTracks [internal] * CDAUDIO_GetNumberOfTracks [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda) static UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda)
{ {
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
#ifdef linux #ifdef linux
struct cdrom_tochdr hdr; struct cdrom_tochdr hdr;
#else #else
...@@ -119,17 +121,15 @@ static UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda) ...@@ -119,17 +121,15 @@ static UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda)
#endif #endif
} }
return wcda->nTracks; return wcda->nTracks;
#else
return (WORD)-1;
#endif
} }
#endif
/************************************************************************** /**************************************************************************
* CDAUDIO_GetTracksInfo [internal] * CDAUDIO_GetTracksInfo [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda) static BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
{ {
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
int i, length; int i, length;
int start, last_start = 0; int start, last_start = 0;
int total_length = 0; int total_length = 0;
...@@ -226,19 +226,17 @@ static BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda) ...@@ -226,19 +226,17 @@ static BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
wcda->dwTotalLen = total_length; wcda->dwTotalLen = total_length;
TRACE(cdaudio,"total_len=%u\n", total_length); TRACE(cdaudio,"total_len=%u\n", total_length);
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
#endif
/************************************************************************** /**************************************************************************
>>>>>>> 1.9 >>>>>>> 1.9
* CDAUDIO_CalcFrame [internal] * CDAUDIO_CalcFrame [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static DWORD CDAUDIO_CalcFrame(WINE_CDAUDIO* wcda, DWORD dwTime) static DWORD CDAUDIO_CalcFrame(WINE_CDAUDIO* wcda, DWORD dwTime)
{ {
DWORD dwFrame = 0; DWORD dwFrame = 0;
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
UINT16 wTrack; UINT16 wTrack;
TRACE(cdaudio,"(%p, %08lX, %lu);\n", wcda, wcda->dwTimeFormat, dwTime); TRACE(cdaudio,"(%p, %08lX, %lu);\n", wcda, wcda->dwTimeFormat, dwTime);
...@@ -270,16 +268,16 @@ static DWORD CDAUDIO_CalcFrame(WINE_CDAUDIO* wcda, DWORD dwTime) ...@@ -270,16 +268,16 @@ static DWORD CDAUDIO_CalcFrame(WINE_CDAUDIO* wcda, DWORD dwTime)
dwFrame += MCI_TMSF_FRAME(dwTime); dwFrame += MCI_TMSF_FRAME(dwTime);
break; break;
} }
#endif
return dwFrame; return dwFrame;
} }
#endif
/************************************************************************** /**************************************************************************
* CDAUDIO_GetCDStatus [internal] * CDAUDIO_GetCDStatus [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda) static BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
{ {
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
int oldmode = wcda->cdMode; int oldmode = wcda->cdMode;
#ifdef linux #ifdef linux
wcda->sc.cdsc_format = CDROM_MSF; wcda->sc.cdsc_format = CDROM_MSF;
...@@ -383,18 +381,16 @@ static BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda) ...@@ -383,18 +381,16 @@ static BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
} }
} }
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
#endif
/************************************************************************** /**************************************************************************
* CDAUDIO_CalcTime [internal] * CDAUDIO_CalcTime [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static DWORD CDAUDIO_CalcTime(WINE_CDAUDIO* wcda, DWORD dwFrame) static DWORD CDAUDIO_CalcTime(WINE_CDAUDIO* wcda, DWORD dwFrame)
{ {
DWORD dwTime = 0; DWORD dwTime = 0;
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
UINT16 wTrack; UINT16 wTrack;
UINT16 wMinutes; UINT16 wMinutes;
UINT16 wSeconds; UINT16 wSeconds;
...@@ -430,9 +426,9 @@ static DWORD CDAUDIO_CalcTime(WINE_CDAUDIO* wcda, DWORD dwFrame) ...@@ -430,9 +426,9 @@ static DWORD CDAUDIO_CalcTime(WINE_CDAUDIO* wcda, DWORD dwFrame)
TRACE(cdaudio, "%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames); TRACE(cdaudio, "%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames);
break; break;
} }
#endif
return dwTime; return dwTime;
} }
#endif
static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms); static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms);
static DWORD CDAUDIO_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); static DWORD CDAUDIO_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms);
...@@ -926,9 +922,9 @@ static DWORD CDAUDIO_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS ...@@ -926,9 +922,9 @@ static DWORD CDAUDIO_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS
/************************************************************************** /**************************************************************************
* CDAUDIO_mciSeek [internal] * CDAUDIO_mciSeek [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
{ {
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
DWORD dwRet; DWORD dwRet;
MCI_PLAY_PARMS playParms; MCI_PLAY_PARMS playParms;
...@@ -966,14 +962,13 @@ static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpPa ...@@ -966,14 +962,13 @@ static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpPa
wcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); wcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
} }
return dwRet; return dwRet;
#else
return MCIERR_HARDWARE;
#endif
} }
#endif
/************************************************************************** /**************************************************************************
* CDAUDIO_mciSetDoor [internal] * CDAUDIO_mciSetDoor [internal]
*/ */
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
static DWORD CDAUDIO_mciSetDoor(UINT16 wDevID, int open) static DWORD CDAUDIO_mciSetDoor(UINT16 wDevID, int open)
{ {
WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID);
...@@ -1004,6 +999,7 @@ static DWORD CDAUDIO_mciSetDoor(UINT16 wDevID, int open) ...@@ -1004,6 +999,7 @@ static DWORD CDAUDIO_mciSetDoor(UINT16 wDevID, int open)
wcda->nTracks = 0; wcda->nTracks = 0;
return 0; return 0;
} }
#endif
/************************************************************************** /**************************************************************************
* CDAUDIO_mciSet [internal] * CDAUDIO_mciSet [internal]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment