Enlightenment CVS committal

Author  : captainigloo
Project : misc
Module  : enna

Dir     : misc/enna/src/bin


Modified Files:
        Makefile.am enna.c enna.h enna_cdda.c enna_emotion.c 
        enna_emusic.c enna_fm_db.c enna_fm_db.h enna_mediaplayer.c 
        enna_module_music.c enna_popup.c 
Added Files:
        enna_scanner.c enna_scanner.h 
Removed Files:
        enna_db.c enna_db.h 


Log Message:
* Use Gustavo's lib Light Media Scanner to index files in background (only 
audios file at the moment), you can find lms here : 
http://lms.garage.maemo.org/. To handle maximum of audio files you should 
install audio-dummy, ogg and id3lib plugins
* GUI for browsing sqlite3 db created by lms : browse by artist->album->tracks
* Remove unsued entries in audio menus

===================================================================
RCS file: /cvs/e/misc/enna/src/bin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 14 Jan 2008 22:16:05 -0000      1.1
+++ Makefile.am 28 Jan 2008 18:57:32 -0000      1.2
@@ -14,14 +14,12 @@
        @MUSICBRAINZ_CFLAGS@ \
        @[EMAIL PROTECTED]
        @DBUS_CFLAGS@ \
-       @LIBXML_CFLAGS@ \
-       @LIBCURL_CFLAGS@ \
        @EET_CFLAGS@ \
-       @TAGLIB_CFLAGS@ \
        @SQLITE3_CFLAGS@ \
        @IPOD_CFLAGS@ \
-   @BLUETOOTH_CFLAGS@
-       
+       @[EMAIL PROTECTED]
+       @LIGHTMEDIASCANNER_CFLAGS@
+
 bin_PROGRAMS = enna
 
 enna_SOURCES = \
@@ -71,16 +69,16 @@
        enna_lirc.h\
        enna_slideshow.h\
        gettext.h \
-       enna_db.c \
-       enna_db.h \
        enna_fm_db.c\
        enna_fm_db.h \
-       enna_bluetooth.c\
-       enna_bluetooth.h \
+       enna_bluetooth.c\
+       enna_bluetooth.h \
        enna_popup.c\
        enna_popup.h\
        enna_reflection.c\
-       enna_reflection.h
+       enna_reflection.h \
+       enna_scanner.c\
+       enna_scanner.h
 
 enna_LDADD =   @EVAS_LIBS@ \
                @ECORE_LIBS@ \
@@ -89,15 +87,13 @@
                @[EMAIL PROTECTED]
                @DBUS_LIBS@ \
                @MUSICBRAINZ_LIBS@ \
-               @LIBXML_LIBS@ \
-               @LIBCURL_LIBS@ \
                @EET_LIBS@ \
-               @TAGLIB_LIBS@ \
+               @[EMAIL PROTECTED]
                -ltag_c\
                -lehal\
                @lirc_libs@ \
-      @SQLITE3_LIBS@ \
-      @IPOD_LIBS@ \
-      @BLUETOOTH_LIBS@
+               @SQLITE3_LIBS@ \        
+               @IPOD_LIBS@ \
+               @BLUETOOTH_LIBS@
 
 
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna.c      22 Jan 2008 19:05:02 -0000      1.2
+++ enna.c      28 Jan 2008 18:57:32 -0000      1.3
@@ -46,7 +46,7 @@
 #include "enna_lirc.h"
 #include "enna_event.h"
 #include "enna_volume_manager.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 #include "enna_util.h"
 #if WITH_BLUETOOTH_SUPPORT
 #include "enna_bluetooth.h"
@@ -232,6 +232,7 @@
    enna->home = enna_util_user_home_get();
 
    ecore_init();
+   ecore_file_init();
    ecore_evas_init();
    edje_init();
 
@@ -244,8 +245,8 @@
    if (!ecore_file_exists(tmp))
       ecore_file_mkdir(tmp);
 
-   enna->db = enna_db_init(enna);
-
+   enna_scanner_init(enna);
+   
 #if WITH_BLUETOOTH_SUPPORT
    enna_bluetooth_init();
 #endif
@@ -459,7 +460,7 @@
    ecore_evas_shutdown();
    ecore_shutdown();
    evas_shutdown();
-   enna_db_shutdown(enna->db);
+   enna_scanner_shutdown();
    ENNA_FREE(enna);
 }
 
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna.h      22 Jan 2008 19:21:22 -0000      1.2
+++ enna.h      28 Jan 2008 18:57:32 -0000      1.3
@@ -6,14 +6,22 @@
 #include <Evas.h>
 #include <Ecore.h>
 #include <Ecore_File.h>
-#include <Ecore_Config.h>
 #include <Ecore_Txt.h>
 #include <Ecore_Str.h>
 #include <Edje.h>
 #include <Ecore_Evas.h>
+
 #include <sqlite3.h>
 #include <gettext.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fnmatch.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pthread.h>
+
 #if WITH_IPOD_SUPPORT
 #include <gpod/itdb.h>
 #endif
@@ -82,7 +90,7 @@
    int                 fd_ev_read;
    int                 fd_ev_write;
    Ecore_Fd_Handler   *fd_ev_handler;
-   pthread_t           thread_scan_cover;
+   pthread_t           create_db_thread;
   void              (*func) (Enna_Db * db, char *path);
   
 #if WITH_IPOD_SUPPORT
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_cdda.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_cdda.c 14 Jan 2008 22:16:05 -0000      1.1
+++ enna_cdda.c 28 Jan 2008 18:57:32 -0000      1.2
@@ -48,7 +48,7 @@
 #include "enna_config.h"
 #include "enna_mediaplayer.h"
 #include "enna_util.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 
 #define SMART_NAME "enna_cdda"
 #define API_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if 
((!obj) || (!sd) || (evas_object_type_get(obj) && 
strcmp(evas_object_type_get(obj), SMART_NAME)))
@@ -176,7 +176,7 @@
    Evas_List          *metadatas, *l;
    char                temp[PATH_MAX];
 
-   metadatas = enna_db_cdda_metadata_get(sd->enna->db, device, NULL, NULL);
+   metadatas = NULL;//enna_db_cdda_metadata_get(sd->enna->db, device, NULL, 
NULL);
    if (metadatas)
      {
 
@@ -194,7 +194,7 @@
             sprintf(temp, "%d - %s", metadata->track_nb, metadata->title);
             enna_list_append_with_icon_name(sd->o_files, "icon_cdda", temp,
                                             _track_selected_cb, NULL, sd, id);
-            sd->nb_tracks = metadata->nb_tracks;
+            sd->nb_tracks = 0;
          }
        enna_util_switch_objects(sd->switcher, NULL, sd->o_files);
        enna_list_selected_set(sd->o_files, 0);
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_emotion.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna_emotion.c      22 Jan 2008 19:21:22 -0000      1.2
+++ enna_emotion.c      28 Jan 2008 18:57:32 -0000      1.3
@@ -45,7 +45,7 @@
 #include "enna_emotion.h"
 #include "enna_miniplayer.h"
 #include "enna_config.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 #include "enna_event.h"
 #include "enna_util.h"
 
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_emusic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna_emusic.c       22 Jan 2008 19:21:22 -0000      1.2
+++ enna_emusic.c       28 Jan 2008 18:57:32 -0000      1.3
@@ -44,8 +44,7 @@
 #include "enna_emusic.h"
 #include "enna_miniplayer.h"
 #include "enna_config.h"
-#include "enna_db.h"
-#include "enna_event.h"
+#include "enna_scanner.h"
 #include "enna_util.h"
 
 #define ENNA_EMUSIC_STATE_PLAYING  0
@@ -432,11 +431,11 @@
    enna = evas_data_attach_get(evas_object_evas_get(sd->edje));
    dbg("type : %d\n", sd->music_type);
    if (sd->music_type == ENNA_EMUSIC_TYPE_AUDIO)
-      metadata = enna_metadata_get(enna->db, filename);
+     metadata = enna_scanner_audio_metadata_get(filename);
    else if (sd->music_type == ENNA_EMUSIC_TYPE_CDDA)
      {
-       metadatas =
-          enna_db_cdda_metadata_get(enna->db, "/dev/cdrom", NULL, NULL);
+       /*metadatas =
+         enna_db_cdda_metadata_get(enna->db, "/dev/cdrom", NULL, NULL);*/
        for (l = metadatas; l; l = l->next)
          {
             metadata = l->data;
@@ -451,49 +450,45 @@
      }
    if (metadata)
      {
-       char                tmp[4096];
-
-       edje_object_part_text_set(sd->edje, "enna.text.album", metadata->album);
-       edje_object_part_text_set(sd->edje, "enna.text.title", metadata->title);
-       edje_object_part_text_set(sd->edje, "enna.text.artist",
-                                 metadata->artist);
-
-       sprintf(tmp, "%d / %02d", sd->playlist_id + 1,
-               ecore_list_count(sd->playlist));
-
-       edje_object_part_text_set(sd->edje, "enna.text.current", tmp);
-
-       edje_object_signal_emit(sd->edje, "enna,cover,set", "enna");
-       edje_object_part_swallow(sd->edje, "enna.swallow.cover", sd->cover);
-       edje_object_part_geometry_get(sd->edje, "enna.swallow.cover", NULL,
-                                     NULL, &w, &h);
-
-       if (metadata->cover && metadata->cover[0] != '\0')
-         {
-            evas_object_image_file_set(sd->cover, metadata->cover, NULL);
-         }
-       else
-         {
-            evas_object_image_file_set(sd->cover,
-                                       
"/home/nico/usr/share/enna/no_cover.png",
-                                       NULL);
-         }
+       char  tmp[4096];
+       char *cover;
+       
+       edje_object_part_text_set(sd->edje, "enna.text.album", metadata->album);
+       edje_object_part_text_set(sd->edje, "enna.text.title", metadata->title);
+       edje_object_part_text_set(sd->edje, "enna.text.artist",
+                                 metadata->artist);
+
+       sprintf(tmp, "%d / %02d", sd->playlist_id + 1,
+               ecore_list_count(sd->playlist));
+
+       edje_object_part_text_set(sd->edje, "enna.text.current", tmp);
+
+       edje_object_signal_emit(sd->edje, "enna,cover,set", "enna");
+       edje_object_part_swallow(sd->edje, "enna.swallow.cover", sd->cover);
+       edje_object_part_geometry_get(sd->edje, "enna.swallow.cover", NULL,
+                                     NULL, &w, &h);
+       cover = enna_scanner_cover_get(metadata->album, metadata->artist);
 
-       evas_object_resize(sd->cover, w, h);
-       evas_object_image_fill_set(sd->cover, 0, 0, w, h);
-       enna_miniplayer_infos_set(enna->miniplayer, metadata->title,
-                                 metadata->album, metadata->artist,
-                                 metadata->cover);
+       
+       if (cover)
+         evas_object_image_file_set(sd->cover, cover, NULL);
+       
+       evas_object_resize(sd->cover, w, h);
+       evas_object_image_fill_set(sd->cover, 0, 0, w, h);
+       enna_miniplayer_infos_set(enna->miniplayer, metadata->title,
+                                 metadata->album, metadata->artist,
+                                 cover);
+       ENNA_FREE(cover);
      }
    else
      {
-       edje_object_part_text_set(sd->edje, "enna.text.album", "");
-       edje_object_part_text_set(sd->edje, "enna.text.title", "No Metadata");
-       edje_object_part_text_set(sd->edje, "enna.text.artist", "");
-       edje_object_signal_emit(sd->edje, "enna,cover,unset", "enna");
-       enna = evas_data_attach_get(evas_object_evas_get(sd->edje));
-       enna_miniplayer_infos_set(enna->miniplayer, "", "", "No Metadata",
-                                 NULL);
+       edje_object_part_text_set(sd->edje, "enna.text.album", "");
+       edje_object_part_text_set(sd->edje, "enna.text.title", "No Metadata");
+       edje_object_part_text_set(sd->edje, "enna.text.artist", "");
+       edje_object_signal_emit(sd->edje, "enna,cover,unset", "enna");
+       enna = evas_data_attach_get(evas_object_evas_get(sd->edje));
+       enna_miniplayer_infos_set(enna->miniplayer, "", "", "No Metadata",
+                                 NULL);
      }
    return 1;
 }
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_fm_db.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_fm_db.c        14 Jan 2008 22:16:05 -0000      1.1
+++ enna_fm_db.c        28 Jan 2008 18:57:32 -0000      1.2
@@ -29,38 +29,26 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <fnmatch.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <Evas.h>
-#include <Ecore.h>
-#include <Ecore_File.h>
-#include <Ecore_Str.h>
-#include <Ecore_Evas.h>
-#include <Edje.h>
-#include <pthread.h>
+
 
 #include "enna.h"
 #include "enna_module.h"
 #include "enna_list.h"
 #include "enna_config.h"
 #include "enna_mediaplayer.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 #include "enna_util.h"
