Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
Makefile.am eclair.c eclair_config.c eclair_media_file.c
eclair_media_file.h eclair_meta_tag.c eclair_private.h
eclair_utils.c eclair_utils.h
Added Files:
eclair_database.c eclair_database.h
Log Message:
* Meta tags of the media files opened are now stored in a database, which
really speed up the read of meta tags for a file that has been already opened
by eclair. Database support will also permit to perform fast searches.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 10 Jun 2005 18:30:46 -0000 1.8
+++ Makefile.am 18 Jun 2005 16:00:34 -0000 1.9
@@ -12,7 +12,8 @@
@emotion_cflags@ \
@esmart_cflags@ \
@taglib_cflags@ \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
AM_CFLAGS = \
-Wall \
@@ -34,7 +35,8 @@
eclair_meta_tag.c eclair_meta_tag.h \
eclair_config.c eclair_config.h \
eclair_dialogs.c eclair_dialogs.h \
-eclair_window.c eclair_window.h
+eclair_window.c eclair_window.h \
+eclair_database.c eclair_database.h
eclair_LDADD = \
@gthread_libs@ \
@@ -46,4 +48,5 @@
@emotion_libs@ \
@esmart_libs@ -lesmart_draggies \
@taglib_libs@ -ltag_c \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- eclair.c 10 Jun 2005 18:30:46 -0000 1.20
+++ eclair.c 18 Jun 2005 16:00:34 -0000 1.21
@@ -20,6 +20,7 @@
#include "eclair_args.h"
#include "eclair_dialogs.h"
#include "eclair_window.h"
+#include "eclair_database.h"
static void *_eclair_create_video_object_thread(void *param);
static Evas_Bool _eclair_create_gui_window(Eclair *eclair);
@@ -76,6 +77,7 @@
return 0;
eclair_config_init(&eclair->config);
+ eclair_utils_init();
if (!_eclair_create_gui_window(eclair))
{
eclair_config_shutdown(&eclair->config);
@@ -86,6 +88,7 @@
_eclair_create_cover_window(eclair);
_eclair_create_video_window(eclair);
_eclair_add_inter_windows_callbacks(eclair);
+ eclair_database_init(&eclair->database, eclair);
eclair_dialogs_init(&eclair->dialogs_manager, eclair);
eclair_playlist_init(&eclair->playlist, eclair);
eclair_playlist_container_set_media_list(eclair->playlist_container,
&eclair->playlist.playlist);
@@ -93,7 +96,7 @@
eclair_meta_tag_init(&eclair->meta_tag_manager, eclair);
eclair_cover_init(&eclair->cover_manager, eclair);
eclair_update_current_file_info(eclair, 0);
-
+
if ((l = filenames))
{
for (; l; l = l->next)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eclair_config.c 27 May 2005 20:28:22 -0000 1.8
+++ eclair_config.c 18 Jun 2005 16:00:34 -0000 1.9
@@ -28,6 +28,7 @@
ecore_file_mkdir(config->covers_dir_path);
sprintf(config->config_file_path, "%seclair.cfg", config->config_dir_path);
sprintf(config->default_playlist_path, "%splaylist.m3u",
config->config_dir_path);
+ sprintf(config->database_path, "%seclair.db", config->config_dir_path);
eclair_config_load(config);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_media_file.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- eclair_media_file.c 10 Jun 2005 18:30:46 -0000 1.9
+++ eclair_media_file.c 18 Jun 2005 16:00:34 -0000 1.10
@@ -104,3 +104,25 @@
if (media_file == eclair_playlist_current_media_file(&eclair->playlist))
eclair_update_current_file_info(eclair, 0);
}
+
+//Set the value of a meta tag field string of the media file
+void eclair_media_file_set_field_string(char **field, const char *value)
+{
+ const char *c1;
+ char *c2;
+
+ if (!field)
+ return;
+
+ free(*field);
+ if (!value)
+ *field = NULL;
+ else
+ {
+ //We remove the blanks before and after the meta tag value
+ for (c1 = value; *c1 != 0 && *c1 <= 32; c1++);
+ *field = strdup(c1);
+ for (c2 = *field + strlen(*field); c2 >= *field && *c2 <= 32; c2--)
+ *c2 = 0;
+ }
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_media_file.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eclair_media_file.h 30 Apr 2005 12:11:16 -0000 1.1
+++ eclair_media_file.h 18 Jun 2005 16:00:34 -0000 1.2
@@ -6,5 +6,6 @@
Eclair_Media_File *eclair_media_file_new();
void eclair_media_file_free(Eclair_Media_File *media_file);
void eclair_media_file_update(Eclair *eclair, Eclair_Media_File *media_file);
+void eclair_media_file_set_field_string(char **field, const char *value);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_meta_tag.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eclair_meta_tag.c 10 Jun 2005 18:30:46 -0000 1.11
+++ eclair_meta_tag.c 18 Jun 2005 16:00:35 -0000 1.12
@@ -6,9 +6,9 @@
#include "eclair.h"
#include "eclair_cover.h"
#include "eclair_media_file.h"
+#include "eclair_database.h"
static void *_eclair_meta_tag_thread(void *param);
-static void _eclair_meta_tag_set_field_string(char **field, const char *value);
//Initialize meta tag manager
void eclair_meta_tag_init(Eclair_Meta_Tag_Manager *meta_tag_manager, Eclair
*eclair)
@@ -61,20 +61,24 @@
TagLib_File *tag_file;
TagLib_Tag *tag;
const TagLib_AudioProperties *tag_audio_props;
+ Evas_Bool need_to_update;
if (!eclair || !media_file || !media_file->path)
return;
+ if (eclair_database_search(&eclair->database, media_file, &need_to_update)
&& !need_to_update)
+ return;
+
if (!(tag_file = taglib_file_new(media_file->path)))
return;
if ((tag = taglib_file_tag(tag_file)))
{
- _eclair_meta_tag_set_field_string(&media_file->artist,
taglib_tag_artist(tag));
- _eclair_meta_tag_set_field_string(&media_file->title,
taglib_tag_title(tag));
- _eclair_meta_tag_set_field_string(&media_file->album,
taglib_tag_album(tag));
- _eclair_meta_tag_set_field_string(&media_file->genre,
taglib_tag_genre(tag));
- _eclair_meta_tag_set_field_string(&media_file->comment,
taglib_tag_comment(tag));
+ eclair_media_file_set_field_string(&media_file->artist,
taglib_tag_artist(tag));
+ eclair_media_file_set_field_string(&media_file->title,
taglib_tag_title(tag));
+ eclair_media_file_set_field_string(&media_file->album,
taglib_tag_album(tag));
+ eclair_media_file_set_field_string(&media_file->genre,
taglib_tag_genre(tag));
+ eclair_media_file_set_field_string(&media_file->comment,
taglib_tag_comment(tag));
media_file->year = taglib_tag_year(tag);
media_file->track = taglib_tag_track(tag);
}
@@ -87,6 +91,9 @@
taglib_tag_free_strings();
taglib_file_free(tag_file);
+ //Insert the new tag infos in the database
+ eclair_database_insert_media_file(&eclair->database, media_file);
+
//Try to load the cover
if (tag && !media_file->cover_path && !(media_file->cover_path =
eclair_cover_file_get_from_local(&eclair->cover_manager, media_file->artist,
media_file->album, media_file->path)))
eclair_cover_add_file_to_treat(&eclair->cover_manager, media_file);
@@ -156,25 +163,3 @@
}
return NULL;
}
-
-//Set the value of a meta tag field string
-static void _eclair_meta_tag_set_field_string(char **field, const char *value)
-{
- const char *c1;
- char *c2;
-
- if (!field)
- return;
-
- free(*field);
- if (!value)
- *field = NULL;
- else
- {
- //We remove the blanks before and after the meta tag value
- for (c1 = value; *c1 != 0 && *c1 <= 32; c1++);
- *field = strdup(c1);
- for (c2 = *field + strlen(*field); c2 >= *field && *c2 <= 32; c2--)
- *c2 = 0;
- }
-}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_private.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- eclair_private.h 10 Jun 2005 18:30:46 -0000 1.19
+++ eclair_private.h 18 Jun 2005 16:00:35 -0000 1.20
@@ -10,6 +10,7 @@
#include <glade/glade.h>
#include <pthread.h>
#include <libxml/tree.h>
+#include <sqlite3.h>
typedef struct _Eclair Eclair;
typedef enum _Eclair_State Eclair_State;
@@ -30,6 +31,13 @@
typedef struct _Eclair_Playlist_Container_Object
Eclair_Playlist_Container_Object;
typedef struct _Eclair_Color Eclair_Color;
typedef struct _Eclair_Window Eclair_Window;
+typedef struct _Eclair_Database Eclair_Database;
+
+struct _Eclair_Database
+{
+ sqlite3 *db;
+ Eclair *eclair;
+};
struct _Eclair_Color
{
@@ -81,6 +89,7 @@
char covers_dir_path[256];
char config_file_path[256];
char default_playlist_path[256];
+ char database_path[256];
xmlDocPtr config_doc;
xmlNodePtr root_node;
};
@@ -282,6 +291,7 @@
Eclair_Meta_Tag_Manager meta_tag_manager;
Eclair_Cover_Manager cover_manager;
Eclair_Config config;
+ Eclair_Database database;
Evas_Bool start_playing;
double seek_to_pos;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eclair_utils.c 10 Jun 2005 18:30:46 -0000 1.6
+++ eclair_utils.c 18 Jun 2005 16:00:35 -0000 1.7
@@ -2,6 +2,12 @@
#include <Ecore_File.h>
#include <string.h>
+//Need to be called for the random generation
+void eclair_utils_init()
+{
+ srand((unsigned int)time(NULL));
+}
+
//Convert the progress rate in seconds to a string depending to the length of
the media
void eclair_utils_second_to_string(double position, double length, char
*string)
{
@@ -17,7 +23,7 @@
}
//TODO:
-/*srand((unsigned int)time(NULL));
+/*
return (float)rand() / (float)RAND_MAX * (Max - Min) + Min;
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_utils.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eclair_utils.h 10 Jun 2005 18:30:46 -0000 1.5
+++ eclair_utils.h 18 Jun 2005 16:00:35 -0000 1.6
@@ -3,6 +3,7 @@
#include "eclair_private.h"
+void eclair_utils_init();
void eclair_utils_second_to_string(double position, double length, char
*string);
char *eclair_utils_mediafile_to_artist_title_string(const Eclair_Media_File
*media_file);
char *eclair_utils_add_uri_special_chars(const char *uri);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs