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
fc4005c1
Commit
fc4005c1
authored
Aug 13, 2013
by
Petri Hintukainen
Committed by
Rafaël Carré
Aug 16, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bluray: added options for preferred languages
Signed-off-by:
Rafaël Carré
<
funman@videolan.org
>
parent
5c805b82
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
0 deletions
+51
-0
modules/access/bluray.c
modules/access/bluray.c
+51
-0
No files found.
modules/access/bluray.c
View file @
fc4005c1
...
@@ -47,6 +47,11 @@
...
@@ -47,6 +47,11 @@
#include <vlc_dialog.h>
/* BD+/AACS warnings */
#include <vlc_dialog.h>
/* BD+/AACS warnings */
#include <vlc_vout.h>
/* vout_PutSubpicture / subpicture_t */
#include <vlc_vout.h>
/* vout_PutSubpicture / subpicture_t */
#include <vlc_url.h>
/* vlc_path2uri */
#include <vlc_url.h>
/* vlc_path2uri */
#include <vlc_iso_lang.h>
/* FIXME we should find a better way than including that */
#include "../../src/text/iso-639_def.h"
#include <libbluray/bluray.h>
#include <libbluray/bluray.h>
#include <libbluray/keys.h>
#include <libbluray/keys.h>
...
@@ -70,6 +75,7 @@ static const char *const ppsz_region_code_text[] = {
...
@@ -70,6 +75,7 @@ static const char *const ppsz_region_code_text[] = {
"Region A"
,
"Region B"
,
"Region C"
};
"Region A"
,
"Region B"
,
"Region C"
};
#define REGION_DEFAULT 1
/* Index to region list. Actual region code is (1<<REGION_DEFAULT) */
#define REGION_DEFAULT 1
/* Index to region list. Actual region code is (1<<REGION_DEFAULT) */
#define LANGUAGE_DEFAULT ("eng")
/* Callbacks */
/* Callbacks */
static
int
blurayOpen
(
vlc_object_t
*
);
static
int
blurayOpen
(
vlc_object_t
*
);
...
@@ -148,6 +154,43 @@ struct subpicture_updater_sys_t
...
@@ -148,6 +154,43 @@ struct subpicture_updater_sys_t
bluray_overlay_t
*
p_overlay
;
bluray_overlay_t
*
p_overlay
;
};
};
/* Get a 3 char code
* FIXME: partiallyy duplicated from src/input/es_out.c
*/
static
const
char
*
DemuxGetLanguageCode
(
demux_t
*
p_demux
,
const
char
*
psz_var
)
{
const
iso639_lang_t
*
pl
;
char
*
psz_lang
;
char
*
p
;
psz_lang
=
var_CreateGetString
(
p_demux
,
psz_var
);
if
(
!
psz_lang
)
return
LANGUAGE_DEFAULT
;
/* XXX: we will use only the first value
* (and ignore other ones in case of a list) */
if
(
(
p
=
strchr
(
psz_lang
,
','
)
)
)
*
p
=
'\0'
;
for
(
pl
=
p_languages
;
pl
->
psz_eng_name
!=
NULL
;
pl
++
)
{
if
(
*
psz_lang
==
'\0'
)
continue
;
if
(
!
strcasecmp
(
pl
->
psz_eng_name
,
psz_lang
)
||
!
strcasecmp
(
pl
->
psz_iso639_1
,
psz_lang
)
||
!
strcasecmp
(
pl
->
psz_iso639_2T
,
psz_lang
)
||
!
strcasecmp
(
pl
->
psz_iso639_2B
,
psz_lang
)
)
break
;
}
free
(
psz_lang
);
if
(
pl
->
psz_eng_name
!=
NULL
)
return
pl
->
psz_iso639_2T
;
return
LANGUAGE_DEFAULT
;
}
/*****************************************************************************
/*****************************************************************************
* Local prototypes
* Local prototypes
*****************************************************************************/
*****************************************************************************/
...
@@ -325,6 +368,14 @@ static int blurayOpen(vlc_object_t *object)
...
@@ -325,6 +368,14 @@ static int blurayOpen(vlc_object_t *object)
free
(
psz_region
);
free
(
psz_region
);
bd_set_player_setting
(
p_sys
->
bluray
,
BLURAY_PLAYER_SETTING_REGION_CODE
,
1
<<
region
);
bd_set_player_setting
(
p_sys
->
bluray
,
BLURAY_PLAYER_SETTING_REGION_CODE
,
1
<<
region
);
/* set preferred languages */
const
char
*
psz_code
=
DemuxGetLanguageCode
(
p_demux
,
"audio-language"
);
bd_set_player_setting_str
(
p_sys
->
bluray
,
BLURAY_PLAYER_SETTING_AUDIO_LANG
,
psz_code
);
psz_code
=
DemuxGetLanguageCode
(
p_demux
,
"sub-language"
);
bd_set_player_setting_str
(
p_sys
->
bluray
,
BLURAY_PLAYER_SETTING_PG_LANG
,
psz_code
);
psz_code
=
DemuxGetLanguageCode
(
p_demux
,
"menu-language"
);
bd_set_player_setting_str
(
p_sys
->
bluray
,
BLURAY_PLAYER_SETTING_MENU_LANG
,
psz_code
);
/* Get titles and chapters */
/* Get titles and chapters */
p_sys
->
p_meta
=
bd_get_meta
(
p_sys
->
bluray
);
p_sys
->
p_meta
=
bd_get_meta
(
p_sys
->
bluray
);
if
(
!
p_sys
->
p_meta
)
if
(
!
p_sys
->
p_meta
)
...
...
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