+#include "enna_fm_db.h"
 
 #define SMART_NAME "enna_fm_db"
 #define API_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if 
((!obj) || (!sd) || (evas_object_type_get(obj) && 
strcmp(evas_object_type_get(obj), SMART_NAME)))
 #define INTERNAL_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); 
if (!sd) return;
 
 #define ENNA_FM_DB_STATE_UNDEF    0
-#define ENNA_FM_DB_STATE_ARTISTS  1
-#define ENNA_FM_DB_STATE_ALBUM    2
-#define ENNA_FM_DB_STATE_ALBUMS   3
-#define ENNA_FM_DB_STATE_SONGS    4
-#define ENNA_FM_DB_STATE_GENRE    5
+#define ENNA_FM_DB_ARTISTS_VIEW   1
+#define ENNA_FM_DB_ALBUMS_VIEW    2
+#define ENNA_FM_DB_TRACKS_VIEW    3
+
 
 typedef struct _E_Smart_Data E_Smart_Data;
 typedef struct _Thread_Infos Thread_Infos;
@@ -68,51 +56,35 @@
 
 struct _E_Smart_Data
 {
-   Enna               *enna;
-   Evas_Coord          x, y, w, h;
-   Evas_Object        *edje;
-   Evas_Object        *obj;
-   Evas_Object        *switcher;
-   Evas_Object        *o_files;
-   unsigned int        state;
-   unsigned int        root;
-   char               *path;
-   char               *filter;
-   void                (*exe_file_cb) (void *data1, void *data2,
-                                      char *filename);
-   void               *data1;
-   void               *data2;
-   void                (*hilight_file_cb) (void *data1, void *data2,
-                                          char *filename);
-   void               *hilight_data1;
-   void               *hilight_data2;
-   void                (*exit_cb) (void *data1, void *data2);
-   void               *exit_data1;
-   void               *exit_data2;
-   void                (*change_path_cb) (void *data, char *path);
-   void               *change_path_data;
-   Evas_List          *list_data;
+  Enna               *enna;
+  Evas_Coord          x, y, w, h;
+  Evas_Object        *edje;
+  Evas_Object        *obj;
+  Evas_Object        *switcher;
+  Evas_Object        *o_view;
+  char               *artist;
+  char               *album;
+  char               *track;
+  unsigned int        state;
+  void                (*exe_file_cb) (void *data1, void *data2,
+                                     char *filename);
+  void               *data1;
+  void               *data2;
+  void                (*exit_cb) (void *data1, void *data2);
+  void               *exit_data1;
+  void               *exit_data2;
 };
 
-struct _Thread_Infos
-{
-   char               *path;
-   char               *oldpath;
-   E_Smart_Data       *sd;
-};
+/* local subsystem functions */
 
-struct _Db_List_Element
-{
-   char               *filename;
-   char               *item_name;
-   unsigned int        type;
-   unsigned int        is_selected;
-};
+static int          _late_clear(void *data);
+static void         _select_album_cb(void *data, void *data2);
+static void         _select_artist_cb(void *data, void *data2);
+static void         _select_track_cb(void *data, void *data2);
+static void         _display_artists_view(E_Smart_Data * sd);
+static void         _display_albums_view(E_Smart_Data * sd);
+static void         _display_tracks_view(E_Smart_Data * sd);
 
-/* local subsystem functions */
-static void         _scan_db(E_Smart_Data * sd, unsigned int state,
-                            unsigned int old_state);
-static void         _parent_go(E_Smart_Data * sd, char *path);
 static void         _e_smart_reconfigure(E_Smart_Data * sd);
 static void         _e_smart_add(Evas_Object * obj);
 static void         _e_smart_del(Evas_Object * obj);
@@ -145,53 +117,16 @@
    API_ENTRY           return;
 
    if (event == enna_event_escape)
-     {
-       //dbg("enna_fm_db: go_parent ev %d %s\n", event, sd->path);
-       _parent_go(sd, sd->path);
-     }
+     enna_fm_db_parent_go(obj);
    else
-      enna_list_process_event(sd->o_files, event);
-}
-
-/* root_path should be artist, album, genre */
-EAPI int
-enna_fm_db_root_set(Evas_Object * obj, char *root)
-{
-   API_ENTRY           return 0;
-
-   if (!root)
-      return 0;
-
-   if (!strcmp(root, "artist"))
-      sd->root = ENNA_FM_DB_STATE_ARTISTS;
-   else if (!strcmp(root, "album"))
-      sd->root = ENNA_FM_DB_STATE_ALBUMS;
-   else if (!strcmp(root, "genre"))
-      sd->root = ENNA_FM_DB_STATE_GENRE;
-
-   if (sd->o_files)
-      evas_object_del(sd->o_files);
-
-   _scan_db(sd, sd->root, 0);
-   return 1;
-}
-
-EAPI int
-enna_fm_db_filter_set(Evas_Object * obj, char *filter)
-{
-   API_ENTRY           return 0;
-
-   if (!filter)
-      return 0;
-   sd->filter = strdup(filter);
-   return 1;
+     enna_list_process_event(sd->o_view, event);
 }
 
 EAPI int
 enna_fm_db_exe_file_cb_set(Evas_Object * obj,
-                          void (exe_file_cb) (void *data1, void *data2,
-                                              char *filename), void *data1,
-                          void *data2)
+                       void (exe_file_cb) (void *data1, void *data2,
+                                           char *filename), void *data1,
+                       void *data2)
 {
    API_ENTRY           return 0;
 
@@ -201,24 +136,34 @@
    return 1;
 }
 
-EAPI int
-enna_fm_db_hilight_file_cb_set(Evas_Object * obj,
-                              void (hilight_file_cb) (void *data1, void *data2,
-                                                      char *filename),
-                              void *data1, void *data2)
+EAPI void
+enna_fm_db_parent_go(Evas_Object * obj)
 {
-   API_ENTRY           return 0;
-
-   sd->hilight_file_cb = hilight_file_cb;
-   sd->hilight_data1 = data1;
-   sd->hilight_data2 = data2;
-   return 1;
+   API_ENTRY           return;
+   
+   switch (sd->state)
+     {
+      case ENNA_FM_DB_ARTISTS_VIEW:
+        /* exit */
+        if (sd->exit_cb)
+          sd->exit_cb(sd->exit_data1, sd->exit_data2);
+        break;
+      case ENNA_FM_DB_ALBUMS_VIEW:
+        sd->state = ENNA_FM_DB_ARTISTS_VIEW;
+        _display_artists_view(sd);
+        break;
+      case ENNA_FM_DB_TRACKS_VIEW:
+        sd->state = ENNA_FM_DB_ALBUMS_VIEW;
+        _display_albums_view(sd);
+        break;
+   
+     }
 }
 
 EAPI int
 enna_fm_db_exit_cb_set(Evas_Object * obj,
-                      void (exit_cb) (void *data1, void *data2), void *data1,
-                      void *data2)
+                   void (exit_cb) (void *data1, void *data2), void *data1,
+                   void *data2)
 {
    API_ENTRY           return 0;
 
@@ -228,70 +173,169 @@
    return 1;
 }
 
-EAPI int
-enna_fm_db_change_path_cb_set(Evas_Object * obj,
-                             void (change_path_cb) (void *data, char *path),
-                             void *data)
+static int
+_late_clear(void *data)
 {
-   API_ENTRY           return 0;
+   Evas_Object        *obj;
 
-   sd->change_path_cb = change_path_cb;
-   sd->change_path_data = data;
-   return 1;
+   obj = (Evas_Object *) data;
+   evas_object_hide(obj);
+   evas_object_del(obj);
+
+   return 0;
 }
 
-EAPI void
-enna_fm_db_parent_go(Evas_Object * obj)
+static void
+_select_track_cb(void *data, void *data2)
 {
-   API_ENTRY           return;
+   E_Smart_Data       *sd;
+   Enna_Metadata      *m;
 
-   _parent_go(sd, sd->path);
-}
+   sd = (E_Smart_Data *) data;
+   m = (Enna_Metadata *)data2;
 
-/*
-  static void
-  _hilight_file_cb (void *data, void *data2)
-  {
-  E_Smart_Data *sd;
-  char *path;
+   if (!sd || !m)
+     return;
 
-  sd = (E_Smart_Data *) data;
-  path = (char *) data2;
+   if (sd->exe_file_cb)
+      sd->exe_file_cb(sd->data1, sd->data2, m->uri);
 
-  if (sd->hilight_file_cb)
-  sd->hilight_file_cb (sd->hilight_data1, sd->hilight_data2, path);
+}
 
-  }
+static void
+_select_album_cb(void *data, void *data2)
+{
+   E_Smart_Data       *sd;
+   char               *album;
 
-  static void
-  _file_selected_cb (void *data, void *data2)
-  {
-  E_Smart_Data *sd;
-  char *path;
-   
-  sd = (E_Smart_Data *) data;
-  path = (char *) data2;
+   sd = (E_Smart_Data *) data;
+   album = (char *)data2;
 
-  dbg("Item selected %s\n", path);
-   
-  if (sd->exe_file_cb)
-  sd->exe_file_cb (sd->data1, sd->data2, path);
-  }
-*/
+   if (!sd || !album)
+     return;
+
+   sd->album = strdup(album);
+   sd->state = ENNA_FM_DB_TRACKS_VIEW;
+   _display_tracks_view(sd);
+
+}
 
 static void
-_scan_db(E_Smart_Data * sd, unsigned int state, unsigned int old_state)
+_select_artist_cb(void *data, void *data2)
 {
+   E_Smart_Data       *sd;
+   char               *artist;
+
+   sd = (E_Smart_Data *) data;
+   artist = (char *)data2;
+
+   if (!sd || !artist)
+     return;
+
+   sd->artist = strdup(artist);
+   sd->state = ENNA_FM_DB_ALBUMS_VIEW;
+   _display_albums_view(sd);
 
 }
 
-static void
-_parent_go(E_Smart_Data * sd, char *path)
+static void 
+_display_tracks_view(E_Smart_Data * sd)
 {
-   if (!sd || !path || !sd->root)
-      return;
+   Evas_Object *o;
+   Enna_Metadata *item;
+   Ecore_List *list;
+   
+   
+   list = enna_scanner_audio_tracks_of_album_list_get(sd->artist, sd->album);
+   /* FIXME : Sort list by track nb */
+   /* ecore_list_sort(list, ECORE_COMPARE_CB(strcasecmp), ECORE_SORT_MIN);*/
+   ecore_list_first_goto(list);
+   o = sd->o_view;
+   sd->o_view = enna_list_add(evas_object_evas_get(sd->edje));
+   while ((item = (Enna_Metadata *)ecore_list_next(list)) != NULL)
+     {
+       char item_name[PATH_MAX];
+       if (item->track_nb)
+         sprintf(item_name, "%d - %s",item->track_nb, item->title);
+       else
+         sprintf(item_name, "%s",item->title);
+       
+       enna_list_append_with_icon_name(sd->o_view, "icon_music", item_name,
+                        _select_track_cb, NULL, sd,
+                        item);
+     }
+   enna_util_switch_objects(sd->switcher, o, sd->o_view);
+   ecore_timer_add(1.0, _late_clear, o);
+   enna_list_selected_set(sd->o_view, 0);
 }
 
+static void 
+_display_albums_view(E_Smart_Data * sd)
+{
+   Evas_Object *o;
+   char *item_name;
+   Ecore_List *list;
+   int i = 0, to_select = 0;
+   
+   list = enna_scanner_audio_albums_of_artist_list_get(sd->artist);
+   ecore_list_sort(list, ECORE_COMPARE_CB(strcasecmp), ECORE_SORT_MIN);
+   ecore_list_first_goto(list);
+   o = sd->o_view;
+   sd->o_view = enna_list_add(evas_object_evas_get(sd->edje));
+   while ((item_name = (char *)ecore_list_next(list)) != NULL)
+     {
+       
+       enna_list_append_with_icon_name(sd->o_view, "icon_album", item_name,
+                        _select_album_cb, NULL, sd,
+                        item_name);
+       dbg("%s %s\n",sd->album, item_name);
+       
+       if (sd->album && !strcmp(sd->album, item_name))
+         {
+            
+            dbg("found\n");
+            to_select = i;
+            ENNA_FREE(sd->album);
+         }
+       i++;
+
+     }
+   enna_util_switch_objects(sd->switcher, o, sd->o_view);
+   ecore_timer_add(1.0, _late_clear, o);
+   enna_list_selected_set(sd->o_view, to_select);
+}
+
+static void 
+_display_artists_view(E_Smart_Data * sd)
+{
+   Evas_Object *o;
+   char *item_name;
+   Ecore_List *list;
+   int i = 0, to_select = 0;
+   
+   list = enna_scanner_audio_artists_list_get();
+   ecore_list_sort(list, ECORE_COMPARE_CB(strcasecmp), ECORE_SORT_MIN);
+   ecore_list_first_goto(list);
+   o = sd->o_view;
+   sd->o_view = enna_list_add(evas_object_evas_get(sd->edje));
+   while ((item_name = (char *)ecore_list_next(list)) != NULL)
+     {
+       enna_list_append_with_icon_name(sd->o_view, "icon_artist", item_name,
+                        _select_artist_cb, NULL, sd,
+                        item_name);
+       if (sd->artist && !strcmp(sd->artist, item_name))
+         {
+            to_select = i;
+            ENNA_FREE(sd->artist);
+         }
+       i++;
+     }
+   enna_util_switch_objects(sd->switcher, o, sd->o_view);
+   ecore_timer_add(1.0, _late_clear, o);
+   enna_list_selected_set(sd->o_view, to_select);
+}
+
+
 static void
 _e_smart_reconfigure(E_Smart_Data * sd)
 {
@@ -314,26 +358,20 @@
    sd->y = 0;
    sd->w = 0;
    sd->h = 0;
-   sd->state = ENNA_FM_DB_STATE_UNDEF;
    sd->edje = edje_object_add(evas_object_evas_get(obj));
    edje_object_file_set(sd->edje, enna_config_theme_get(), "enna/filemanager");
    evas_object_smart_member_add(sd->edje, obj);
    evas_object_show(sd->edje);
 
    sd->enna = evas_data_attach_get(evas_object_evas_get(sd->edje));
-
+   sd->state = ENNA_FM_DB_ARTISTS_VIEW;
    sd->switcher = edje_object_add(evas_object_evas_get(obj));
    edje_object_file_set(sd->switcher, enna_config_theme_get(), 
"enna/switcher");
    evas_object_smart_member_add(sd->switcher, obj);
    evas_object_show(sd->switcher);
    edje_object_part_swallow(sd->edje, "enna.switcher.swallow", sd->switcher);
-   sd->o_files = NULL;
-   sd->path = NULL;
-   sd->filter = NULL;
-   sd->exe_file_cb = NULL;
-   sd->data1 = NULL;
-   sd->data2 = NULL;
-
+   sd->o_view = NULL;
+   _display_artists_view(sd);
    evas_object_propagate_events_set(obj, 0);
 }
 
