Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
ed58d07d
Commit
ed58d07d
authored
Jun 14, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix indentation.
parent
117e2de0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
273 additions
and
274 deletions
+273
-274
include/vlc_input.h
include/vlc_input.h
+5
-2
modules/access/cdda/info.c
modules/access/cdda/info.c
+268
-272
No files found.
include/vlc_input.h
View file @
ed58d07d
...
...
@@ -467,6 +467,7 @@ static inline input_title_t *vlc_input_title_Duplicate( input_title_t *t )
return
dup
;
}
/*****************************************************************************
* Attachments
*****************************************************************************/
...
...
@@ -479,6 +480,7 @@ struct input_attachment_t
int
i_data
;
void
*
p_data
;
};
static
inline
input_attachment_t
*
vlc_input_attachment_New
(
const
char
*
psz_name
,
const
char
*
psz_mime
,
const
char
*
psz_description
,
...
...
@@ -517,6 +519,7 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
free
(
a
->
p_data
);
free
(
a
);
}
/*****************************************************************************
* input defines/constants.
*****************************************************************************/
...
...
modules/access/cdda/info.c
View file @
ed58d07d
...
...
@@ -310,7 +310,6 @@ CDDAMetaInfo( access_t *p_access, track_t i_track )
}
}
}
#endif
/*HAVE_LIBCDDB*/
#define TITLE_MAX 30
...
...
@@ -329,16 +328,15 @@ CDDAMetaInfo( access_t *p_access, track_t i_track )
_
(
"Disc"
),
_
(
"Duration"
),
"%s"
,
secstotimestr
(
psz_buffer
,
i_duration
)
);
if
(
p_cdda
->
psz_mcn
)
{
if
(
p_cdda
->
psz_mcn
)
{
input_Control
(
p_cdda
->
p_input
,
INPUT_ADD_INFO
,
_
(
"Disc"
),
_
(
"Media Catalog Number (MCN)"
),
"%s"
,
p_cdda
->
psz_mcn
);
input_Control
(
p_cdda
->
p_input
,
INPUT_ADD_INFO
,
_
(
"Disc"
),
_
(
"Tracks"
),
"%d"
,
p_cdda
->
i_tracks
);
}
#ifdef HAVE_LIBCDDB
if
(
p_cdda
->
b_cddb_enabled
&&
p_cdda
->
cddb
.
disc
)
{
...
...
@@ -370,16 +368,14 @@ CDDAMetaInfo( access_t *p_access, track_t i_track )
add_cdtext_disc_info_str
(
"Title (CD-Text)"
,
CDTEXT_TITLE
);
psz_field
=
p_cdda
->
p_cdtext
[
0
]
->
field
[
CDTEXT_TITLE
];
if
(
psz_field
&&
strlen
(
psz_field
))
{
if
(
psz_field
&&
strlen
(
psz_field
))
psz_meta_title
=
psz_field
;
}
psz_field
=
p_cdda
->
p_cdtext
[
0
]
->
field
[
CDTEXT_PERFORMER
];
if
(
psz_field
&&
strlen
(
psz_field
))
{
if
(
psz_field
&&
strlen
(
psz_field
))
psz_meta_artist
=
psz_field
;
}
}
for
(
i
=
0
;
i
<
p_cdda
->
i_tracks
;
i
++
)
{
char
psz_track
[
TITLE_MAX
];
...
...
@@ -464,7 +460,6 @@ CDDAMetaInfo( access_t *p_access, track_t i_track )
if
(
psz_meta_artist
)
add_meta_val
(
vlc_meta_Artist
,
psz_meta_artist
);
}
}
}
...
...
@@ -619,12 +614,15 @@ CDDAFormatStr( const access_t *p_access, cdda_data_t *p_cdda,
}
else
{
add_format_str_info
(
psz_mrl
);
}
}
else
{
}
else
{
if
(
p_cdda
->
p_cdtext
[
i_track
]
&&
p_cdda
->
p_cdtext
[
i_track
]
->
field
[
CDTEXT_TITLE
])
{
&&
p_cdda
->
p_cdtext
[
i_track
]
->
field
[
CDTEXT_TITLE
])
{
add_format_str_info
(
p_cdda
->
p_cdtext
[
i_track
]
->
field
[
CDTEXT_TITLE
]);
}
else
}
else
add_format_str_info
(
psz_mrl
);
}
break
;
...
...
@@ -906,7 +904,6 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
asprintf
(
&
t
->
psz_name
,
_
(
"Track %i"
),
i_track
);
t
->
i_size
=
i_track_frames
*
(
int64_t
)
CDIO_CD_FRAMESIZE_RAW
;
t
->
i_length
=
INT64_C
(
1000000
)
*
t
->
i_size
/
CDDA_FREQUENCY_SAMPLE
/
4
;
if
(
p_item
)
...
...
@@ -924,7 +921,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
{
input_title_t
*
t
;
if
(
!
p_cdda
->
b_nav_mode
)
if
(
!
p_cdda
->
b_nav_mode
)
playlist_ItemToNode
(
p_playlist
,
p_item
,
false
);
for
(
i
=
0
;
i
<
p_cdda
->
i_tracks
;
i
++
)
...
...
@@ -942,10 +939,10 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
t
->
i_length
=
INT64_C
(
1000000
)
*
t
->
i_size
/
CDDA_FREQUENCY_SAMPLE
/
4
;
if
(
!
p_cdda
->
b_nav_mode
)
{
if
(
!
p_cdda
->
b_nav_mode
)
{
p_child
=
CDDACreatePlaylistItem
(
p_access
,
p_cdda
,
p_playlist
,
p_item
,
i_track
);
p_item
,
i_track
);
}
}
...
...
@@ -960,7 +957,6 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
}
}
if
(
b_play
)
{
playlist_Control
(
p_playlist
,
PLAYLIST_VIEWPLAY
,
true
,
...
...
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