Changeset eeb7eeccd2c54ac02f91aa324c9a1f9f0bce2507

Timestamp:

17/01/05 20:38:51 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1105990731 +0000

git-parent:

[6f924598bfb7bc020915329bce203f949b33dda5]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1105990731 +0000

Message:

* daap.c: host_t is already defined in Darwin's mach headers. renamed to dhost_t

Files:

• modules/services_discovery/daap.c (modified) (8 diffs)

modules/services_discovery/daap.c

@@ -69 +69 @@
- *****************************************************************************/
-
-
+d
-    char *psz_name;
-    int i_id;
@@ -82 +82 @@
-    DAAP_ClientHost_DatabaseItem *p_songs;
-    int i_songs;
-
+d
-
-typedef struct daap_db_s {
-
-
+d
+ 
-
-    int i_last_id;
@@ -105 +105 @@
-    vlc_url_t url;
-
-
+d
-    int i_host;
-    int i_song;
@@ -129 +129 @@
-                                  void *p_context );
-    static void OnHostsUpdate( services_discovery_t *p_sd );
-
-
+d
+d
-
-    static int Control( access_t *p_access, int i_query, va_list args );
@@ -468 +468 @@
-        if( p_sd->p_sys->p_db->pp_hosts[i]->b_updated == VLC_FALSE )
-        {
-
+d
-            FreeHost( p_sd, p_host );
-            REMOVE_ELEM( p_sd->p_sys->p_db->pp_hosts,
@@ -508 +508 @@
-    if( !b_found )
-    {
-host_t *p_vlchost = (host_t *)malloc( sizeof( 
+dhost_t *p_vlchost = (dhost_t *)malloc( sizeof( d
-        p_vlchost->p_host = p_host;
-        p_vlchost->psz_name = psz_buffer;
@@ -520 +520 @@
-}
-
-
+d
-{
-    int i_dbsize, i_db, i, i_songsize, i_ret;
@@ -619 +619 @@
-}
-
-
+d
-{
-    playlist_t *p_playlist;