ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed first/last playable frame referencing.

Browse Source
This commit is contained in:
Eric Pouech 1999-12-25 22:54:54 +00:00 committed by Alexandre Julliard
parent f919cf3a41
commit b4b9303e07
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/cdrom.h
View File

@ -30,17 +30,21 @@ typedef struct {
#elif defined(__FreeBSD__) || defined(__NetBSD__) #elif defined(__FreeBSD__) || defined(__NetBSD__)
struct cd_sub_channel_info sc; struct cd_sub_channel_info sc;
#endif #endif
int cdaMode; /* those data reflect the cdaudio structure and
UINT16 nCurTrack; * don't change while playing
DWORD dwCurFrame; */
UINT16 nTracks; UINT16 nTracks;
UINT16 nFirstTrack; UINT16 nFirstTrack;
UINT16 nLastTrack; UINT16 nLastTrack;
DWORD dwTotalLen;
LPDWORD lpdwTrackLen; LPDWORD lpdwTrackLen;
LPDWORD lpdwTrackPos; LPDWORD lpdwTrackPos;
LPBYTE lpbTrackFlags; LPBYTE lpbTrackFlags;
DWORD dwFirstOffset; DWORD dwFirstFrame;
DWORD dwLastFrame;
/* those data change while playing */
int cdaMode;
UINT16 nCurTrack;
DWORD dwCurFrame;
} WINE_CDAUDIO; } WINE_CDAUDIO;
#define WINE_CDA_DONTKNOW 0x00 #define WINE_CDA_DONTKNOW 0x00

11
misc/cdrom.c
View File

@ -39,8 +39,8 @@ int CDAUDIO_Open(WINE_CDAUDIO* wcda)
wcda->cdaMode = WINE_CDA_OPEN; /* to force reading tracks info */ wcda->cdaMode = WINE_CDA_OPEN; /* to force reading tracks info */
wcda->nCurTrack = 0; wcda->nCurTrack = 0;
wcda->nTracks = 0; wcda->nTracks = 0;
wcda->dwTotalLen = 0; wcda->dwFirstFrame = 0;
wcda->dwFirstOffset = 0; wcda->dwLastFrame = 0;
wcda->lpdwTrackLen = NULL; wcda->lpdwTrackLen = NULL;
wcda->lpdwTrackPos = NULL; wcda->lpdwTrackPos = NULL;
wcda->lpbTrackFlags = NULL; wcda->lpbTrackFlags = NULL;
@ -187,7 +187,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
#endif #endif
if (i == 0) { if (i == 0) {
last_start = start; last_start = start;
wcda->dwFirstOffset = start; wcda->dwFirstFrame = start;
TRACE("dwFirstOffset=%u\n", start); TRACE("dwFirstOffset=%u\n", start);
} else { } else {
length = start - last_start; length = start - last_start;
@ -207,7 +207,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
#endif #endif
TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]); TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
} }
wcda->dwTotalLen = total_length; wcda->dwLastFrame = last_start;
TRACE("total_len=%u\n", total_length); TRACE("total_len=%u\n", total_length);
return TRUE; return TRUE;
#else #else
@ -425,6 +425,9 @@ int CDAUDIO_Pause(WINE_CDAUDIO* wcda, int pauseOn)
#endif #endif
} }
/**************************************************************************
* CDAUDIO_Seek [internal]
*/
int CDAUDIO_Seek(WINE_CDAUDIO* wcda, DWORD at) int CDAUDIO_Seek(WINE_CDAUDIO* wcda, DWORD at)
{ {
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)

4
msdos/int2f.c
View File

@ -620,7 +620,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
break; break;
case 8: /* Volume size */ case 8: /* Volume size */
PTR_AT(io_stru, 1, DWORD) = wcda.dwTotalLen; PTR_AT(io_stru, 1, DWORD) = wcda.dwLastFrame;
TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD)); TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD));
break; break;
@ -633,7 +633,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
case 10: /* audio disk info */ case 10: /* audio disk info */
io_stru[1] = wcda.nFirstTrack; /* starting track of the disc */ io_stru[1] = wcda.nFirstTrack; /* starting track of the disc */
io_stru[2] = wcda.nLastTrack; /* ending track */ io_stru[2] = wcda.nLastTrack; /* ending track */
MSCDEX_StoreMSF(wcda.dwTotalLen, io_stru + 3); MSCDEX_StoreMSF(wcda.dwLastFrame, io_stru + 3);
TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n", TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n",
io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD)); io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD));