Changeset fcce68aff1b6360e94e87a6197b1b7f6e1813cc4

Timestamp:

29/01/06 10:00:31 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1138525231 +0000

git-parent:

[2e479fbfdf9c5659b9524f4404ae572d037b798c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1138525231 +0000

Message:

Clean up

Files:

• modules/access_output/http.c (modified) (8 diffs)

modules/access_output/http.c

@@ -153 +153 @@
-    sout_access_out_sys_t   *p_sys;
-
-, *psz_name
+
-
-    char                *psz_bind_addr;
@@ -165 +165 @@
-    vlc_value_t         val;
-
-#ifdef HAVE_AVAHI_CLIENT
-    playlist_t          *p_playlist;
-    char                *psz_txt;
-#endif
-
-    if( !( p_sys = p_access->p_sys =
-                malloc( sizeof( sout_access_out_sys_t ) ) ) )
@@ -179 +174 @@
-    sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
-
-
-
-
-
+
+
+
-    i_bind_port = 0;
-    psz_file_name = "";
@@ -250 +244 @@
-        msg_Err( p_access, "cannot listen on %s:%d",
-                 psz_bind_addr, i_bind_port );
-        free( psz_name );
-        free( psz_file_name );
+        free( psz_bind_addr );
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
+    free( psz_bind_addr );
-
-    if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) )
@@ -293 +288 @@
-        httpd_HostDelete( p_sys->p_httpd_host );
-
-        free( psz_name );
-        free( psz_file_name );
-        free( p_sys );
@@ -300 +294 @@
-
-#ifdef HAVE_AVAHI_CLIENT
-    asprintf( &psz_txt, "path=%s", psz_file_name );
-#endif
-
-    free( psz_file_name );
-    free( psz_name );
-
-#ifdef HAVE_AVAHI_CLIENT
-    p_playlist = (playlist_t *)vlc_object_find( p_access, VLC_OBJECT_PLAYLIST,
-                                                FIND_ANYWHERE );
-    if( p_playlist == NULL )
-    {
-        msg_Err( p_access, "unable to find playlist" );
-        httpd_HostDelete( p_sys->p_httpd_host );
-        free( (void *)psz_txt );
-        free( (void *)p_sys );
-        return VLC_EGENERIC;
-    }
-
-    psz_name = strrchr( p_playlist->status.p_item->input.psz_uri,
-                        DIRECTORY_SEPARATOR );
-    if( psz_name != NULL ) psz_name++;
-    else psz_name = p_playlist->status.p_item->input.psz_uri;
-    
-    if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") )
-    {
+        playlist_t          *p_playlist;
+        char                *psz_txt, *psz_name;
+
+        p_playlist = (playlist_t *)vlc_object_find( p_access,
+                                                    VLC_OBJECT_PLAYLIST,
+                                                    FIND_ANYWHERE );
+        if( p_playlist == NULL )
+        {
+            msg_Err( p_access, "unable to find playlist" );
+            httpd_HostDelete( p_sys->p_httpd_host );
+            free( (void *)p_sys );
+            return VLC_EGENERIC;
+        }
+
+        psz_name = strrchr( p_playlist->status.p_item->input.psz_uri,
+                            DIRECTORY_SEPARATOR );
+        if( psz_name != NULL ) psz_name++;
+        else psz_name = p_playlist->status.p_item->input.psz_uri;
+
+        asprintf( &psz_txt, "path=%s", psz_file_name );
+
-        p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access,
-                                                  "_vlc-http._tcp",
-                                                  psz_name, i_bind_port, psz_txt );
-        free( (void *)psz_txt );
+
-        if( p_sys->p_bonjour == NULL )
-        {
@@ -336 +329 @@
-            return VLC_EGENERIC;
-        }
-
-
+
+
+
+
-#endif
+
+    free( psz_file_name );
-
-    p_sys->i_header_allocated = 1024;
@@ -364 +361 @@
-
-#ifdef HAVE_AVAHI_CLIENT
-config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour")
+p_sys->p_bonjour != NULL
-        bonjour_stop_service( p_sys->p_bonjour );
-#endif