Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_dvd, stream_dvdnav, stream_bluray: remove global option variables

Browse Source
This commit is contained in:
wm4
2014-06-10 22:09:27 +02:00
parent 959b718957
commit 35e6d1abe0
10 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
stream/stream_bluray.c
View File

@@ -42,6 +42,7 @@
#include "common/common.h"
#include "common/msg.h"
#include "options/m_option.h"
#include "options/options.h"
#include "stream.h"
#include "osdep/timer.h"
#include "discnav.h"
@@ -72,9 +73,6 @@
#define AACS_ERROR_MMC_FAILURE -7 /* MMC failed */
#define AACS_ERROR_NO_DK -8 /* no matching device key */
char *bluray_device = NULL;
int bluray_angle = 0;
struct bluray_overlay {
struct sub_bitmap *image;
bool clean, hidden;
@@ -703,8 +701,9 @@ static void select_initial_angle(stream_t *s) {
if (!info)
return;
/* Select angle */
unsigned int angle = 0;
angle = bluray_angle ? bluray_angle : BLURAY_DEFAULT_ANGLE;
unsigned int angle = s->opts->bluray_angle;
if (!angle)
angle = BLURAY_DEFAULT_ANGLE;
angle = FFMIN(angle, info->angle_count);
if (angle)
bd_select_angle(b->bd, angle);
@@ -718,10 +717,10 @@ static int bluray_stream_open(stream_t *s)
const char *device = NULL;
/* find the requested device */
if (b->cfg_device)
if (b->cfg_device && b->cfg_device[0])
device = b->cfg_device;
else if (bluray_device)
device = bluray_device;
else if (s->opts->bluray_device && s->opts->bluray_device[0])
device = s->opts->bluray_device;
if (!device) {
MP_ERR(s, "No Blu-ray device/location was specified ...\n");