Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
b5896d48
Commit
b5896d48
authored
Dec 08, 2004
by
Rocky Bernstein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forgot that the lsn internal structure is 0-origin.
Better really would be to remove lsn altogether from cdda_data_t.
parent
ca1b3a2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
modules/access/cdda/access.c
modules/access/cdda/access.c
+4
-2
modules/access/cdda/info.c
modules/access/cdda/info.c
+9
-7
No files found.
modules/access/cdda/access.c
View file @
b5896d48
...
...
@@ -579,9 +579,11 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
for
(
i
=
0
;
i
<
p_cdda
->
i_titles
;
i
++
)
{
if
(
p_cdda
->
p_title
[
i
]
)
if
(
p_cdda
->
p_title
[
i
]
)
{
(
*
ppp_title
)[
i
]
=
vlc_input_title_Duplicate
(
p_cdda
->
p_title
[
i
]
);
vlc_input_title_Duplicate
(
p_cdda
->
p_title
[
i
]
);
}
}
break
;
}
...
...
modules/access/cdda/info.c
View file @
b5896d48
...
...
@@ -892,8 +892,9 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
p_cdda
->
i_titles
=
1
;
p_access
->
info
.
i_size
=
(
p_cdda
->
lsn
[
p_cdda
->
i_track
]
-
p_cdda
->
lsn
[
i_first_track
+
1
])
*
(
int64_t
)
CDIO_CD_FRAMESIZE_RAW
;
(
p_cdda
->
lsn
[
p_cdda
->
i_track
-
1
]
-
p_cdda
->
lsn
[
i_first_track
])
*
(
int64_t
)
CDIO_CD_FRAMESIZE_RAW
;
p_access
->
info
.
i_update
|=
INPUT_UPDATE_TITLE
|
INPUT_UPDATE_SIZE
;
p_item
->
input
.
i_duration
=
(
p_cdda
->
lsn
[
p_cdda
->
i_track
]
-
p_cdda
->
lsn
[
i_first_track
+
1
])
/
CDIO_CD_FRAMES_PER_SEC
;
...
...
@@ -921,12 +922,13 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
i_track
,
VLC_TRUE
);
}
p_cdda
->
i_titles
=
p_cdda
->
i_tracks
;
/* should be +1 */
p_access
->
info
.
i_size
=
(
p_cdda
->
lsn
[
i_first_track
+
p_cdda
->
i_tracks
]
-
p_cdda
->
lsn
[
i_first_track
])
*
(
int64_t
)
CDIO_CD_FRAMESIZE_RAW
;
p_access
->
info
.
i_size
=
(
p_cdda
->
lsn
[
p_cdda
->
i_tracks
]
-
p_cdda
->
lsn
[
0
])
*
(
int64_t
)
CDIO_CD_FRAMESIZE_RAW
;
p_access
->
info
.
i_update
|=
INPUT_UPDATE_TITLE
|
INPUT_UPDATE_SIZE
;
p_item
->
input
.
i_duration
=
(
p_cdda
->
lsn
[
i_first_track
+
p_cdda
->
i_tracks
]
-
p_cdda
->
lsn
[
i_first_track
])
/
CDIO_CD_FRAMES_PER_SEC
;
(
p_cdda
->
lsn
[
p_cdda
->
i_tracks
]
-
p_cdda
->
lsn
[
0
])
/
CDIO_CD_FRAMES_PER_SEC
;
}
if
(
b_play
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment