Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
ed23e2fc
Commit
ed23e2fc
authored
Aug 29, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation
Was missing from [
629f5752
]
parent
90a0d65b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
14 deletions
+2
-14
modules/access_output/bonjour.c
modules/access_output/bonjour.c
+2
-14
No files found.
modules/access_output/bonjour.c
View file @
ed23e2fc
...
@@ -36,10 +36,8 @@
...
@@ -36,10 +36,8 @@
#include <vlc_sout.h>
#include <vlc_sout.h>
#include <avahi-client/client.h>
#include <avahi-client/client.h>
#ifdef HAVE_AVAHI_06
#include <avahi-client/publish.h>
# include <avahi-client/publish.h>
#include <avahi-client/lookup.h>
# include <avahi-client/lookup.h>
#endif
#include <avahi-common/alternative.h>
#include <avahi-common/alternative.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/malloc.h>
#include <avahi-common/malloc.h>
...
@@ -122,11 +120,7 @@ static int create_service( bonjour_t *p_sys )
...
@@ -122,11 +120,7 @@ static int create_service( bonjour_t *p_sys )
}
}
error
=
avahi_entry_group_add_service
(
p_sys
->
group
,
AVAHI_IF_UNSPEC
,
error
=
avahi_entry_group_add_service
(
p_sys
->
group
,
AVAHI_IF_UNSPEC
,
#ifdef HAVE_AVAHI_06
AVAHI_PROTO_UNSPEC
,
0
,
p_sys
->
psz_name
,
AVAHI_PROTO_UNSPEC
,
0
,
p_sys
->
psz_name
,
#else
AVAHI_PROTO_UNSPEC
,
p_sys
->
psz_name
,
#endif
p_sys
->
psz_stype
,
NULL
,
NULL
,
p_sys
->
psz_stype
,
NULL
,
NULL
,
p_sys
->
i_port
,
p_sys
->
i_port
,
p_sys
->
psz_txt
,
NULL
);
p_sys
->
psz_txt
,
NULL
);
...
@@ -167,12 +161,8 @@ static void client_callback( AvahiClient *c,
...
@@ -167,12 +161,8 @@ static void client_callback( AvahiClient *c,
if
(
p_sys
->
group
!=
NULL
)
if
(
p_sys
->
group
!=
NULL
)
avahi_entry_group_reset
(
p_sys
->
group
);
avahi_entry_group_reset
(
p_sys
->
group
);
}
}
#ifdef HAVE_AVAHI_06
else
if
(
state
==
AVAHI_CLIENT_FAILURE
&&
else
if
(
state
==
AVAHI_CLIENT_FAILURE
&&
(
avahi_client_errno
(
c
)
==
AVAHI_ERR_DISCONNECTED
)
)
(
avahi_client_errno
(
c
)
==
AVAHI_ERR_DISCONNECTED
)
)
#else
else
if
(
state
==
AVAHI_CLIENT_DISCONNECTED
)
#endif
{
{
msg_Err
(
p_sys
->
p_log
,
"avahi client disconnected"
);
msg_Err
(
p_sys
->
p_log
,
"avahi client disconnected"
);
avahi_simple_poll_quit
(
p_sys
->
simple_poll
);
avahi_simple_poll_quit
(
p_sys
->
simple_poll
);
...
@@ -234,9 +224,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
...
@@ -234,9 +224,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
}
}
p_sys
->
client
=
avahi_client_new
(
avahi_simple_poll_get
(
p_sys
->
simple_poll
),
p_sys
->
client
=
avahi_client_new
(
avahi_simple_poll_get
(
p_sys
->
simple_poll
),
#ifdef HAVE_AVAHI_06
0
,
0
,
#endif
client_callback
,
p_sys
,
&
err
);
client_callback
,
p_sys
,
&
err
);
if
(
p_sys
->
client
==
NULL
)
if
(
p_sys
->
client
==
NULL
)
{
{
...
...
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