@@ -341,11 +379,9 @@
 _e_smart_del(Evas_Object * obj)
 {
    INTERNAL_ENTRY;
-   evas_object_del(sd->o_files);
+   evas_object_del(sd->o_view);
    evas_object_del(sd->switcher);
    evas_object_del(sd->edje);
-   ENNA_FREE(sd->path);
-   ENNA_FREE(sd->filter);
    ENNA_FREE(sd);
 }
 
@@ -408,7 +444,7 @@
    evas_object_clip_unset(sd->edje);
 }
 
-           /* never need to touch this */
+/* never need to touch this */
 
 static void
 _e_smart_init(void)
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_fm_db.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_fm_db.h        14 Jan 2008 22:16:05 -0000      1.1
+++ enna_fm_db.h        28 Jan 2008 18:57:32 -0000      1.2
@@ -1,34 +1,21 @@
 #ifndef _ENNA_FM_DB_H
 #define _ENNA_FM_DB_H
 
+#include "enna.h"
+
 EAPI Evas_Object   *enna_fm_db_add(Evas * evas);
 EAPI void           enna_fm_db_process_event(Evas_Object * obj,
                                             enna_event event);
-EAPI int            enna_fm_db_root_set(Evas_Object * obj, char *root_path);
-EAPI int            enna_fm_db_filter_set(Evas_Object * obj, char *filter);
 EAPI int            enna_fm_db_exe_file_cb_set(Evas_Object * obj,
                                               void (exe_file_cb) (void *data1,
                                                                   void *data2,
                                                                   char
                                                                   *filename),
                                               void *data1, void *data2);
-EAPI int            enna_fm_db_hilight_file_cb_set(Evas_Object * obj,
-                                                  void (hilight_file_cb) (void
-                                                                          
*data1,
-                                                                          void
-                                                                          
*data2,
-                                                                          char
-                                                                          
*filename),
-                                                  void *data1, void *data2);
 EAPI int            enna_fm_db_exit_cb_set(Evas_Object * obj,
                                           void (exit_cb) (void *data1,
                                                           void *data2),
                                           void *data1, void *data2);
-EAPI int            enna_fm_db_change_path_cb_set(Evas_Object * obj,
-                                                 void (change_path_cb) (void
-                                                                        *data,
-                                                                        char
-                                                                        *path),
-                                                 void *data);
+
 EAPI void           enna_fm_db_parent_go(Evas_Object * obj);
 #endif
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_mediaplayer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_mediaplayer.c  14 Jan 2008 22:16:05 -0000      1.1
+++ enna_mediaplayer.c  28 Jan 2008 18:57:32 -0000      1.2
@@ -46,7 +46,7 @@
 #include "enna_emotion.h"
 #include "enna_miniplayer.h"
 #include "enna_config.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 #include "enna_event.h"
 #include "enna_module.h"
 #include "enna_mainmenu.h"
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_module_music.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_module_music.c 14 Jan 2008 22:16:05 -0000      1.1
+++ enna_module_music.c 28 Jan 2008 18:57:32 -0000      1.2
@@ -49,7 +49,7 @@
 #include "enna_config.h"
 #include "enna_volume_manager.h"
 #include "enna_cdda.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 #include "enna_util.h"
 #include "enna_popup.h"
 #include "enna_reflection.h"
