Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
9474462d
Commit
9474462d
authored
Mar 07, 2004
by
Rocky Bernstein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
printf lint changes for cygwin.
parent
c05d3353
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
14 deletions
+23
-14
modules/access/vcdx/access.c
modules/access/vcdx/access.c
+23
-14
No files found.
modules/access/vcdx/access.c
View file @
9474462d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* to go here.
* to go here.
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000, 2003, 2004 VideoLAN
* Copyright (C) 2000, 2003, 2004 VideoLAN
* $Id
: access.c,v 1.21 2004/02/22 10:30:41 rocky Exp
$
* $Id$
*
*
* Authors: Rocky Bernstein <rocky@panix.com>
* Authors: Rocky Bernstein <rocky@panix.com>
* Johan Bilien <jobi@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
...
@@ -159,7 +159,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
...
@@ -159,7 +159,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
i_read
=
0
;
i_read
=
0
;
dbg_print
(
(
INPUT_DBG_CALL
),
"lsn: %u"
,
p_vcd
->
cur_lsn
);
dbg_print
(
(
INPUT_DBG_CALL
),
"lsn: %lu"
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
);
/* Compute the number of blocks we have to read */
/* Compute the number of blocks we have to read */
...
@@ -173,7 +174,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
...
@@ -173,7 +174,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
/* We've run off of the end of this entry. Do we continue or stop? */
/* We've run off of the end of this entry. Do we continue or stop? */
dbg_print
(
(
INPUT_DBG_LSN
|
INPUT_DBG_PBC
),
dbg_print
(
(
INPUT_DBG_LSN
|
INPUT_DBG_PBC
),
"end reached, cur: %u"
,
p_vcd
->
cur_lsn
);
"end reached, cur: %lu"
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
);
read_status
=
vcdplayer_pbc_is_on
(
p_vcd
)
read_status
=
vcdplayer_pbc_is_on
(
p_vcd
)
?
vcdplayer_pbc_nav
(
p_input
)
?
vcdplayer_pbc_nav
(
p_input
)
...
@@ -228,7 +230,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
...
@@ -228,7 +230,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
p_vcd
->
cur_lsn
,
p_vcd
->
cur_lsn
,
p_buffer
+
(
i_index
*
M2F2_SECTOR_SIZE
)
)
<
0
)
p_buffer
+
(
i_index
*
M2F2_SECTOR_SIZE
)
)
<
0
)
{
{
LOG_ERR
(
"could not read sector %d"
,
p_vcd
->
cur_lsn
);
LOG_ERR
(
"could not read sector %lu"
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
);
return
-
1
;
return
-
1
;
}
}
...
@@ -249,8 +252,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
...
@@ -249,8 +252,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
p_vcd
->
cur_lsn
>=
p_vcd
->
p_entries
[
i_entry
+
1
]
)
p_vcd
->
cur_lsn
>=
p_vcd
->
p_entries
[
i_entry
+
1
]
)
{
{
dbg_print
(
INPUT_DBG_PBC
,
dbg_print
(
INPUT_DBG_PBC
,
"new entry, i_entry %d, sector %
d, es %d
"
,
"new entry, i_entry %d, sector %
lu, es %lu
"
,
i_entry
,
p_vcd
->
cur_lsn
,
i_entry
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
,
p_vcd
->
p_entries
[
i_entry
]
);
p_vcd
->
p_entries
[
i_entry
]
);
p_vcd
->
play_item
.
num
=
p_vcd
->
play_item
.
num
=
++
p_input
->
stream
.
p_selected_area
->
i_part
;
++
p_input
->
stream
.
p_selected_area
->
i_part
;
...
@@ -269,7 +272,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
...
@@ -269,7 +272,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
if
(
VCDReadSector
(
VLC_OBJECT
(
p_input
),
p_vcd
->
vcd
,
if
(
VCDReadSector
(
VLC_OBJECT
(
p_input
),
p_vcd
->
vcd
,
p_vcd
->
cur_lsn
,
p_last_sector
)
<
0
)
p_vcd
->
cur_lsn
,
p_last_sector
)
<
0
)
{
{
LOG_ERR
(
"could not read sector %d"
,
p_vcd
->
cur_lsn
);
LOG_ERR
(
"could not read sector %lu"
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
);
return
-
1
;
return
-
1
;
}
}
...
@@ -416,8 +420,9 @@ VCDSeek( input_thread_t * p_input, off_t i_off )
...
@@ -416,8 +420,9 @@ VCDSeek( input_thread_t * p_input, off_t i_off )
p_input
->
stream
.
p_selected_area
->
i_tell
=
i_off
;
p_input
->
stream
.
p_selected_area
->
i_tell
=
i_off
;
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_EXT
|
INPUT_DBG_SEEK
),
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_EXT
|
INPUT_DBG_SEEK
),
"orig %d, cur: %d, offset: %lld, start: %lld, entry %d"
,
"orig %lu, cur: %lu, offset: %lld, start: %lld, entry %d"
,
p_vcd
->
origin_lsn
,
p_vcd
->
cur_lsn
,
i_off
,
(
long
unsigned
int
)
p_vcd
->
origin_lsn
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
,
i_off
,
p_input
->
stream
.
p_selected_area
->
i_start
,
i_entry
);
p_input
->
stream
.
p_selected_area
->
i_start
,
i_entry
);
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
...
@@ -568,9 +573,10 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid )
...
@@ -568,9 +573,10 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid )
p_vcd
->
play_item
=
itemid
;
p_vcd
->
play_item
=
itemid
;
dbg_print
(
(
INPUT_DBG_CALL
),
dbg_print
(
(
INPUT_DBG_CALL
),
"i_start %lld, i_size: %lld, i_tell: %lld, lsn %
d
"
,
"i_start %lld, i_size: %lld, i_tell: %lld, lsn %
lu
"
,
p_area
->
i_start
,
p_area
->
i_size
,
p_area
->
i_start
,
p_area
->
i_size
,
p_area
->
i_tell
,
p_vcd
->
cur_lsn
);
p_area
->
i_tell
,
(
long
unsigned
int
)
p_vcd
->
cur_lsn
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -918,8 +924,10 @@ VCDSetOrigin( input_thread_t *p_input, lsn_t origin_lsn,
...
@@ -918,8 +924,10 @@ VCDSetOrigin( input_thread_t *p_input, lsn_t origin_lsn,
p_vcd
->
play_item
.
type
=
VCDINFO_ITEM_TYPE_ENTRY
;
p_vcd
->
play_item
.
type
=
VCDINFO_ITEM_TYPE_ENTRY
;
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_LSN
),
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_LSN
),
"origin: %d, cur_lsn: %d, end_lsn: %d, entry: %d, track: %d"
,
"origin: %lu, cur_lsn: %lu, end_lsn: %lu, entry: %d, track: %d"
,
origin_lsn
,
cur_lsn
,
end_lsn
,
cur_entry
,
cur_track
);
(
long
unsigned
int
)
origin_lsn
,
(
long
unsigned
int
)
cur_lsn
,
(
long
unsigned
int
)
end_lsn
,
cur_entry
,
cur_track
);
p_input
->
stream
.
p_selected_area
->
i_tell
=
p_input
->
stream
.
p_selected_area
->
i_tell
=
(
off_t
)
(
p_vcd
->
cur_lsn
-
p_vcd
->
origin_lsn
)
*
(
off_t
)
M2F2_SECTOR_SIZE
;
(
off_t
)
(
p_vcd
->
cur_lsn
-
p_vcd
->
origin_lsn
)
*
(
off_t
)
M2F2_SECTOR_SIZE
;
...
@@ -971,7 +979,8 @@ VCDReadSector( vlc_object_t *p_this, const vcdinfo_obj_t *p_vcd,
...
@@ -971,7 +979,8 @@ VCDReadSector( vlc_object_t *p_this, const vcdinfo_obj_t *p_vcd,
&
vcd_sector
,
cur_lsn
,
true
)
&
vcd_sector
,
cur_lsn
,
true
)
!=
0
)
!=
0
)
{
{
msg_Warn
(
p_this
,
"Could not read LSN %d"
,
cur_lsn
);
msg_Warn
(
p_this
,
"Could not read LSN %lu"
,
(
long
unsigned
int
)
cur_lsn
);
return
-
1
;
return
-
1
;
}
}
...
...
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