Changeset db1a5bd201defe353f674cda2ae0866ad993e8df
- Timestamp:
- 09/10/07 14:45:33
(1 year ago)
- Author:
- Rafaël Carré <funman@videolan.org>
- git-committer:
- Rafaël Carré <funman@videolan.org> 1191933933 +0000
- git-parent:
[3c3678f18cd83a2958b12d385c5b04111779a1f8]
- git-author:
- Rafaël Carré <funman@videolan.org> 1191933933 +0000
- Message:
http output: fix bonjour advertising
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r3429397 |
rdb1a5bd |
|
| 279 | 279 | httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime, |
|---|
| 280 | 280 | psz_user, psz_pwd, NULL ); |
|---|
| 281 | | if( psz_user ) free( psz_user ); |
|---|
| 282 | | if( psz_pwd ) free( psz_pwd ); |
|---|
| 283 | | if( psz_mime ) free( psz_mime ); |
|---|
| | 281 | free( psz_user ); |
|---|
| | 282 | free( psz_pwd ); |
|---|
| | 283 | free( psz_mime ); |
|---|
| 284 | 284 | |
|---|
| 285 | 285 | if( p_sys->p_httpd_stream == NULL ) |
|---|
| … | … | |
| 305 | 305 | else psz_name = psz_newuri; |
|---|
| 306 | 306 | |
|---|
| 307 | | asprintf( &psz_txt, "path=%s", psz_name ); |
|---|
| 308 | | |
|---|
| 309 | | free( psz_uri ); |
|---|
| | 307 | if( psz_file_name && |
|---|
| | 308 | asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 ) |
|---|
| | 309 | { |
|---|
| | 310 | pl_Release( p_playlist ); |
|---|
| | 311 | free( psz_uri ); |
|---|
| | 312 | return VLC_ENOMEM; |
|---|
| | 313 | } |
|---|
| 310 | 314 | |
|---|
| 311 | 315 | p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access, |
|---|
| … | … | |
| 313 | 317 | ? "_vlc-http._tcp" : "_vlc-https._tcp", |
|---|
| 314 | 318 | psz_name, i_bind_port, psz_txt ); |
|---|
| | 319 | free( psz_uri ); |
|---|
| 315 | 320 | free( (void *)psz_txt ); |
|---|
| 316 | 321 | |
|---|
| 317 | 322 | if( p_sys->p_bonjour == NULL ) |
|---|
| 318 | 323 | msg_Err( p_access, "unable to start requested Bonjour announce" ); |
|---|
| 319 | | vlc_object_release( p_playlist ); |
|---|
| | 324 | pl_Release( p_playlist ); |
|---|
| 320 | 325 | } |
|---|
| 321 | 326 | else |
|---|