Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jason Beetham
wine
Commits
b4b9303e
Commit
b4b9303e
authored
25 years ago
by
Eric Pouech
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed first/last playable frame referencing.
parent
f919cf3a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/cdrom.h
+9
-5
9 additions, 5 deletions
include/cdrom.h
misc/cdrom.c
+9
-6
9 additions, 6 deletions
misc/cdrom.c
msdos/int2f.c
+2
-2
2 additions, 2 deletions
msdos/int2f.c
with
20 additions
and
13 deletions
include/cdrom.h
+
9
−
5
View file @
b4b9303e
...
...
@@ -30,17 +30,21 @@ typedef struct {
#elif defined(__FreeBSD__) || defined(__NetBSD__)
struct
cd_sub_channel_info
sc
;
#endif
int
cdaMode
;
UINT16
nCurTrack
;
DWORD
dwCurFrame
;
/* those data reflect the cdaudio structure and
* don't change while playing
*/
UINT16
nTracks
;
UINT16
nFirstTrack
;
UINT16
nLastTrack
;
DWORD
dwTotalLen
;
LPDWORD
lpdwTrackLen
;
LPDWORD
lpdwTrackPos
;
LPBYTE
lpbTrackFlags
;
DWORD
dwFirstOffset
;
DWORD
dwFirstFrame
;
DWORD
dwLastFrame
;
/* those data change while playing */
int
cdaMode
;
UINT16
nCurTrack
;
DWORD
dwCurFrame
;
}
WINE_CDAUDIO
;
#define WINE_CDA_DONTKNOW 0x00
...
...
This diff is collapsed.
Click to expand it.
misc/cdrom.c
+
9
−
6
View file @
b4b9303e
...
...
@@ -39,8 +39,8 @@ int CDAUDIO_Open(WINE_CDAUDIO* wcda)
wcda
->
cdaMode
=
WINE_CDA_OPEN
;
/* to force reading tracks info */
wcda
->
nCurTrack
=
0
;
wcda
->
nTracks
=
0
;
wcda
->
dw
TotalLen
=
0
;
wcda
->
dw
FirstOffset
=
0
;
wcda
->
dw
FirstFrame
=
0
;
wcda
->
dw
LastFrame
=
0
;
wcda
->
lpdwTrackLen
=
NULL
;
wcda
->
lpdwTrackPos
=
NULL
;
wcda
->
lpbTrackFlags
=
NULL
;
...
...
@@ -152,7 +152,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
#endif
else
#ifdef linux
entry
.
cdte_track
=
i
+
1
;
entry
.
cdte_track
=
i
+
1
;
#else
entry
.
starting_track
=
i
+
1
;
#endif
...
...
@@ -187,7 +187,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
#endif
if
(
i
==
0
)
{
last_start
=
start
;
wcda
->
dwFirst
Offset
=
start
;
wcda
->
dwFirst
Frame
=
start
;
TRACE
(
"dwFirstOffset=%u
\n
"
,
start
);
}
else
{
length
=
start
-
last_start
;
...
...
@@ -207,7 +207,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
#endif
TRACE
(
"track #%u flags=%02x
\n
"
,
i
+
1
,
wcda
->
lpbTrackFlags
[
i
]);
}
wcda
->
dw
TotalLen
=
total_length
;
wcda
->
dw
LastFrame
=
last_start
;
TRACE
(
"total_len=%u
\n
"
,
total_length
);
return
TRUE
;
#else
...
...
@@ -425,6 +425,9 @@ int CDAUDIO_Pause(WINE_CDAUDIO* wcda, int pauseOn)
#endif
}
/**************************************************************************
* CDAUDIO_Seek [internal]
*/
int
CDAUDIO_Seek
(
WINE_CDAUDIO
*
wcda
,
DWORD
at
)
{
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
...
...
@@ -435,7 +438,7 @@ int CDAUDIO_Seek(WINE_CDAUDIO* wcda, DWORD at)
msf
.
second
=
(
at
%
CDFRAMES_PERMIN
)
/
CDFRAMES_PERSEC
;
msf
.
frame
=
at
%
CDFRAMES_PERSEC
;
ret
=
ioctl
(
wcda
->
unixdev
,
CDROMSEEK
,
&
msf
);
ret
=
ioctl
(
wcda
->
unixdev
,
CDROMSEEK
,
&
msf
);
#else
/* FIXME: the current end for play is lost
* use end of CD ROM instead
...
...
This diff is collapsed.
Click to expand it.
msdos/int2f.c
+
2
−
2
View file @
b4b9303e
...
...
@@ -620,7 +620,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
break
;
case
8
:
/* Volume size */
PTR_AT
(
io_stru
,
1
,
DWORD
)
=
wcda
.
dw
TotalLen
;
PTR_AT
(
io_stru
,
1
,
DWORD
)
=
wcda
.
dw
LastFrame
;
TRACE
(
" ----> VOLUME SIZE <%ld>
\n
"
,
PTR_AT
(
io_stru
,
1
,
DWORD
));
break
;
...
...
@@ -633,7 +633,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
case
10
:
/* audio disk info */
io_stru
[
1
]
=
wcda
.
nFirstTrack
;
/* starting track of the disc */
io_stru
[
2
]
=
wcda
.
nLastTrack
;
/* ending track */
MSCDEX_StoreMSF
(
wcda
.
dw
TotalLen
,
io_stru
+
3
);
MSCDEX_StoreMSF
(
wcda
.
dw
LastFrame
,
io_stru
+
3
);
TRACE
(
" ----> AUDIO DISK INFO <%d-%d/%08lx>
\n
"
,
io_stru
[
1
],
io_stru
[
2
],
PTR_AT
(
io_stru
,
3
,
DWORD
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment