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
83785c78
Commit
83785c78
authored
Oct 17, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
udev: item type depends on the subsystem, not always "card"
parent
0d904f97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
modules/services_discovery/udev.c
modules/services_discovery/udev.c
+5
-3
No files found.
modules/services_discovery/udev.c
View file @
83785c78
...
@@ -71,6 +71,7 @@ struct subsys
...
@@ -71,6 +71,7 @@ struct subsys
char
*
(
*
get_mrl
)
(
struct
udev_device
*
dev
);
char
*
(
*
get_mrl
)
(
struct
udev_device
*
dev
);
char
*
(
*
get_name
)
(
struct
udev_device
*
dev
);
char
*
(
*
get_name
)
(
struct
udev_device
*
dev
);
char
*
(
*
get_cat
)
(
struct
udev_device
*
dev
);
char
*
(
*
get_cat
)
(
struct
udev_device
*
dev
);
int
item_type
;
};
};
struct
services_discovery_sys_t
struct
services_discovery_sys_t
...
@@ -117,7 +118,8 @@ static int AddDevice (services_discovery_t *sd, struct udev_device *dev)
...
@@ -117,7 +118,8 @@ static int AddDevice (services_discovery_t *sd, struct udev_device *dev)
char
*
name
=
p_sys
->
subsys
->
get_name
(
dev
);
char
*
name
=
p_sys
->
subsys
->
get_name
(
dev
);
input_item_t
*
item
=
input_item_NewWithType
(
VLC_OBJECT
(
sd
),
mrl
,
input_item_t
*
item
=
input_item_NewWithType
(
VLC_OBJECT
(
sd
),
mrl
,
name
?
name
:
mrl
,
name
?
name
:
mrl
,
0
,
NULL
,
0
,
-
1
,
ITEM_TYPE_CARD
);
0
,
NULL
,
0
,
-
1
,
p_sys
->
subsys
->
item_type
);
msg_Dbg
(
sd
,
"adding %s (%s)"
,
mrl
,
name
);
msg_Dbg
(
sd
,
"adding %s (%s)"
,
mrl
,
name
);
free
(
name
);
free
(
name
);
free
(
mrl
);
free
(
mrl
);
...
@@ -390,7 +392,7 @@ static char *v4l_get_cat (struct udev_device *dev)
...
@@ -390,7 +392,7 @@ static char *v4l_get_cat (struct udev_device *dev)
int
OpenV4L
(
vlc_object_t
*
obj
)
int
OpenV4L
(
vlc_object_t
*
obj
)
{
{
static
const
struct
subsys
subsys
=
{
static
const
struct
subsys
subsys
=
{
"video4linux"
,
v4l_get_mrl
,
v4l_get_name
,
v4l_get_cat
,
"video4linux"
,
v4l_get_mrl
,
v4l_get_name
,
v4l_get_cat
,
ITEM_TYPE_CARD
,
};
};
return
Open
(
obj
,
&
subsys
);
return
Open
(
obj
,
&
subsys
);
...
@@ -465,7 +467,7 @@ static char *disc_get_cat (struct udev_device *dev)
...
@@ -465,7 +467,7 @@ static char *disc_get_cat (struct udev_device *dev)
int
OpenDisc
(
vlc_object_t
*
obj
)
int
OpenDisc
(
vlc_object_t
*
obj
)
{
{
static
const
struct
subsys
subsys
=
{
static
const
struct
subsys
subsys
=
{
"block"
,
disc_get_mrl
,
disc_get_name
,
disc_get_cat
,
"block"
,
disc_get_mrl
,
disc_get_name
,
disc_get_cat
,
ITEM_TYPE_DISC
,
};
};
return
Open
(
obj
,
&
subsys
);
return
Open
(
obj
,
&
subsys
);
...
...
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