Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
Makefile.am eclair.c eclair.h eclair_args.c eclair_args.h
eclair_callbacks.c eclair_callbacks.h eclair_config.h
eclair_cover.c eclair_cover.h eclair_database.c
eclair_database.h eclair_dialogs.c eclair_dialogs.h
eclair_media_file.c eclair_media_file.h eclair_meta_tag.c
eclair_meta_tag.h eclair_playlist.c eclair_playlist.h
eclair_playlist_container.c eclair_playlist_container.h
eclair_subtitles.c eclair_subtitles.h eclair_utils.c
eclair_utils.h eclair_video.c eclair_video.h eclair_window.c
eclair_window.h
Added Files:
eclair_types.h
Removed Files:
eclair_private.h
Log Message:
* Fix meta tag reading
* Restructure the source files: struct declarations are now done in
the corresponding header instead of putting all of them in
eclair_private.h
* Start to work on the search thing but it's currently disabled
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 9 Jul 2005 12:27:31 -0000 1.11
+++ Makefile.am 10 Jul 2005 19:15:21 -0000 1.12
@@ -22,6 +22,7 @@
bin_PROGRAMS = eclair
eclair_SOURCES = \
+eclair_types.h \
eclair.c eclair.h \
eclair_args.c eclair_args.h \
eclair_utils.c eclair_utils.h \
@@ -29,7 +30,6 @@
eclair_media_file.c eclair_media_file.h \
eclair_playlist.c eclair_playlist.h \
eclair_playlist_container.c eclair_playlist_container.h \
-eclair_private.h \
eclair_subtitles.c eclair_subtitles.h \
eclair_cover.c eclair_cover.h \
eclair_meta_tag.c eclair_meta_tag.h \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- eclair.c 9 Jul 2005 12:27:31 -0000 1.27
+++ eclair.c 10 Jul 2005 19:15:21 -0000 1.28
@@ -6,21 +6,12 @@
#include <Ecore_Evas.h>
#include <Edje.h>
#include <Emotion.h>
-#include <Esmart/Esmart_Draggies.h>
-#include "eclair_playlist.h"
#include "eclair_playlist_container.h"
#include "eclair_media_file.h"
#include "eclair_callbacks.h"
-#include "eclair_subtitles.h"
-#include "eclair_meta_tag.h"
-#include "eclair_cover.h"
#include "eclair_utils.h"
-#include "eclair_config.h"
#include "eclair_args.h"
-#include "eclair_dialogs.h"
#include "eclair_window.h"
-#include "eclair_database.h"
-#include "eclair_video.h"
static Evas_Bool _eclair_create_gui_window(Eclair *eclair);
static Evas_Bool _eclair_create_playlist_window(Eclair *eclair);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- eclair.h 10 Jun 2005 18:30:46 -0000 1.9
+++ eclair.h 10 Jul 2005 19:15:21 -0000 1.10
@@ -1,7 +1,58 @@
#ifndef _ECLAIR_H_
#define _ECLAIR_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include "eclair_video.h"
+#include "eclair_playlist.h"
+#include "eclair_subtitles.h"
+#include "eclair_dialogs.h"
+#include "eclair_meta_tag.h"
+#include "eclair_cover.h"
+#include "eclair_config.h"
+#include "eclair_database.h"
+#include "eclair_types.h"
+
+struct _Eclair
+{
+ //Video related vars
+ Eclair_Video video;
+ Eclair_Engine video_engine;
+
+ //Gui related vars
+ Eclair_Window *gui_window;
+ Eclair_Window *playlist_window;
+ Eclair_Window *equalizer_window;
+ Eclair_Window *cover_window;
+ Evas_Object *playlist_container;
+ Eclair_Window *playlist_container_owner;
+ Evas_Object *previous_cover;
+ Evas_Object *cover;
+ Eclair_Window *cover_owner;
+
+ Evas_Bool use_progress_bar_drag_for_time;
+ Evas_Bool dont_update_progressbar;
+ char *gui_theme_file;
+ int playlist_entry_height;
+ Eclair_Engine gui_engine;
+ Eclair_Drop_Object drop_object;
+ Eclair_Window *drop_window;
+
+ //Core vars
+ Eclair_State state;
+ Eclair_Playlist playlist;
+ Eclair_Subtitles subtitles;
+ Eclair_Dialogs_Manager dialogs_manager;
+ 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;
+
+ //Arguments
+ int *argc;
+ char ***argv;
+};
//core functions
Evas_Bool eclair_init(Eclair *eclair, int *argc, char ***argv);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_args.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eclair_args.c 9 Jul 2005 12:27:31 -0000 1.7
+++ eclair_args.c 10 Jul 2005 19:15:21 -0000 1.8
@@ -1,5 +1,6 @@
#include "eclair_args.h"
#include <getopt.h>
+#include "eclair.h"
static void _eclair_args_print_usage();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_args.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_args.h 18 May 2005 15:36:25 -0000 1.2
+++ eclair_args.h 10 Jul 2005 19:15:21 -0000 1.3
@@ -1,7 +1,8 @@
#ifndef _ECLAIR_ARGS_H_
#define _ECLAIR_ARGS_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include "eclair_types.h"
Evas_Bool eclair_args_parse(Eclair *eclair, Evas_List **filenames);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_callbacks.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- eclair_callbacks.c 9 Jul 2005 12:27:31 -0000 1.21
+++ eclair_callbacks.c 10 Jul 2005 19:15:21 -0000 1.22
@@ -1,13 +1,12 @@
#include "eclair_callbacks.h"
#include <string.h>
#include <Emotion.h>
-#include <Edje.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
+#include <Ecore_X.h>
#include "eclair.h"
#include "eclair_playlist.h"
#include "eclair_playlist_container.h"
-#include "eclair_cover.h"
#include "eclair_dialogs.h"
#include "eclair_window.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_callbacks.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- eclair_callbacks.h 9 Jul 2005 12:27:31 -0000 1.12
+++ eclair_callbacks.h 10 Jul 2005 19:15:21 -0000 1.13
@@ -1,7 +1,8 @@
#ifndef _ECLAIR_CALLBACKS_H_
#define _ECLAIR_CALLBACKS_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <Edje.h>
int eclair_exit_cb(void *data, int type, void *event);
void eclair_key_press_cb(void *data, Evas *evas, Evas_Object *obj, void
*event_info);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_config.h 18 May 2005 15:36:25 -0000 1.2
+++ eclair_config.h 10 Jul 2005 19:15:21 -0000 1.3
@@ -1,7 +1,20 @@
#ifndef _ECLAIR_CONFIG_H_
#define _ECLAIR_CONFIG_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <libxml/tree.h>
+#include "eclair_types.h"
+
+struct _Eclair_Config
+{
+ char config_dir_path[256];
+ 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;
+};
Evas_Bool eclair_config_init(Eclair_Config *config);
void eclair_config_shutdown(Eclair_Config *config);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_cover.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- eclair_cover.c 4 Jul 2005 18:33:57 -0000 1.15
+++ eclair_cover.c 10 Jul 2005 19:15:21 -0000 1.16
@@ -19,17 +19,20 @@
#define NUM_EXTENSIONS 3
#define NUM_COVER_NAMES 2
-typedef struct _Eclair_Cover_Packet_Chunk
+typedef struct _Eclair_Cover_Packet_Chunk Eclair_Cover_Packet_Chunk;
+typedef struct _Eclair_Cover_Not_In_DB_Album Eclair_Cover_Not_In_DB_Album;
+
+struct _Eclair_Cover_Packet_Chunk
{
int size;
char *data;
-} Eclair_Cover_Packet_Chunk;
+};
-typedef struct _Eclair_Cover_Not_In_DB_Album
+struct _Eclair_Cover_Not_In_DB_Album
{
char *artist;
char *album;
-} Eclair_Cover_Not_In_DB_Album;
+};
const char *amazon_hostname = "webservices.amazon.com";
const char *amazon_license_key = "0P1862RFDFSF4KYZQNG2";
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_cover.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eclair_cover.h 8 May 2005 12:29:06 -0000 1.6
+++ eclair_cover.h 10 Jul 2005 19:15:22 -0000 1.7
@@ -1,7 +1,25 @@
#ifndef _ECLAIR_COVER_H_
#define _ECLAIR_COVER_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <pthread.h>
+#include "eclair_types.h"
+
+struct _Eclair_Cover_Manager
+{
+ Eclair_Add_File_State cover_add_state;
+ Evas_List *cover_files_to_add;
+ Evas_List *cover_files_to_treat;
+ Evas_List *not_in_amazon_db;
+
+ Evas_Bool cover_should_treat_files;
+ Evas_Bool cover_delete_thread;
+ pthread_cond_t cover_cond;
+ pthread_mutex_t cover_mutex;
+ pthread_t cover_thread;
+
+ Eclair *eclair;
+};
void eclair_cover_init(Eclair_Cover_Manager *cover_manager, Eclair *eclair);
void eclair_cover_shutdown(Eclair_Cover_Manager *cover_manager);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_database.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_database.c 1 Jul 2005 14:25:39 -0000 1.2
+++ eclair_database.c 10 Jul 2005 19:15:22 -0000 1.3
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <sqlite3.h>
+#include "eclair.h"
#include "eclair_media_file.h"
//Init the eclair database (eventually create the db, then open it)
@@ -90,8 +90,10 @@
}
//Search a file from its path (media_file->path should not be NULL)
+//And if the file is found, fill the meta infos if the media_file
+//need_to_update will be set to 1 if the file in the database is older than
the file on the disk
//Return 1 if the media file has been found in the database
-Evas_Bool eclair_database_search(Eclair_Database *database, Eclair_Media_File
*media_file, Evas_Bool *need_to_update)
+Evas_Bool eclair_database_get_meta_infos(Eclair_Database *database,
Eclair_Media_File *media_file, Evas_Bool *need_to_update)
{
int result;
char *error_msg;
@@ -137,21 +139,20 @@
return 1;
}
-//Search a file from its path (media_file->path should not be NULL)
-Evas_Bool eclair_database_search2(Eclair_Database *database, const char
*keyword)
+//Search files from keywords
+//Store the result in table_result
+//Return 1 if succes. Result have to be freed by calling
eclair_database_free_result()
+Evas_Bool eclair_database_search(Eclair_Database *database, const char
*keyword, char ***table_result, int *nrows, int *ncols)
{
int result;
char *error_msg;
char *query;
- char **table_result;
- int nrows, ncols, i, j;
- if (!database || !keyword)
+ if (!database || !keyword || !table_result || !nrows || !ncols)
return 0;
- query = sqlite3_mprintf("SELECT * FROM media_files WHERE artist LIKE
'%q%%'", keyword);
- printf("%s\n", query);
- result = sqlite3_get_table(database->db, query, &table_result, &nrows,
&ncols, &error_msg);
+ query = sqlite3_mprintf("SELECT * FROM media_files WHERE artist LIKE
'%%%q%%' or title LIKE '%%%q%%' or album LIKE '%%%q%%'", keyword, keyword,
keyword);
+ result = sqlite3_get_table(database->db, query, table_result, nrows, ncols,
&error_msg);
if (result != SQLITE_OK)
{
fprintf(stderr, "Database: Unable to select data from \"media_files\"
table: %s\n", error_msg);
@@ -161,17 +162,13 @@
}
sqlite3_free(query);
- for (i = 0; i <= nrows; i++)
- {
- for (j = 0; j < ncols; j++)
- printf("%s | ", table_result[ncols * i + j]);
- printf("\n");
- }
- printf("\n");
+ return 1;
+}
+//Free the result returned by eclair_database_search
+void eclair_database_free_result(char **table_result)
+{
sqlite3_free_table(table_result);
-
- return 1;
}
//Close the database
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_database.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_database.h 1 Jul 2005 14:25:39 -0000 1.2
+++ eclair_database.h 10 Jul 2005 19:15:22 -0000 1.3
@@ -1,12 +1,21 @@
#ifndef _ECLAIR_DATABASE_H_
#define _ECLAIR_DATABASE_H_
-#include "eclair_private.h"
+#include <sqlite3.h>
+#include <Evas.h>
+#include "eclair_types.h"
+
+struct _Eclair_Database
+{
+ sqlite3 *db;
+ Eclair *eclair;
+};
Evas_Bool eclair_database_init(Eclair_Database *database, Eclair *eclair);
void eclair_database_shutdown(Eclair_Database *database);
Evas_Bool eclair_database_insert_media_file(Eclair_Database *database,
Eclair_Media_File *media_file);
-Evas_Bool eclair_database_search(Eclair_Database *database, Eclair_Media_File
*media_file, Evas_Bool *need_to_update);
-Evas_Bool eclair_database_search2(Eclair_Database *database, const char
*keyword);
+Evas_Bool eclair_database_get_meta_infos(Eclair_Database *database,
Eclair_Media_File *media_file, Evas_Bool *need_to_update);
+Evas_Bool eclair_database_search(Eclair_Database *database, const char
*keyword, char ***table_result, int *nrows, int *ncols);
+void eclair_database_free_result(char **table_result);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- eclair_dialogs.c 5 Jul 2005 21:14:22 -0000 1.14
+++ eclair_dialogs.c 10 Jul 2005 19:15:22 -0000 1.15
@@ -1,13 +1,11 @@
#include "eclair_dialogs.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "../config.h"
#include "eclair.h"
#include "eclair_config.h"
#include "eclair_playlist.h"
#include "eclair_playlist_container.h"
#include "eclair_utils.h"
+#include "eclair_database.h"
static void *_eclair_dialogs_thread(void *param);
static gint _eclair_dialogs_update(gpointer data);
@@ -31,6 +29,7 @@
static void _eclair_dialogs_menu_on_shuffle_mode(GtkWidget *widget, gpointer
data);
static void _eclair_dialogs_menu_on_repeat_mode(GtkWidget *widget, gpointer
data);
static void _eclair_dialogs_menu_on_search_window(GtkWidget *widget, gpointer
data);
+static void _eclair_dialogs_search_window_on_entry_changed(GtkWidget *widget,
gpointer data);
//Initialize dialogs manager
void eclair_dialogs_init(Eclair_Dialogs_Manager *dialogs_manager, Eclair
*eclair)
@@ -366,68 +365,62 @@
if (!dialogs_manager->search_window_xml ||
!dialogs_manager->search_window_window)
{
+ GtkCellRenderer *cell_renderer;
+ GtkTreeViewColumn *artist_column, *song_column, *album_column;
+
dialogs_manager->search_window_xml = glade_xml_new(PACKAGE_DATA_DIR
"/glade/eclair.glade", "search_window", NULL);
dialogs_manager->search_window_window =
glade_xml_get_widget(dialogs_manager->search_window_xml, "search_window");
-
- /*dialogs_manager->file_chooser_all_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "select_all_button");
- dialogs_manager->file_chooser_none_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "select_none_button");
- dialogs_manager->file_chooser_save_playlist_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "save_playlist_button");
- dialogs_manager->file_chooser_load_playlist_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "load_playlist_button");
- dialogs_manager->file_chooser_add_files_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "add_files_button");
- dialogs_manager->file_chooser_cancel_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "cancel_button");
-*/
- /*g_signal_connect_swapped(dialogs_manager->file_chooser_all_button,
"clicked", G_CALLBACK(gtk_file_chooser_select_all),
dialogs_manager->file_chooser_widget);
- g_signal_connect_swapped(dialogs_manager->file_chooser_none_button,
"clicked", G_CALLBACK(gtk_file_chooser_unselect_all),
dialogs_manager->file_chooser_widget);
- g_signal_connect(dialogs_manager->file_chooser_save_playlist_button,
"clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_save_playlist), eclair);
- g_signal_connect(dialogs_manager->file_chooser_load_playlist_button,
"clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
- g_signal_connect(dialogs_manager->file_chooser_add_files_button,
"clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
- g_signal_connect_swapped(dialogs_manager->file_chooser_cancel_button,
"clicked", G_CALLBACK(gtk_widget_hide), dialogs_manager->file_chooser_dialog);
- g_signal_connect(dialogs_manager->file_chooser_dialog, "delete_event",
G_CALLBACK(_eclair_dialogs_file_chooser_on_delete), eclair);
- */}
+ gtk_widget_hide(dialogs_manager->search_window_window);
+ dialogs_manager->search_tree =
glade_xml_get_widget(dialogs_manager->search_window_xml, "media_files_tree");
- /*if (fc_type == ECLAIR_FC_ADD_FILES)
- {
-
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_OPEN);
-
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
TRUE);
- gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Add Files");
- gtk_widget_show(dialogs_manager->file_chooser_all_button);
- gtk_widget_show(dialogs_manager->file_chooser_none_button);
- gtk_widget_hide(dialogs_manager->file_chooser_save_playlist_button);
- gtk_widget_hide(dialogs_manager->file_chooser_load_playlist_button);
- gtk_widget_show(dialogs_manager->file_chooser_add_files_button);
- gtk_widget_show(dialogs_manager->file_chooser_cancel_button);
- }
- else if (fc_type == ECLAIR_FC_LOAD_PLAYLIST)
- {
-
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
FALSE);
-
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Load Playlist");
- gtk_widget_hide(dialogs_manager->file_chooser_all_button);
- gtk_widget_hide(dialogs_manager->file_chooser_none_button);
- gtk_widget_hide(dialogs_manager->file_chooser_save_playlist_button);
- gtk_widget_show(dialogs_manager->file_chooser_load_playlist_button);
- gtk_widget_hide(dialogs_manager->file_chooser_add_files_button);
- gtk_widget_show(dialogs_manager->file_chooser_cancel_button);
- }
- else if (fc_type == ECLAIR_FC_SAVE_PLAYLIST)
- {
-
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
FALSE);
-
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_SAVE);
- gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Save Playlist");
- gtk_widget_hide(dialogs_manager->file_chooser_all_button);
- gtk_widget_hide(dialogs_manager->file_chooser_none_button);
- gtk_widget_show(dialogs_manager->file_chooser_save_playlist_button);
- gtk_widget_hide(dialogs_manager->file_chooser_load_playlist_button);
- gtk_widget_hide(dialogs_manager->file_chooser_add_files_button);
- gtk_widget_show(dialogs_manager->file_chooser_cancel_button);
+ dialogs_manager->search_list_store = gtk_list_store_new(3,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ gtk_tree_view_set_model(GTK_TREE_VIEW(dialogs_manager->search_tree),
GTK_TREE_MODEL(dialogs_manager->search_list_store));
+ cell_renderer = gtk_cell_renderer_text_new();
+
+ artist_column = gtk_tree_view_column_new_with_attributes("Artist",
cell_renderer, "text", 0, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(dialogs_manager->search_tree),
artist_column);
+ gtk_tree_view_column_set_sort_column_id(artist_column, 0);
+ gtk_tree_view_column_set_resizable(artist_column, TRUE);
+
+ song_column = gtk_tree_view_column_new_with_attributes("Song",
cell_renderer, "text", 1, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(dialogs_manager->search_tree),
song_column);
+ gtk_tree_view_column_set_sort_column_id(song_column, 1);
+ gtk_tree_view_column_set_resizable(song_column, TRUE);
+
+ album_column = gtk_tree_view_column_new_with_attributes("Album",
cell_renderer, "text", 2, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(dialogs_manager->search_tree),
album_column);
+ gtk_tree_view_column_set_sort_column_id(album_column, 2);
+ gtk_tree_view_column_set_resizable(album_column, TRUE);
+
+ glade_xml_signal_connect_data(dialogs_manager->search_window_xml,
"on_search_entry_changed",
G_CALLBACK(_eclair_dialogs_search_window_on_entry_changed), dialogs_manager);
}
- else
- return;*/
- //gtk_window_resize(GTK_WINDOW(dialogs_manager->file_chooser_dialog), 600,
400);
+ gtk_widget_show(dialogs_manager->search_window_window);
gtk_window_present(GTK_WINDOW(dialogs_manager->search_window_window));
}
+static void _eclair_dialogs_search_window_on_entry_changed(GtkWidget *widget,
gpointer data)
+{
+ Eclair_Dialogs_Manager *dialogs_manager;
+ Eclair *eclair;
+ GtkTreeIter new_entry;
+ char **table_result;
+ int nrows, ncols;
+ int i;
+
+ if (!(dialogs_manager = data) || !(eclair = dialogs_manager->eclair))
+ return;
+
+ eclair_database_search(&eclair->database,
gtk_entry_get_text(GTK_ENTRY(widget)), &table_result, &nrows, &ncols);
+ gtk_list_store_clear(eclair->dialogs_manager.search_list_store);
+ for (i = 1; i <= nrows; i++)
+ {
+ gtk_list_store_append(dialogs_manager->search_list_store, &new_entry);
+ gtk_list_store_set(dialogs_manager->search_list_store, &new_entry,
+ 0, table_result[i * ncols + 2], 1, table_result[i * ncols + 1], 2,
table_result[i * ncols + 3], -1);
+ }
+}
+
//------------------------------
// Menu functions
//------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eclair_dialogs.h 1 Jul 2005 14:25:40 -0000 1.4
+++ eclair_dialogs.h 10 Jul 2005 19:15:22 -0000 1.5
@@ -1,7 +1,43 @@
#ifndef _ECLAIR_DIALOGS_H_
#define _ECLAIR_DIALOGS_H_
-#include "eclair_private.h"
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+#include <pthread.h>
+#include "eclair_types.h"
+
+struct _Eclair_Dialogs_Manager
+{
+ //File chooser widget vars
+ GladeXML *file_chooser_xml;
+ GtkWidget *file_chooser_all_button;
+ GtkWidget *file_chooser_none_button;
+ GtkWidget *file_chooser_save_playlist_button;
+ GtkWidget *file_chooser_load_playlist_button;
+ GtkWidget *file_chooser_add_files_button;
+ GtkWidget *file_chooser_cancel_button;
+ GtkWidget *file_chooser_widget;
+ GtkWidget *file_chooser_dialog;
+
+ //Menu widget vars
+ GladeXML *menu_xml;
+ GtkWidget *menu_widget;
+
+ //Search window vars
+ GladeXML *search_window_xml;
+ GtkWidget *search_window_window;
+ GtkWidget *search_tree;
+ GtkListStore *search_list_store;
+
+ gboolean should_popup_menu;
+ Eclair_Dialog_File_Chooser_Type should_open_file_chooser;
+ gboolean should_open_search_window;
+ gboolean should_quit;
+
+ pthread_t dialogs_thread;
+
+ Eclair *eclair;
+};
void eclair_dialogs_init(Eclair_Dialogs_Manager *dialogs_manager, Eclair
*eclair);
void eclair_dialogs_shutdown(Eclair_Dialogs_Manager *dialogs_manager);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_media_file.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eclair_media_file.c 4 Jul 2005 18:33:57 -0000 1.11
+++ eclair_media_file.c 10 Jul 2005 19:15:22 -0000 1.12
@@ -3,7 +3,7 @@
#include <Ecore_File.h>
#include "eclair.h"
#include "eclair_playlist.h"
-#include "eclair_cover.h"
+#include "eclair_playlist_container.h"
#include "eclair_utils.h"
//Create a new media file
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_media_file.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_media_file.h 18 Jun 2005 16:00:34 -0000 1.2
+++ eclair_media_file.h 10 Jul 2005 19:15:22 -0000 1.3
@@ -1,7 +1,32 @@
#ifndef _ECLAIR_MEDIA_FILE_H_
#define _ECLAIR_MEDIA_FILE_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include "eclair_types.h"
+
+struct _Eclair_Media_File
+{
+ //Meta tags
+ char *path;
+ char *cover_path;
+ char *artist;
+ char *title;
+ char *album;
+ char *genre;
+ char *comment;
+ int length;
+ int track;
+ int year;
+ int bitrate;
+ int samplerate;
+
+ Evas_List *shuffle_node;
+ Eclair_Playlist_Container_Object *container_object;
+ unsigned char selected : 1;
+ unsigned char in_meta_tag_process : 1;
+ unsigned char in_cover_process : 1;
+ unsigned char delete_me : 1;
+};
Eclair_Media_File *eclair_media_file_new();
void eclair_media_file_free(Eclair_Media_File *media_file);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_meta_tag.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- eclair_meta_tag.c 5 Jul 2005 21:14:22 -0000 1.13
+++ eclair_meta_tag.c 10 Jul 2005 19:15:22 -0000 1.14
@@ -2,7 +2,6 @@
#include <tag_c.h>
#include <string.h>
#include <unistd.h>
-#include <Evas.h>
#include "eclair.h"
#include "eclair_cover.h"
#include "eclair_media_file.h"
@@ -61,12 +60,13 @@
TagLib_File *tag_file;
TagLib_Tag *tag;
const TagLib_AudioProperties *tag_audio_props;
- Evas_Bool need_to_update;
+ Evas_Bool need_to_update = 0;
if (!eclair || !media_file || !media_file->path)
return;
- if (!eclair_database_search(&eclair->database, media_file, &need_to_update)
&& !need_to_update)
+
+ if (!eclair_database_get_meta_infos(&eclair->database, media_file,
&need_to_update) || need_to_update)
{
if (!(tag_file = taglib_file_new(media_file->path)))
return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_meta_tag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eclair_meta_tag.h 30 Apr 2005 12:11:16 -0000 1.1
+++ eclair_meta_tag.h 10 Jul 2005 19:15:22 -0000 1.2
@@ -1,7 +1,22 @@
#ifndef _ECLAIR_META_TAG_H_
#define _ECLAIR_META_TAG_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <pthread.h>
+#include "eclair_types.h"
+
+struct _Eclair_Meta_Tag_Manager
+{
+ Eclair_Add_File_State meta_tag_add_state;
+ Evas_List *meta_tag_files_to_add;
+ Evas_List *meta_tag_files_to_scan;
+
+ Evas_Bool meta_tag_should_scan_files;
+ Evas_Bool meta_tag_delete_thread;
+ pthread_cond_t meta_tag_cond;
+ pthread_mutex_t meta_tag_mutex;
+ pthread_t meta_tag_thread;
+};
void eclair_meta_tag_init(Eclair_Meta_Tag_Manager *meta_tag_manager, Eclair
*eclair);
void eclair_meta_tag_shutdown(Eclair_Meta_Tag_Manager *meta_tag_manager);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_playlist.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- eclair_playlist.c 5 Jul 2005 21:14:22 -0000 1.20
+++ eclair_playlist.c 10 Jul 2005 19:15:22 -0000 1.21
@@ -2,19 +2,14 @@
#include "../config.h"
#include <string.h>
#include <stdio.h>
-#include <Evas.h>
#include <Ecore_File.h>
#include <Edje.h>
#include "eclair.h"
#include "eclair_playlist_container.h"
-#include "eclair_cover.h"
#include "eclair_media_file.h"
#include "eclair_meta_tag.h"
-#include "eclair_cover.h"
-#include "eclair_callbacks.h"
#include "eclair_utils.h"
#include "eclair_config.h"
-#include "eclair_dialogs.h"
#define MAX_PATH_LEN 1024
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_playlist.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eclair_playlist.h 5 Jul 2005 21:14:22 -0000 1.11
+++ eclair_playlist.h 10 Jul 2005 19:15:22 -0000 1.12
@@ -1,7 +1,28 @@
#ifndef _ECLAIR_PLAYLIST_H_
#define _ECLAIR_PLAYLIST_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <Ecore.h>
+#include "eclair_types.h"
+
+struct _Eclair_Playlist_Container_Object
+{
+ Evas_Object *rect;
+ Evas_Object *text;
+};
+
+struct _Eclair_Playlist
+{
+ Evas_List *playlist;
+ Evas_List *current;
+ Evas_List *shuffle_list;
+ Evas_List *removed_media_files;
+ Evas_Bool shuffle;
+ Evas_Bool repeat;
+ Ecore_Timer *media_files_destructor_timer;
+
+ Eclair *eclair;
+};
void eclair_playlist_init(Eclair_Playlist *playlist, Eclair *eclair);
void eclair_playlist_shutdown(Eclair_Playlist *playlist);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/eclair/src/eclair_playlist_container.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eclair_playlist_container.c 9 Jul 2005 12:27:31 -0000 1.5
+++ eclair_playlist_container.c 10 Jul 2005 19:15:22 -0000 1.6
@@ -1,9 +1,9 @@
#include "eclair_playlist_container.h"
-#include <Evas.h>
-#include <Ecore.h>
+#include <Edje.h>
#include <Ecore_File.h>
#include <math.h>
#include "eclair.h"
+#include "eclair_window.h"
#include "eclair_media_file.h"
#include "eclair_playlist.h"
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/eclair/src/eclair_playlist_container.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eclair_playlist_container.h 9 Jul 2005 12:27:32 -0000 1.4
+++ eclair_playlist_container.h 10 Jul 2005 19:15:22 -0000 1.5
@@ -1,7 +1,42 @@
#ifndef _ECLAIR_PLAYLIST_CONTAINER_H_
#define _ECLAIR_PLAYLIST_CONTAINER_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <Ecore.h>
+#include "eclair_types.h"
+
+struct _Eclair_Playlist_Container
+{
+ //Container vars
+ Evas_Object *clip;
+ Evas_Object *grabber;
+ Evas_List *entry_objects;
+ Evas_List **entries;
+ Eclair_Media_File *last_selected;
+ double scroll_percent;
+
+ //Scroll vars
+ double scroll_start_time;
+ double scroll_speed;
+ Ecore_Timer *scroll_timer;
+
+ //Scroll_To vars
+ double scroll_to_percent;
+ double scroll_to_speed;
+ Ecore_Timer *scroll_to_timer;
+
+ //Theme vars
+ char *entry_theme_path;
+ int entry_height;
+ Eclair_Color normal_entry_bg_color;
+ Eclair_Color normal_entry_fg_color;
+ Eclair_Color selected_entry_bg_color;
+ Eclair_Color selected_entry_fg_color;
+ Eclair_Color current_entry_bg_color;
+ Eclair_Color current_entry_fg_color;
+
+ Eclair *eclair;
+};
Evas_Object *eclair_playlist_container_object_add(Evas *evas, Eclair *eclair);
void eclair_playlist_container_set_entry_theme_path(Evas_Object *obj, const
char *entry_theme_path);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_subtitles.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eclair_subtitles.c 27 May 2005 20:28:22 -0000 1.4
+++ eclair_subtitles.c 10 Jul 2005 19:15:22 -0000 1.5
@@ -1,7 +1,7 @@
#include "eclair_subtitles.h"
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <Evas.h>
int _eclair_subtitles_sort_cb(void *sub1, void *sub2);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_subtitles.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eclair_subtitles.h 17 Apr 2005 08:30:58 -0000 1.1
+++ eclair_subtitles.h 10 Jul 2005 19:15:22 -0000 1.2
@@ -1,7 +1,20 @@
#ifndef _ECLAIR_SUBTITLES_H_
#define _ECLAIR_SUBTITLES_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include "eclair_types.h"
+
+struct _Eclair_Subtitle
+{
+ double start, end;
+ char *subtitle;
+};
+
+struct _Eclair_Subtitles
+{
+ Evas_List *subtitles;
+ Evas_Bool enable;
+};
void eclair_subtitles_init(Eclair_Subtitles *subtitles);
void eclair_subtitles_free(Eclair_Subtitles *subtitles);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_utils.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- eclair_utils.c 4 Jul 2005 18:33:57 -0000 1.10
+++ eclair_utils.c 10 Jul 2005 19:15:22 -0000 1.11
@@ -1,6 +1,7 @@
#include "eclair_utils.h"
#include <Ecore_File.h>
#include <string.h>
+#include "eclair_media_file.h"
//Need to be called for the random generation
void eclair_utils_init()
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_utils.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eclair_utils.h 4 Jul 2005 18:33:57 -0000 1.8
+++ eclair_utils.h 10 Jul 2005 19:15:22 -0000 1.9
@@ -1,7 +1,8 @@
#ifndef _ECLAIR_UTILS_H_
#define _ECLAIR_UTILS_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include "eclair_types.h"
void eclair_utils_init();
void eclair_utils_second_to_string(double position, double length, char
*string);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_video.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eclair_video.c 9 Jul 2005 12:27:32 -0000 1.1
+++ eclair_video.c 10 Jul 2005 19:15:22 -0000 1.2
@@ -1,9 +1,9 @@
#include "eclair_video.h"
#include "../config.h"
-#include <pthread.h>
#include <Emotion.h>
#include "eclair.h"
#include "eclair_callbacks.h"
+#include "eclair_window.h"
static void *_eclair_video_create_emotion_object_thread(void *param);
static void _eclair_video_frame_decode_cb(void *data, Evas_Object *obj, void
*event_info);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_video.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eclair_video.h 9 Jul 2005 12:27:32 -0000 1.1
+++ eclair_video.h 10 Jul 2005 19:15:22 -0000 1.2
@@ -1,7 +1,22 @@
#ifndef _ECLAIR_VIDEO_H_
#define _ECLAIR_VIDEO_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <Ecore_Evas.h>
+#include <pthread.h>
+#include "eclair_types.h"
+
+struct _Eclair_Video
+{
+ Ecore_Evas *video_window;
+ Evas_Object *video_object;
+ Evas_Object *black_background;
+ Evas_Object *subtitles_object;
+ pthread_t video_create_thread;
+ int previous_video_width, previous_video_height;
+ double previous_video_ratio;
+ Eclair *eclair;
+};
void eclair_video_init(Eclair_Video *video, Eclair *eclair);
void eclair_video_shutdown(Eclair_Video *video);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_window.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eclair_window.c 9 Jul 2005 12:27:32 -0000 1.6
+++ eclair_window.c 10 Jul 2005 19:15:22 -0000 1.7
@@ -1,5 +1,4 @@
#include "eclair_window.h"
-#include <Ecore_Evas.h>
#include <Esmart/Esmart_Draggies.h>
#include "eclair.h"
#include "eclair_callbacks.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_window.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_window.h 9 Jul 2005 12:27:32 -0000 1.2
+++ eclair_window.h 10 Jul 2005 19:15:22 -0000 1.3
@@ -1,7 +1,33 @@
#ifndef _ECLAIR_WINDOW_H_
#define _ECLAIR_WINDOW_H_
-#include "eclair_private.h"
+#include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_Evas.h>
+#include <Ecore_X.h>
+#include "eclair_types.h"
+
+struct _Eclair_Window
+{
+ Ecore_X_Window x_window;
+ Ecore_Evas *ecore_window;
+ Evas *evas;
+ Evas_Object *edje_object;
+ Evas_Object *draggies;
+ Evas_Coord min_width;
+ Evas_Coord min_height;
+ Evas_Coord max_width;
+ Evas_Coord max_height;
+ char *window_name;
+ int x, y;
+ Eclair *eclair;
+
+ unsigned char should_resize : 1;
+ unsigned char borderless : 1;
+ unsigned char shaped : 1;
+ unsigned char resizable : 1;
+ unsigned char main_window : 1;
+};
Eclair_Window *eclair_window_create(const char *edje_file, const char
*window_name, const char *title, Eclair_Engine engine, Eclair *eclair,
Evas_Bool main_window);
void eclair_window_del(Eclair_Window *window);
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs