beepmp-cvs

[Milosz D. <mde...@us...>]

Update of /cvsroot/beepmp/bmpx/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10036/src

Modified Files:
	bmp_playlist.c bmp_resource_manager.c 
Log Message:
* Added French translation
* Applied patch for file inserting fix (Martin Schlemmer)


Index: bmp_playlist.c
===================================================================
RCS file: /cvsroot/beepmp/bmpx/src/bmp_playlist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bmp_playlist.c	10 Sep 2005 05:16:05 -0000	1.1
--- bmp_playlist.c	11 Sep 2005 01:35:48 -0000	1.2
***************
*** 989,1001 ****
  {
  	BmpFileItem *file_item = NULL;
  
! 	file_item = g_new0(BmpFileItem,1);
! 	file_item->uri = g_strdup(uri); 
! 	file_item->metadata = NULL; 
! 	file_item->metadata_attempted = FALSE;
! 	file_item->selected = FALSE;
! 	file_item->dirty = FALSE;
! 	file_item->rendered = FALSE;
! 	LIST_ADD_ITEM(bmp_playlist_tracklist_get (self, listname), file_item);
  }
  
--- 989,1024 ----
  {
  	BmpFileItem *file_item = NULL;
+         GList *items = NULL;
+         GError *error = NULL;
+         gchar *path;
  
!         path = g_filename_from_uri (uri, NULL, NULL);
! 
!         if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
! 
!                dir_foreach(path, (DirForeachFunc)collect_path,
!                            &items, &error);
! 
!                while (items) {
!                
!                        gchar *new_uri = g_filename_to_uri (items->data, NULL, NULL);
! 
!                        bmp_playlist_insert_tracklist_item (self, listname, new_uri);
!                        items = g_list_next (items);
!                }
! 
!                g_list_foreach (g_list_first(items), g_free, NULL);
! 
!         } else {
! 
!                file_item = g_new0(BmpFileItem,1);
!                file_item->uri = g_strdup(uri);
!                file_item->metadata = NULL;
!                file_item->metadata_attempted = FALSE;
!                file_item->selected = FALSE;
!                file_item->dirty = FALSE;
!                file_item->rendered = FALSE;
!                LIST_ADD_ITEM(bmp_playlist_tracklist_get (self, listname), file_item);
!         }
  }
  

Index: bmp_resource_manager.c
===================================================================
RCS file: /cvsroot/beepmp/bmpx/src/bmp_resource_manager.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bmp_resource_manager.c	10 Sep 2005 05:16:05 -0000	1.1
--- bmp_resource_manager.c	11 Sep 2005 01:35:48 -0000	1.2
***************
*** 92,102 ****
      ht_path = get_path (self, path); 
  
!     if (! ht_path)
!     {
  	free_resource_item (item);
  	return;
      }
  
!     g_hash_table_insert (ht_path, name, item);
  }
  
--- 92,102 ----
      ht_path = get_path (self, path); 
  
!     if (! ht_path) {
! 
  	free_resource_item (item);
  	return;
      }
  
!     g_hash_table_replace (ht_path, g_strdup(name), item);
  }