Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
Makefile.am eclair.c eclair_private.h
Added Files:
eclair_config.c eclair_config.h eclair_cover.c eclair_cover.h
Log Message:
Eclair can now download automatically covers from amazon.com and store them
into ~/.eclair/covers/. The code works but it's not already used by eclair.
Beginning of eclair config file
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 17 Apr 2005 08:30:58 -0000 1.1
+++ Makefile.am 27 Apr 2005 20:32:41 -0000 1.2
@@ -7,7 +7,8 @@
@edje_cflags@ \
@emotion_cflags@ \
@esmart_cflags@ \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
AM_CFLAGS = \
-Wall \
@@ -23,7 +24,9 @@
eclair_callbacks.c eclair_callbacks.h \
eclair_playlist.c eclair_playlist.h \
eclair_private.h \
-eclair_subtitles.c eclair_subtitles.h
+eclair_subtitles.c eclair_subtitles.h \
+eclair_cover.c eclair_cover.h \
+eclair_config.c eclair_config.h
eclair_LDADD = \
@gtk_libs@ \
@@ -32,4 +35,5 @@
@edje_libs@ \
@emotion_libs@ \
@esmart_libs@ -lesmart_container -lesmart_draggies \
[EMAIL PROTECTED]@ -ltag_c
[EMAIL PROTECTED]@ -ltag_c \
[EMAIL PROTECTED]@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair.c 24 Apr 2005 16:23:35 -0000 1.2
+++ eclair.c 27 Apr 2005 20:32:41 -0000 1.3
@@ -3,11 +3,13 @@
#include <Emotion.h>
#include <Esmart/Esmart_Draggies.h>
#include <Esmart/Esmart_Container.h>
+#include <tag_c.h>
#include "eclair_args.h"
#include "eclair_utils.h"
#include "eclair_callbacks.h"
#include "eclair_subtitles.h"
-#include <tag_c.h>
+#include "eclair_cover.h"
+#include "eclair_config.h"
static void _eclair_gui_create_window(Eclair *eclair);
static void _eclair_video_create_window(Eclair *eclair);
@@ -48,12 +50,14 @@
if (!eclair_args_parse(eclair, *argc, argv, &filenames))
return 0;
+ eclair_config_init(&eclair->config);
_eclair_gui_create_window(eclair);
_eclair_video_create_window(eclair);
eclair_playlist_init(eclair, &eclair->playlist);
eclair_current_file_set(eclair, NULL);
eclair_subtitles_init(&eclair->subtitles);
-
+ eclair_cover_init();
+
pthread_cond_init(&eclair->meta_tag_cond, NULL);
pthread_mutex_init(&eclair->meta_tag_mutex, NULL);
pthread_create(&eclair->meta_tag_thread, NULL, _eclair_meta_tag_thread,
eclair);
@@ -76,6 +80,8 @@
{
eclair_playlist_empty(&eclair->playlist);
eclair_subtitles_free(&eclair->subtitles);
+ eclair_cover_shutdown();
+ eclair_config_shutdown(&eclair->config);
eclair->meta_tag_delete_thread = 1;
pthread_cond_broadcast(&eclair->meta_tag_cond);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_private.h 24 Apr 2005 16:23:35 -0000 1.2
+++ eclair_private.h 27 Apr 2005 20:32:41 -0000 1.3
@@ -1,6 +1,7 @@
#ifndef _ECLAIR_PRIVATE_H_
#define _ECLAIR_PRIVATE_H_
+#include <stdio.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Edje.h>
@@ -14,6 +15,22 @@
typedef struct _Eclair_Playlist Eclair_Playlist;
typedef struct _Eclair_Subtitle Eclair_Subtitle;
typedef struct _Eclair_Subtitles Eclair_Subtitles;
+typedef struct _Eclair_Packet_Chunk Eclair_Packet_Chunk;
+typedef struct _Eclair_Config Eclair_Config;
+
+struct _Eclair_Config
+{
+ char config_dir_path[256];
+ char covers_dir_path[256];
+ char config_file_path[256];
+ FILE *config_file;
+};
+
+struct _Eclair_Packet_Chunk
+{
+ int size;
+ char *data;
+};
struct _Eclair_Playlist_Media_File
{
@@ -92,11 +109,12 @@
pthread_cond_t meta_tag_cond;
pthread_t meta_tag_thread;
Evas_Bool meta_tag_delete_thread;
-
+
+ //Core vars
Eclair_State state;
Eclair_Playlist playlist;
Eclair_Subtitles subtitles;
-
+ Eclair_Config config;
};
#endif
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
