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
a527e9d0
Commit
a527e9d0
authored
Dec 02, 2015
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc: replace existing title menu bool with int bit mask
parent
03581271
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
include/vlc/libvlc_media_player.h
include/vlc/libvlc_media_player.h
+7
-1
include/vlc_input.h
include/vlc_input.h
+3
-3
lib/media_player.c
lib/media_player.c
+1
-1
No files found.
include/vlc/libvlc_media_player.h
View file @
a527e9d0
...
@@ -57,11 +57,17 @@ typedef struct libvlc_track_description_t
...
@@ -57,11 +57,17 @@ typedef struct libvlc_track_description_t
/**
/**
* Description for titles
* Description for titles
*/
*/
enum
{
libvlc_title_menu
=
0x01
,
libvlc_title_interactive
=
0x02
};
typedef
struct
libvlc_title_description_t
typedef
struct
libvlc_title_description_t
{
{
int64_t
i_duration
;
/**< duration in milliseconds */
int64_t
i_duration
;
/**< duration in milliseconds */
char
*
psz_name
;
/**< title name */
char
*
psz_name
;
/**< title name */
bool
b_menu
;
/**< info if item was recognized as a menu
by the demuxer */
unsigned
i_flags
;
/**< info if item was recognized as a menu, interactive or plain content
by the demuxer */
}
libvlc_title_description_t
;
}
libvlc_title_description_t
;
/**
/**
...
...
include/vlc_input.h
View file @
a527e9d0
...
@@ -84,8 +84,8 @@ static inline seekpoint_t *vlc_seekpoint_Duplicate( const seekpoint_t *src )
...
@@ -84,8 +84,8 @@ static inline seekpoint_t *vlc_seekpoint_Duplicate( const seekpoint_t *src )
*****************************************************************************/
*****************************************************************************/
/* input_title_t.i_flags field */
/* input_title_t.i_flags field */
#define INPUT_TITLE_MENU 0x0
00
1
/* Menu title */
#define INPUT_TITLE_MENU 0x01
/* Menu title */
#define INPUT_TITLE_INTERACTIVE 0x0
00
2
/* Interactive title. Playback position has no meaning. */
#define INPUT_TITLE_INTERACTIVE 0x02
/* Interactive title. Playback position has no meaning. */
typedef
struct
input_title_t
typedef
struct
input_title_t
{
{
...
@@ -93,7 +93,7 @@ typedef struct input_title_t
...
@@ -93,7 +93,7 @@ typedef struct input_title_t
int64_t
i_length
;
/* Length(microsecond) if known, else 0 */
int64_t
i_length
;
/* Length(microsecond) if known, else 0 */
int
i_flags
;
/* Is it a menu or a normal entry */
unsigned
i_flags
;
/* Is it a menu or a normal entry */
/* Title seekpoint */
/* Title seekpoint */
int
i_seekpoint
;
int
i_seekpoint
;
...
...
lib/media_player.c
View file @
a527e9d0
...
@@ -1476,7 +1476,7 @@ int libvlc_media_player_get_full_title_descriptions( libvlc_media_player_t *p_mi
...
@@ -1476,7 +1476,7 @@ int libvlc_media_player_get_full_title_descriptions( libvlc_media_player_t *p_mi
/* we want to return milliseconds to match the rest of the API */
/* we want to return milliseconds to match the rest of the API */
title
->
i_duration
=
p_input_title
[
i
]
->
i_length
/
1000
;
title
->
i_duration
=
p_input_title
[
i
]
->
i_length
/
1000
;
title
->
b_menu
=
p_input_title
[
i
]
->
i_flags
&
INPUT_TITLE_MENU
;
title
->
i_flags
=
p_input_title
[
i
]
->
i_flags
;
if
(
p_input_title
[
i
]
->
psz_name
)
if
(
p_input_title
[
i
]
->
psz_name
)
title
->
psz_name
=
strdup
(
p_input_title
[
i
]
->
psz_name
);
title
->
psz_name
=
strdup
(
p_input_title
[
i
]
->
psz_name
);
else
else
...
...
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