* removed the old panel which used to show msg_err completely (hopefully) and added...

[vlc] / modules / services_discovery / daap.c

diff --git a/modules/services_discovery/daap.c b/modules/services_discovery/daap.c
index 930817bcd421a2dc9654325263cdf7d292c63b77..5051b0d8f1e012c9a5587c50d52098b4ddd6b96a 100644 (file)
--- a/modules/services_discovery/daap.c
+++ b/modules/services_discovery/daap.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * daap.c :  Apple DAAP discovery module
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: sap.c 9569 2004-12-15 22:17:52Z zorglub $
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -29,7 +29,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "network.h"
+#include "vlc_url.h"
 
 #include <vlc/input.h>
 
@@ -68,7 +68,7 @@ vlc_module_end();
  * Local structures
  *****************************************************************************/
 
-typedef struct host_s {
+typedef struct dhost_s {
     char *psz_name;
     int i_id;
 
@@ -81,11 +81,11 @@ typedef struct host_s {
 
     DAAP_ClientHost_DatabaseItem *p_songs;
     int i_songs;
-} host_t;
+} dhost_t;
 
 typedef struct daap_db_s {
-    host_t **pp_hosts;
-    int      i_hosts;
+    dhost_t **pp_hosts;
+    int       i_hosts;
 
     int i_last_id;
 
@@ -104,7 +104,7 @@ struct services_discovery_sys_t {
 struct access_sys_t {
     vlc_url_t url;
 
-    host_t *p_host;
+    dhost_t *p_host;
     int i_host;
     int i_song;
 
@@ -128,8 +128,8 @@ struct access_sys_t {
                                   DAAP_SClientHost *p_host,
                                   void *p_context );
     static void OnHostsUpdate( services_discovery_t *p_sd );
-    static void ProcessHost( services_discovery_t *p_sd, host_t *p_host );
-    static void FreeHost( services_discovery_t *p_sd, host_t *p_host );
+    static void ProcessHost( services_discovery_t *p_sd, dhost_t *p_host );
+    static void FreeHost( services_discovery_t *p_sd, dhost_t *p_host );
 
     static int Control( access_t *p_access, int i_query, va_list args );
     static int Read( access_t *, uint8_t *, int );
@@ -181,8 +181,10 @@ static int Open( vlc_object_t *p_this )
         msg_Warn( p_sd, "unable to find playlist, cancelling DAAP" );
         return VLC_EGENERIC;
     }
+    msg_Err( p_sd, "DAAP IS BROKEN !! Fix it if you want it !" );
+    return VLC_EGENERIC;
 
-    p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
+#if 0
     p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
                                          _("DAAP shares"), p_view->p_root );
     p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
@@ -192,10 +194,12 @@ static int Open( vlc_object_t *p_this )
     vlc_object_release( p_playlist );
 
     return VLC_SUCCESS;
+#endif
 }
 
 static int OpenAccess( vlc_object_t *p_this )
 {
+#if 0
     access_t     *p_access = (access_t*)p_this;
     access_sys_t *p_sys;
     vlc_value_t val;
@@ -220,7 +224,7 @@ static int OpenAccess( vlc_object_t *p_this )
 
     if( p_sys->p_db == NULL || i_ret )
     {
-        msg_Err( p_access, "The DAAP services_discovery module must be enabled" );
+        msg_Err( p_access, "the DAAP services_discovery module must be enabled" );
         return VLC_EGENERIC;
     }
 
@@ -276,7 +280,7 @@ static int OpenAccess( vlc_object_t *p_this )
     }
 
 
-    msg_Dbg( p_access, "Downloading %s song %i (db %i)",
+    msg_Dbg( p_access, "downloading %s song %i (db %i)",
                            p_sys->songdata.songformat,
                            p_sys->i_song, p_sys->p_host->i_database_id );
 
@@ -287,14 +291,14 @@ static int OpenAccess( vlc_object_t *p_this )
                                           p_sys->songdata.songformat,
                                           &(p_sys->song) );
 
-    msg_Dbg( p_access, "Finished downloading, read %i bytes (ret %i)",
+    msg_Dbg( p_access, "finished downloading, read %i bytes (ret %i)",
                                           p_sys->song.size, i_ret );
 
     p_access->info.i_size = p_sys->song.size;
 
     if( i_ret != 0 )
         return VLC_EGENERIC;
-
+#endif
     return VLC_SUCCESS;
 }
 
@@ -303,6 +307,7 @@ static int OpenAccess( vlc_object_t *p_this )
  *****************************************************************************/
 static void Close( vlc_object_t *p_this )
 {
+#if 0
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
     services_discovery_sys_t    *p_sys  = p_sd->p_sys;
 
@@ -321,11 +326,12 @@ static void Close( vlc_object_t *p_this )
 
     if( p_playlist )
     {
-        playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE );
+        playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
         vlc_object_release( p_playlist );
     }
 
     free( p_sys );
+#endif
 }
 
 static void CloseAccess( vlc_object_t *p_this )