@@ -135,6 +135,9 @@
 {
    API_ENTRY           return;
 
+   dbg("event : %d\n", event);
+   
+
    if (sd->state == MUSIC_MODULE_STATE_MAINMENU)
      {
        enna_list_process_event(sd->menu, event);
@@ -150,9 +153,10 @@
        else
           enna_list_process_event(sd->menu_music, event);
      }
-   else if (sd->state == MUSIC_MODULE_STATE_BROWSE_DB
-           || sd->state == MUSIC_MODULE_STATE_BROWSE_FOLDER)
+   else if ( sd->state == MUSIC_MODULE_STATE_BROWSE_FOLDER)
      {
+       dbg("event\n");
+       
        if ((event == enna_event_1))
          {
             sd->popup = enna_popup_add(sd->enna->evas);
@@ -170,8 +174,7 @@
         * } */
        enna_fm_process_event(sd->fm, event);
      }
-   else if (sd->state == MUSIC_MODULE_STATE_BROWSE_FOLDER
-           || sd->state == MUSIC_MODULE_STATE_BROWSE_DB)
+   else if ( sd->state == MUSIC_MODULE_STATE_BROWSE_DB)
      {
        enna_fm_db_process_event(sd->fm, event);
      }
@@ -295,51 +298,58 @@
 
        edje_object_signal_emit(sd->edje, "enna,state,infos,hide", "enna");
        enna = evas_data_attach_get(evas_object_evas_get(sd->edje));
-       metadata = enna_metadata_get(enna->db, filename);
-       edje_object_part_text_set(sd->edje, "text.album", metadata->album);
-       edje_object_part_text_set(sd->edje, "text.title", metadata->title);
-       edje_object_part_text_set(sd->edje, "text.artist", metadata->artist);
-       edje_object_part_text_set(sd->edje, "text.filename",
-                                 ecore_file_file_get(filename));
-
-       edje_object_part_text_set(sd->edje, "text.genre", metadata->genre);
-
-       mb = metadata->size / (1024 * 1024);
-       kb = metadata->size / 1024 - (mb * 1024);
-       snprintf(tmp, sizeof(tmp), "%li,%li MB", mb, kb);
-       edje_object_part_text_set(sd->edje, "text.size", tmp);
-       m = metadata->duration / 60;
-       s = metadata->duration - (m * 60);
-       snprintf(tmp2, sizeof(tmp2), "%02li mn %02li sec", m, s);
-       edje_object_part_text_set(sd->edje, "text.duration", tmp2);
 
-       if (metadata->cover)
+       metadata = enna_scanner_audio_metadata_get(filename);
+       if (metadata)
          {
-            edje_object_part_unswallow(sd->edje, sd->cover);
-            evas_object_hide(sd->cover);
-            evas_object_del(sd->cover);
-            sd->cover = enna_reflection_add(evas_object_evas_get(sd->edje));
-            edje_object_part_swallow(sd->edje, "cover.swallow", sd->cover);
-            edje_object_part_geometry_get(sd->edje, "cover.swallow", NULL,
-                                          NULL, &w, &h);
-            enna_reflection_file_set(sd->cover, metadata->cover);
-            evas_object_resize(sd->cover, w, h);
+            char *cover;
+            
+            edje_object_part_text_set(sd->edje, "text.album", metadata->album);
+            edje_object_part_text_set(sd->edje, "text.title", metadata->title);
+            edje_object_part_text_set(sd->edje, "text.artist", 
metadata->artist);
+            edje_object_part_text_set(sd->edje, "text.filename",
+                                      ecore_file_file_get(filename));
+
+            edje_object_part_text_set(sd->edje, "text.genre", metadata->genre);
+
+            mb = metadata->size / (1024 * 1024);
+            kb = metadata->size / 1024 - (mb * 1024);
+            snprintf(tmp, sizeof(tmp), "%li,%li MB", mb, kb);
+            edje_object_part_text_set(sd->edje, "text.size", tmp);
+            //m = metadata->duration / 60;
+            //s = metadata->duration - (m * 60);
+            //snprintf(tmp2, sizeof(tmp2), "%02li mn %02li sec", m, s);
+            //edje_object_part_text_set(sd->edje, "text.duration", tmp2);
+            cover = (char*)enna_scanner_cover_get(metadata->album, 
metadata->artist);
+            if (cover)
+              {
+                 edje_object_part_unswallow(sd->edje, sd->cover);
+                 evas_object_hide(sd->cover);
+                 evas_object_del(sd->cover);
+                 sd->cover = 
enna_reflection_add(evas_object_evas_get(sd->edje));
+                 edje_object_part_swallow(sd->edje, "cover.swallow", 
sd->cover);
+                 edje_object_part_geometry_get(sd->edje, "cover.swallow", NULL,
+                                               NULL, &w, &h);
+                 enna_reflection_file_set(sd->cover, cover);
+                 evas_object_resize(sd->cover, w, h);
+              }
+            else
+              {
+                 edje_object_part_unswallow(sd->edje, sd->cover);
+                 evas_object_hide(sd->cover);
+                 evas_object_del(sd->cover);
+                 sd->cover = edje_object_add(evas_object_evas_get(sd->obj));
+                 edje_object_file_set(sd->edje, enna_config_theme_get(), 
"unknown_cover");
+                 
+                 edje_object_part_geometry_get(sd->edje, "enna.cover.swallow", 
NULL, NULL, &w, &h);
+                 edje_extern_object_min_size_set(sd->cover, w, h);
+                 edje_object_part_swallow(sd->edje, "enna.cover.swallow", 
sd->cover);
+                 evas_object_resize(sd->cover, w, h);
+                 evas_object_show(sd->cover); 
+              }
+            edje_object_signal_emit(sd->edje, "enna,state,infos,show", "enna");
          }
-       else
-         {
-            edje_object_part_unswallow(sd->edje, sd->cover);
-            evas_object_hide(sd->cover);
-            evas_object_del(sd->cover);
-            /*sd->cover = edje_object_add(evas_object_evas_get(sd->obj));
-             * edje_object_file_set(sd->edje, enna_config_theme_get(), 
"unknown_cover");
-             * 
-             * edje_object_part_geometry_get(sd->edje, "enna.cover.swallow", 
NULL, NULL, &w, &h);
-             * edje_extern_object_min_size_set(sd->cover, w, h);
-             * edje_object_part_swallow(sd->edje, "enna.cover.swallow", 
sd->cover);
-             * evas_object_resize(sd->cover, w, h);
-             * evas_object_show(sd->cover); */
-         }
-       edje_object_signal_emit(sd->edje, "enna,state,infos,show", "enna");
+       
      }
 
 }
