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
fafd568a
Commit
fafd568a
authored
Nov 17, 2006
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Should fix API compatibility with HAL 0.5.0
parent
952d3486
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
modules/services_discovery/hal.c
modules/services_discovery/hal.c
+7
-5
No files found.
modules/services_discovery/hal.c
View file @
fafd568a
...
...
@@ -57,10 +57,11 @@ struct udi_input_id_t
struct
services_discovery_sys_t
{
LibHalContext
*
p_ctx
;
playlist_item_t
*
p_node_cat
;
playlist_item_t
*
p_node_one
;
LibHalContext
*
p_ctx
;
playlist_item_t
*
p_node_cat
;
playlist_item_t
*
p_node_one
;
#ifdef HAVE_HAL_1
DBusConnection
*
p_connection
int
i_devices_number
;
struct
udi_input_id_t
**
pp_devices
;
#endif
...
...
@@ -134,6 +135,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
libhal_ctx_set_dbus_connection
(
p_sys
->
p_ctx
,
p_connection
);
p_sys
->
p_connection
=
p_connection
;
if
(
!
libhal_ctx_init
(
p_sys
->
p_ctx
,
&
dbus_error
)
)
#else
if
(
!
(
p_sys
->
p_ctx
=
hal_initialize
(
NULL
,
FALSE
)
)
)
...
...
@@ -407,8 +409,8 @@ static void Run( services_discovery_t *p_sd )
while
(
!
p_sd
->
b_die
)
{
/* look for events on the bus, blocking 1 second */
dbus_connection_read_write_dispatch
(
libhal_ctx_get_dbus_connection
(
p_sys
->
p_ctx
),
1000
);
dbus_connection_read_write_dispatch
(
p_sys
->
p_connection
,
1000
);
/* HAL 0.5.8.1 can use libhal_ctx_get_dbus_connection(p_sys->p_ctx) */
}
#endif
...
...
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