@@ -467,7 +473,7 @@ static void OnHostsUpdate( services_discovery_t *p_sd )
     {
         if( p_sd->p_sys->p_db->pp_hosts[i]->b_updated == VLC_FALSE )
         {
-            host_t *p_host = p_sd->p_sys->p_db->pp_hosts[i];
+            dhost_t *p_host = p_sd->p_sys->p_db->pp_hosts[i];
             FreeHost( p_sd, p_host );
             REMOVE_ELEM( p_sd->p_sys->p_db->pp_hosts,
                          p_sd->p_sys->p_db->i_hosts, i );
@@ -507,10 +513,12 @@ static int EnumerateCallback( DAAP_SClient *p_client,
 
     if( !b_found )
     {
-        host_t *p_vlchost = (host_t *)malloc( sizeof( host_t ) );
+        dhost_t *p_vlchost = (dhost_t *)malloc( sizeof( dhost_t ) );
+        p_vlchost->p_node = NULL;
         p_vlchost->p_host = p_host;
         p_vlchost->psz_name = psz_buffer;
         p_vlchost->b_new = VLC_TRUE;
+        p_vlchost->b_updated = VLC_TRUE;
         INSERT_ELEM( p_sys->p_db->pp_hosts, p_sys->p_db->i_hosts,
                      p_sys->p_db->i_hosts, p_vlchost );
     }
@@ -518,8 +526,9 @@ static int EnumerateCallback( DAAP_SClient *p_client,
     return VLC_SUCCESS;
 }
 
-static void ProcessHost( services_discovery_t *p_sd, host_t *p_host )
+static void ProcessHost( services_discovery_t *p_sd, dhost_t *p_host )
 {
+#if 0
     int i_dbsize, i_db, i, i_songsize, i_ret;
     int i_size = DAAP_ClientHost_GetSharename( p_host->p_host, NULL, 0 );
 
@@ -565,6 +574,7 @@ static void ProcessHost( services_discovery_t *p_sd, host_t *p_host )
     DAAP_ClientHost_Database *p_database = malloc( i_dbsize );
     DAAP_ClientHost_GetDatabases( p_host->p_host, p_database, &i_db, i_dbsize );
 
+
     if( !i_db || !p_database )
     {
         msg_Warn( p_sd, "no database on DAAP host %s", p_host->psz_name );
@@ -601,10 +611,10 @@ static void ProcessHost( services_discovery_t *p_sd, host_t *p_host )
                                                    p_host->p_songs[i].id );
         p_item = playlist_ItemNew( p_sd, psz_buff,
                                          p_host->p_songs[i].itemname );
-        vlc_input_item_AddInfo( &p_item->input, _("Meta-Information"),
-                                _("Artist"), p_host->p_songs[i].songartist );
-        vlc_input_item_AddInfo( &p_item->input, _("Meta-Information"),
-                                _("Album"), p_host->p_songs[i].songalbum );
+        vlc_input_item_AddInfo( &p_item->input, _(VLC_META_INFO_CAT),
+                                _(VLC_META_ARTIST), p_host->p_songs[i].songartist );
+        vlc_input_item_AddInfo( &p_item->input, _(VLC_META_INFO_CAT),
+                                _(VLC_META_COLLECTION), p_host->p_songs[i].songalbum );
 
         playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY,
                               p_host->p_node, PLAYLIST_APPEND, PLAYLIST_END );
@@ -614,9 +624,10 @@ static void ProcessHost( services_discovery_t *p_sd, host_t *p_host )
     DAAP_ClientHost_AsyncWaitUpdate( p_host->p_host );
 
     vlc_object_release( p_playlist );
+#endif
 }
 
-static void FreeHost( services_discovery_t *p_sd, host_t *p_host )
+static void FreeHost( services_discovery_t *p_sd, dhost_t *p_host )
 {
     playlist_t *p_playlist;
 
@@ -630,7 +641,9 @@ static void FreeHost( services_discovery_t *p_sd, host_t *p_host )
                                                  FIND_ANYWHERE );
     if( p_playlist )
     {
-        playlist_NodeDelete( p_playlist, p_host->p_node, VLC_TRUE );
+        if( p_host->p_node )
+            playlist_NodeDelete( p_playlist, p_host->p_node, VLC_TRUE ,
+                                                             VLC_TRUE);
         vlc_object_release( p_playlist );
     }