@@ -400,7 +410,6 @@
    edje_object_signal_emit(sd->edje, "enna,state,path,show", "enna");
    enna_fm_exe_file_cb_set(sd->fm, _play_radio_cb, sd, NULL);
    enna_fm_exit_cb_set(sd->fm, _exit_fm_cb, sd, NULL);
-   enna_fm_exit_cb_set(sd->fm, _exit_fm_cb, sd, NULL);
 
 }
 
@@ -436,11 +445,6 @@
 
    mount_point = (char *)data2;
    dbg("Ipod Mount Point %s\n", mount_point);
-#if WITH_IPOD_SUPPORT
-   sd->enna->ipod_db = enna_db_ipod_init(sd->enna, mount_point);
-#else
-
-#endif
 
 }
 
@@ -462,15 +466,13 @@
      {
        enna_util_switch_objects(sd->switcher, sd->menu, sd->fm);
        ecore_timer_add(1.0, _late_clear, sd->menu);
-       sd->state = MUSIC_MODULE_STATE_BROWSE_FOLDER;
      }
    else
      {
-
        enna_util_switch_objects(sd->switcher, sd->menu_music, sd->fm);
        ecore_timer_add(1.0, _late_clear, sd->menu_music);
-       sd->state = MUSIC_MODULE_STATE_BROWSE_DB;
      }
+   sd->state = MUSIC_MODULE_STATE_BROWSE_FOLDER;
    enna_fm_filter_set(sd->fm, "music");
    enna_fm_root_set(sd->fm, root_path);
    edje_object_signal_emit(sd->edje, "enna,state,path,hide", "enna");
@@ -500,14 +502,13 @@
    enna_util_switch_objects(sd->switcher, sd->menu_music, sd->fm);
    ecore_timer_add(1.0, _late_clear, sd->menu_music);
    sd->state = MUSIC_MODULE_STATE_BROWSE_DB;
-   enna_fm_db_root_set(sd->fm, data2);
    edje_object_signal_emit(sd->edje, "enna,state,path,hide", "enna");
    edje_object_part_text_set(sd->edje, "enna.text.path", "Digital Corner");
    edje_object_signal_emit(sd->edje, "enna,state,path,show", "enna");
    enna_fm_db_exe_file_cb_set(sd->fm, _play_file_cb, sd, NULL);
-   enna_fm_db_hilight_file_cb_set(sd->fm, _hilight_file_cb, sd, NULL);
+   //enna_fm_db_hilight_file_cb_set(sd->fm, _hilight_file_cb, sd, NULL);
    enna_fm_db_exit_cb_set(sd->fm, _exit_fm_cb, sd, NULL);
-   enna_fm_db_change_path_cb_set(sd->fm, _fm_change_path_cb, sd);
+   //enna_fm_db_change_path_cb_set(sd->fm, _fm_change_path_cb, sd);
 
 }
 
@@ -523,7 +524,7 @@
                                   "Browse by Artist",
                                   _listen_to_music_by_artist_cb, NULL, sd,
                                   "artist");
-   enna_list_append_with_icon_name(sd->menu_music, "icon_cdda",
+   /* enna_list_append_with_icon_name(sd->menu_music, "icon_cdda",
                                   "Browse by Album",
                                   _listen_to_music_by_artist_cb, NULL, sd,
                                   "album");
@@ -534,7 +535,7 @@
    enna_list_append_with_icon_name(sd->menu_music, "icon_cdda", "Search Music",
                                   _listen_to_music_by_folder_cb, NULL, sd,
                                   NULL);
-
+   */
    enna_list_selected_set(sd->menu_music, 0);
    enna_util_switch_objects(sd->switcher, sd->menu, sd->menu_music);
    ecore_timer_add(1.0, _late_clear, sd->menu);
@@ -702,7 +703,7 @@
        _update_mainmenu(sd);
        break;
      case MUSIC_MODULE_STATE_BROWSE_DB:
-       enna_fm_db_parent_go(sd->fm);
+       //enna_fm_db_parent_go(sd->fm);
        break;
      default:
        dbg("I'm a got, state unknown\n");
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_popup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_popup.c        14 Jan 2008 22:16:05 -0000      1.1
+++ enna_popup.c        28 Jan 2008 18:57:32 -0000      1.2
@@ -41,7 +41,7 @@
 #include "enna_config.h"
 #include "enna_volume_manager.h"
 #include "enna_cdda.h"
-#include "enna_db.h"
+#include "enna_scanner.h"
 #include "enna_util.h"
 
 #define SMART_NAME "enna_popup"
@@ -129,7 +129,7 @@
          {
             printf("add ipod song\n");
 
-            enna_db_add_song_to_ipod_db(sd->enna->ipod_db, sd->filename);
+            //enna_db_add_song_to_ipod_db(sd->enna->ipod_db, sd->filename);
          }
 
      }



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to