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
c40cb8b8
Commit
c40cb8b8
authored
Mar 07, 2004
by
Rocky Bernstein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More printf lint for cygwin (and possibly others)
parent
8a55377f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
modules/access/cdda/access.c
modules/access/cdda/access.c
+12
-6
modules/access/vcdx/access.c
modules/access/vcdx/access.c
+1
-1
No files found.
modules/access/cdda/access.c
View file @
c40cb8b8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* cddax.c : CD digital audio input module for vlc using libcdio
* cddax.c : CD digital audio input module for vlc using libcdio
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000, 2003, 2004 VideoLAN
* Copyright (C) 2000, 2003, 2004 VideoLAN
* $Id
: access.c,v 1.28 2004/02/23 00:10:50 rocky Exp
$
* $Id$
*
*
* Authors: Rocky Bernstein <rocky@panix.com>
* Authors: Rocky Bernstein <rocky@panix.com>
* Laurent Aimar <fenrir@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
...
@@ -72,9 +72,11 @@ static int CDDAFixupPlayList( input_thread_t *p_input,
...
@@ -72,9 +72,11 @@ static int CDDAFixupPlayList( input_thread_t *p_input,
cdda_data_t
*
p_cdda
,
const
char
*
psz_source
,
cdda_data_t
*
p_cdda
,
const
char
*
psz_source
,
bool
play_single_track
);
bool
play_single_track
);
#if NEED_UPDATE_VAR
static
void
CDDAUpdateVar
(
input_thread_t
*
p_input
,
int
i_entry
,
int
i_action
,
static
void
CDDAUpdateVar
(
input_thread_t
*
p_input
,
int
i_entry
,
int
i_action
,
const
char
*
p_varname
,
char
*
p_label
,
const
char
*
p_varname
,
char
*
p_label
,
const
char
*
p_debug_label
);
const
char
*
p_debug_label
);
#endif
/****************************************************************************
/****************************************************************************
...
@@ -211,7 +213,8 @@ static int CDDARead( input_thread_t * p_input, byte_t * p_buffer,
...
@@ -211,7 +213,8 @@ static int CDDARead( input_thread_t * p_input, byte_t * p_buffer,
if
(
cdio_read_audio_sector
(
p_cdda
->
p_cddev
->
cdio
,
p_buffer
,
if
(
cdio_read_audio_sector
(
p_cdda
->
p_cddev
->
cdio
,
p_buffer
,
p_cdda
->
i_sector
)
!=
0
)
p_cdda
->
i_sector
)
!=
0
)
{
{
msg_Err
(
p_input
,
"could not read sector %d"
,
p_cdda
->
i_sector
);
msg_Err
(
p_input
,
"could not read sector %lu"
,
(
long
unsigned
int
)
p_cdda
->
i_sector
);
return
-
1
;
return
-
1
;
}
}
...
@@ -221,7 +224,8 @@ static int CDDARead( input_thread_t * p_input, byte_t * p_buffer,
...
@@ -221,7 +224,8 @@ static int CDDARead( input_thread_t * p_input, byte_t * p_buffer,
input_area_t
*
p_area
;
input_area_t
*
p_area
;
dbg_print
(
(
INPUT_DBG_LSN
|
INPUT_DBG_CALL
),
dbg_print
(
(
INPUT_DBG_LSN
|
INPUT_DBG_CALL
),
"end of track, cur: %u"
,
p_cdda
->
i_sector
);
"end of track, cur: %lu"
,
(
long
unsigned
int
)
p_cdda
->
i_sector
);
/*???? if ( p_cdda->i_track >= p_cdda->i_nb_tracks - 1 )*/
/*???? if ( p_cdda->i_track >= p_cdda->i_nb_tracks - 1 )*/
return
0
;
/* EOF */
return
0
;
/* EOF */
...
@@ -322,11 +326,13 @@ static void CDDASeek( input_thread_t * p_input, off_t i_off )
...
@@ -322,11 +326,13 @@ static void CDDASeek( input_thread_t * p_input, off_t i_off )
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_EXT
|
INPUT_DBG_SEEK
),
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_EXT
|
INPUT_DBG_SEEK
),
"sector %ud, offset: %lld, i_tell: %lld"
,
p_cdda
->
i_sector
,
i_off
,
"sector %lu, offset: %lld, i_tell: %lld"
,
(
long
unsigned
int
)
p_cdda
->
i_sector
,
i_off
,
p_input
->
stream
.
p_selected_area
->
i_tell
);
p_input
->
stream
.
p_selected_area
->
i_tell
);
}
}
#if NEED_UPDATE_VAR
/****************************************************************************
/****************************************************************************
Update the "varname" variable to i_num without triggering a callback.
Update the "varname" variable to i_num without triggering a callback.
****************************************************************************/
****************************************************************************/
...
@@ -344,7 +350,7 @@ CDDAUpdateVar( input_thread_t *p_input, int i_num, int i_action,
...
@@ -344,7 +350,7 @@ CDDAUpdateVar( input_thread_t *p_input, int i_num, int i_action,
}
}
var_Change
(
p_input
,
p_varname
,
i_action
,
&
val
,
NULL
);
var_Change
(
p_input
,
p_varname
,
i_action
,
&
val
,
NULL
);
}
}
#endif
#define meta_info_add_str(title, str) \
#define meta_info_add_str(title, str) \
if ( str ) { \
if ( str ) { \
...
@@ -366,13 +372,13 @@ static void InformationCreate( input_thread_t *p_input )
...
@@ -366,13 +372,13 @@ static void InformationCreate( input_thread_t *p_input )
playlist_t
*
p_playlist
=
vlc_object_find
(
p_input
,
VLC_OBJECT_PLAYLIST
,
playlist_t
*
p_playlist
=
vlc_object_find
(
p_input
,
VLC_OBJECT_PLAYLIST
,
FIND_PARENT
);
FIND_PARENT
);
input_info_category_t
*
p_cat
;
input_info_category_t
*
p_cat
;
playlist_item_t
*
p_item
;
p_cat
=
input_InfoCategory
(
p_input
,
"General"
);
p_cat
=
input_InfoCategory
(
p_input
,
"General"
);
#ifdef HAVE_LIBCDDB
#ifdef HAVE_LIBCDDB
if
(
p_cdda
->
i_cddb_enabled
)
{
if
(
p_cdda
->
i_cddb_enabled
)
{
playlist_item_t
*
p_item
;
meta_info_add_str
(
"Title"
,
p_cdda
->
cddb
.
disc
->
title
);
meta_info_add_str
(
"Title"
,
p_cdda
->
cddb
.
disc
->
title
);
meta_info_add_str
(
"Artist"
,
p_cdda
->
cddb
.
disc
->
artist
);
meta_info_add_str
(
"Artist"
,
p_cdda
->
cddb
.
disc
->
artist
);
...
...
modules/access/vcdx/access.c
View file @
c40cb8b8
...
@@ -252,7 +252,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
...
@@ -252,7 +252,7 @@ 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 %lu, es %
l
u"
,
"new entry, i_entry %d, sector %lu, es %u"
,
i_entry
,
(
long
unsigned
int
)
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
=
...
...
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